Best possible solution:

Finish the shared lifecycle approach by reconciling local run state on terminal sessions.changed updates, then land with targeted unit coverage and exact-head browser proof.

Do we have a high-confidence way to reproduce the issue?

Yes, at source level. With chatRunId still set and the current session row updated to terminal through sessions.changed, the branch clears only the row flag while the render predicate still treats the local run as abortable.

Is this the best way to solve the issue?

No, not yet. The shared cleanup helper is the right direction, but the incremental terminal session-update path must also reconcile local chatRunId so a missed chat terminal event cannot leave Stop/In progress stuck.

Full review comments:

• [P2] Reconcile local runs on terminal session updates — ui/src/ui/controllers/sessions.ts:332-333
  This clears only the cached row. If the chat terminal event was missed, host.chatRunId remains set; the gateway returns after an applied sessions.changed event, so reconcileChatRunFromCurrentSessionRow never runs and hasAbortableSessionRun continues rendering Stop/In progress.
  Confidence: 0.86

Overall correctness: patch is incorrect
Overall confidence: 0.86

Acceptance criteria:

• pnpm test ui/src/ui/app-gateway.sessions.node.test.ts ui/src/ui/controllers/sessions.test.ts ui/src/ui/app-gateway.node.test.ts ui/src/ui/controllers/chat.test.ts ui/src/ui/app-chat.test.ts ui/src/ui/chat/run-controls.test.ts
• pnpm exec oxfmt --check --threads=1 CHANGELOG.md ui/src/styles/chat/layout.css ui/src/ui/app-chat.ts ui/src/ui/app-gateway.node.test.ts ui/src/ui/app-gateway.ts ui/src/ui/app-render.helpers.ts ui/src/ui/app-render.ts ui/src/ui/app-tool-stream.node.test.ts ui/src/ui/app-tool-stream.ts ui/src/ui/app-view-state.ts ui/src/ui/app.ts ui/src/ui/chat/run-controls.test.ts ui/src/ui/chat/run-lifecycle.ts ui/src/ui/chat/status-indicators.ts ui/src/ui/controllers/chat.test.ts ui/src/ui/controllers/chat.ts ui/src/ui/controllers/sessions.test.ts ui/src/ui/controllers/sessions.ts ui/src/ui/views/chat.ts
• git diff --check
• Browser smoke: active simulated state shows Stop + In progress; completed/interrupted terminal session update returns to Send and shows the expected status chip

What I checked:

• Live PR context: GitHub API shows the PR is open, author association is MEMBER, and labels include app: web-ui, maintainer, and size: L; cleanup policy keeps it open for maintainer handling rather than closing it. (eedbd94b0461)
• Prior review context: The existing ClawSweeper comment already identified the same narrow blocker: terminal sessions.changed updates clear the row flag but do not reconcile the local chat run id. (eedbd94b0461)
• Current abort predicate: Current main renders Stop from hasAbortableSessionRun, which returns true immediately when chatRunId is set before consulting the cached session row. (ui/src/ui/app-chat.ts:105, 78eb92e62277)
• PR helper exists for full session-list reloads: The PR adds reconcileChatRunFromCurrentSessionRow, and loadSessionsOnce calls it after replacing sessionsResult, so full list refreshes can clear stale local run state. (ui/src/ui/controllers/sessions.ts:455, eedbd94b0461)
• Remaining PR gap: For incremental terminal session updates, the PR only forces hasActiveRun false on the cached row; it does not invoke the run reconciliation helper after mutating the current row. (ui/src/ui/controllers/sessions.ts:332, eedbd94b0461)
• Gateway return path: On PR head, sessions.changed returns immediately when applySessionsChangedEvent reports applied, so an applied terminal update will not fall through to a full reload that would call the reconciliation helper. (ui/src/ui/app-gateway.ts:871, eedbd94b0461)

Likely related people:

• BunsDev: GitHub path history shows recent Control UI session/run responsiveness work on app-chat.ts, app-gateway.ts, and controllers/sessions.ts, including commits that scoped chat session list refreshes and preserved Stop after reconnect. (role: recent area contributor; confidence: high; commits: 6b3cd9043ee6, 38456f5f03b1, 4532e5d85803; files: ui/src/ui/app-chat.ts, ui/src/ui/app-gateway.ts, ui/src/ui/controllers/sessions.ts)
• steipete: Blame and GitHub path history show recent broad Control UI chat/session maintenance on the implicated predicate, session controller, and tool-stream indicator paths. (role: recent adjacent contributor; confidence: high; commits: 439e396262, cb088c81601e, 5550d0ecf5b8; files: ui/src/ui/app-chat.ts, ui/src/ui/controllers/sessions.ts, ui/src/ui/app-tool-stream.ts)
• joshavant: Introduced model fallback lifecycle visibility in the WebUI status surface, which overlaps the fallback-status cleanup touched by this PR. (role: adjacent feature contributor; confidence: medium; commits: c2876b69fbf5; files: ui/src/ui/app-tool-stream.ts, ui/src/ui/chat/status-indicators.ts)
• mpz4life: Recent path history includes compaction status lifecycle work in the same indicator surface that this PR makes stale-safe. (role: adjacent feature contributor; confidence: medium; commits: 7027dda8cdec; files: ui/src/ui/app-tool-stream.ts)

Remaining risk / open question:

• I did not run the PR tests or browser smoke in this read-only review; the blocker is based on source inspection of the latest PR head.

Codex review notes: model gpt-5.5, reasoning high; reviewed against 78eb92e62277.