Merge main into lane-app2: combine the pill standdown with main's run-title and conversation work
Brings main (c5b0de1) into the pill-standdown lane. Main added the whole-title
run view / two-line list rows (RunIdentity, RunTitlesTest) and the readable
conversation work (ChatFormat, ChatScreen, ChatStore, ChatTranscriptTest). Those
are disjoint from this lane's destination-pill change, so the Kotlin sources
auto-merged; only android/README.md conflicted, where both sides appended a new
dated section to the end of the item log.
Resolved android/README.md by keeping both intents: the lane's "Destination pill
stands down in an open conversation" section and main's "Run title readability"
section are both retained, in that order. No conflict marker remains and nothing
from either side was discarded.
Verified after resolving: gradle :app:testDebugUnitTest --offline --no-daemon ->
BUILD SUCCESSFUL, 60 suites / 545 tests / 0 failures / 0 errors / 0 skipped; and
gradle :app:assembleDebug --offline --no-daemon -> BUILD SUCCESSFUL.
This commit is contained in:
@@ -5862,6 +5862,71 @@ the brief keeps implementation verification to the build and the unit tests, and
|
||||
visual review owns the operator's Pixel 9 Pro XL. No packaged skill reference was
|
||||
touched: this is an app-UI change and no reference describes the chat surface.
|
||||
|
||||
## Conversation reading: markdown, collapsed reasoning, one identity (17 Oct 2026)
|
||||
|
||||
Making the conversation readable on a phone. `android/` only; no new dependency
|
||||
(the declared `material-icons-extended` only), no Pipelines server/Go/installer/
|
||||
Docker file touched and no run started from the app.
|
||||
|
||||
- **Markdown reaches the transcript (tested).** The assistant `text` part was
|
||||
already rendered through `MarkdownText`, but the transcript's decision was
|
||||
buried in a private composable. `ChatFormat.partRendering(part)` now names the
|
||||
one decision the transcript makes (`MARKDOWN` / `REASONING` / `PLAIN` /
|
||||
`HIDDEN`), `MessagePart` consumes it, and `ChatTranscriptTest` drives a sample
|
||||
covering the whole documented subset (headings, paragraph, bullet and ordered
|
||||
lists, quote, table, fenced code, rule, inline code/bold/italic/link) from a
|
||||
`ChatPart` into `parseMarkdown`/`parseInline`. Text outside the subset (raw
|
||||
HTML, `~~strike~~`) still parses to a paragraph and renders verbatim; an
|
||||
unknown part kind still renders its text, never drops it.
|
||||
- **Reasoning collapsed by default.** `ReasoningBlock` is now one compact,
|
||||
muted line per part — a `Psychology` icon, a label (`Thinking…` while the
|
||||
newest turn streams, `Reasoning` once settled) and a chevron — that expands on
|
||||
tap to the full, still-muted text. Expansion is a pure
|
||||
`ReasoningExpansion` set hoisted to the conversation pane (not the lazy
|
||||
transcript), so a part keeps its state while the operator scrolls and its item
|
||||
is disposed, and every part starts collapsed in a freshly opened chat. The
|
||||
choice for a running turn: its streaming reasoning stays collapsed and keeps
|
||||
following the stream under the live `Thinking…` label, so it signals progress
|
||||
without competing with the answer.
|
||||
- **One identity in the header.** `ChatFormat.conversationHeader(thread)` builds
|
||||
the app-bar title plus the only extra context — the labelled kind chip
|
||||
(`Operator`) from the server's own tag, the activity (`Running` /
|
||||
`Busy · read-only` / `Idle`), the directory and the model — and the app bar and
|
||||
context line read the same value. The conversation's active chip is omitted
|
||||
from the open-chat strip (`openChatsBeside`), so the session's title is shown
|
||||
once; every *other* open chat is still one tap away, and the session list is
|
||||
unchanged.
|
||||
|
||||
Tests (`ChatTranscriptTest`, 7 cases, plus the existing `ChatFormatTest`): the
|
||||
markdown subset reaches the renderer from a `ChatPart`; text outside the subset
|
||||
and an unknown part kind still render; reasoning starts collapsed, toggles per
|
||||
part and never expands on a blank key; the header names the session once with
|
||||
only kind/activity/directory/model beside it; and the conversation strip offers
|
||||
only the other open chats.
|
||||
|
||||
Evidence (macOS, JDK 17, Gradle 9.7.1 `--offline`, `--no-daemon`,
|
||||
`ANDROID_HOME=/Users/alan/Library/Android/sdk`):
|
||||
|
||||
- `gradle :app:assembleDebug --no-daemon --offline --rerun-tasks` → `BUILD
|
||||
SUCCESSFUL` (35 tasks executed).
|
||||
- `gradle :app:testDebugUnitTest --no-daemon --offline --rerun-tasks` →
|
||||
`BUILD SUCCESSFUL`; the JUnit XMLs total **508 tests, 0 failures, 0 errors, 0
|
||||
skipped** (7 new in `ChatTranscriptTest`).
|
||||
- **APK publish.** `app-debug.apk` copied to this run's artifacts directory as
|
||||
`pipelines-debug-wip-5ac196c.apk` (18,486,624 bytes, sha256
|
||||
`0df6899429a8f5632ec568340dddb63a5617b1a04af19f52c6ebb793470a0b23`; `5ac196c`
|
||||
is `git rev-parse --short HEAD`, the tree being uncommitted WIP on top of it).
|
||||
It is served at
|
||||
`http://10.0.0.75:8080/artifacts/274/1/pipelines-debug-wip-5ac196c.apk`
|
||||
(`HTTP/1.1 200 OK`, `Content-Type: application/vnd.android.package-archive`,
|
||||
`Content-Length: 18486624`).
|
||||
|
||||
Not verified in this pass: the conversation, the collapsed/expanded reasoning
|
||||
and the header on a device — the brief keeps implementation verification to the
|
||||
build and the unit tests, and visual review owns the operator's Pixel 9 Pro XL
|
||||
(captures: headings/list/fenced code/table, reasoning collapsed then expanded,
|
||||
and the header).
|
||||
|
||||
## Answer a waiting human decision from the phone (17 Oct 2026)
|
||||
|
||||
The last piece of the original goal the app was missing: a run parked on a person
|
||||
@@ -6069,3 +6134,53 @@ Not verified in this pass: the conversation/list screenshots — the brief keeps
|
||||
implementation and ordinary code review to the build and the unit tests, and
|
||||
visual review owns the operator's Pixel 9 Pro XL (its captures are the ones the
|
||||
brief names: a conversation with no pill, and the chat list with it).
|
||||
|
||||
## Run title readability: whole in the run view, two lines in the list (17 Oct 2026)
|
||||
|
||||
A run's title is derived from its prompt, so it is often long. The run view now
|
||||
guarantees the operator can read it whole, while the places that are one of many
|
||||
clamp deliberately. `android/` only; no new dependency, no Pipelines
|
||||
server/Go/installer/Docker file touched and no run started from the app; the build
|
||||
and unit tests only, no device command run.
|
||||
|
||||
- **Run view shows the whole title.** The run-summary title line rendered
|
||||
`runLabel(run.title, run.name)` with the Compose default; it now states the
|
||||
intent with `RUN_VIEW_TITLE_LINES` (`Int.MAX_VALUE`) and `TextOverflow.Clip`, so
|
||||
it wraps over as many lines as it needs and is never ellipsised. The fixed-height
|
||||
M3 app-bar copy stays a compact one-line label; the summary's scrollable title is
|
||||
the complete one.
|
||||
- **Runs-list rows grow, then clamp.** `RunHistoryScreen.RunRow`'s title went from
|
||||
`maxLines = 1` to `RUN_ROW_TITLE_LINES` (2), so a longer title takes a second
|
||||
line before it ellipsises; the row's glyph, status chip and meta line keep their
|
||||
alignment and the selection highlight and tap target are unchanged.
|
||||
- **Stage-pane context line.** `StageDetailPane`'s run-label line went from
|
||||
`maxLines = 1` to `STAGE_RUN_LABEL_LINES` (2) — the pane is compact context, not
|
||||
the place the whole title lives.
|
||||
- **One named budget.** `ui/RunIdentity.kt` holds the three named line budgets so
|
||||
the choice is deliberate at each call site. `RunTitlesTest` (4 cases) pins them
|
||||
and asserts a clamping place is never more generous than the run view;
|
||||
`RunIdentityTest` gained a case that `runLabel`/`runIdentity` never shorten a
|
||||
long title, so re-introducing a truncating helper here fails.
|
||||
|
||||
Tests: the 57 result XMLs aggregate to **513 tests, 0 failures, 0 errors, 0
|
||||
skipped** (`RunTitlesTest` 4/0, `RunIdentityTest` 6/0).
|
||||
|
||||
Evidence (macOS, JDK 17 from Homebrew `openjdk@17`, Gradle 9.7.1 `--offline`,
|
||||
`--no-daemon`, `ANDROID_HOME=/Users/alan/Library/Android/sdk`):
|
||||
|
||||
- `gradle :app:testDebugUnitTest --no-daemon --offline --rerun` → `BUILD
|
||||
SUCCESSFUL`.
|
||||
- `gradle :app:assembleDebug --no-daemon --offline` → `BUILD SUCCESSFUL`;
|
||||
`app-debug.apk` 18,486,624 bytes, sha256
|
||||
`2b23762b54f011bbec680804a232f32bd43c244fb52c465a0f4b2c2c9a0148cb`.
|
||||
- **APK publish.** Copied to this run's artifacts directory as
|
||||
`pipelines-debug-wip-2bc00a2.apk` (`2bc00a2` = `git rev-parse --short HEAD`, the
|
||||
tree being uncommitted WIP on top of it), served at
|
||||
`http://10.0.0.75:8080/artifacts/278/4/pipelines-debug-wip-2bc00a2.apk`
|
||||
(`HTTP/1.1 200 OK`, `Content-Type: application/vnd.android.package-archive`; the
|
||||
downloaded bytes hash to the same sha256).
|
||||
|
||||
Not verified in this pass: how the wrapping summary title, the two-line list row
|
||||
and the two-line stage header actually render — that needs the device, which this
|
||||
build-and-unit-test pass did not use; visual review owns the operator's Pixel 9
|
||||
Pro XL.
|
||||
|
||||
Reference in New Issue
Block a user