pi-cockpit 0.5.1 → 0.7.0

package/README.md

@@ -1,107 +1,130 @@
-# pi-cockpit
-
-A list-mode **agent cockpit** for [Pi](https://pi.dev): a status stack pinned **above the editor** showing live teammates and the current todo plan, plus a Starship-style footer. Everything is drawn through Pi's public extension APIs only (`setWidget` / `setFooter`) — no core patches.
-
-It is the third plugin of the `pi-maestro-flow` project (alongside `pi-maestro-flow` and `pi-maestro-teammate`). Since `pi-maestro-flow@0.6.1` it is an exact-pinned dependency of `pi-maestro-flow` — installed together and auto-registered into Pi's `settings.packages` on postinstall — but it also installs and runs standalone. Current version: **0.4.0**.
-
-```
- ┌─ AGENTS · 2 running ─────────────────────────────┐   ← setWidget(aboveEditor)
- │ ⠋ explorer  #a1f3c2  map auth   read routes.ts   │
- │ ⠋ explorer  #b9e014  trace jwt  read jwt.ts      │
- ├─ TODO · 1/4 ─────────────────────────────────────┤
- │ 01 ✓ map auth entrypoints                        │
- │ 02 ⠋ trace jwt verify                            │
- │ 03 · implement refresh                           │
- │ 04 · add tests                                   │
- └──────────────────────────────────────────────────┘
- >  dispatch a goal…                                  ← editor (Pi native)
- pi/stream-70b · ctx [████░░░░] 42% · $0.52 · 01:23   ← setFooter
-```
-
-## Install
-
-`pi-cockpit` comes automatically with the orchestration layer — installing `pi-maestro-flow` pulls `pi-cockpit` and registers it into `settings.packages` on postinstall, no manual setup required. To use it on its own:
-
-```bash
-pi install npm:pi-cockpit     # standalone from npm
-# or, for one run:
-pi -e ./packages/pi-cockpit
-```
-
-## What it shows
-
-- **AGENTS** — every running teammate as a table row (status spinner · role · id · label · live tail), sorted running-first. Completed/failed agents show their total duration. Collapses to a one-line `N agents running` summary in compact mode.
-- **TODO** — the active plan as numbered rows with four states (done ✓ / in-progress spinner / blocked ! / pending ·). Collapses to a segmented progress bar + current step + percent.
-- **Footer** — `provider/model · context gauge · ↑in ↓out · $cost · elapsed · git branch`. `bash_bg` background-job state lives on a **dedicated second footer row** so it no longer competes with the primary line.
-- **Thinking timer** — while the model is thinking, the folded thinking row shows a spinner and running elapsed time; when the run ends, it settles to the actual duration (e.g. `thoughts · 8.4s`).
-- **Quiet mode** — compresses the seven built-in tool calls (read/bash/edit/write/grep/find/ls) into single-line ✓/✗/⋯ summaries and folds thinking blocks. Two glyph sets available: `check` (✓/✗/⋯) and `dot` (●/○/◌). Toggle with `/cockpit quiet`; turning off requires `/reload` to restore native tool renderers.
-
-Toggle each block between list and compact with `/cockpit`.
-
-## Data sources (and the dependency this implies)
-
-| Block | Source | Available on bare Pi? |
-|-------|--------|------------------------|
-| AGENTS | `pi.events` channels `teammate:started` / `teammate:message` / `teammate:complete`, broadcast by **pi-maestro-teammate** | **No** — without that extension no events fire, the block stays hidden |
-| TODO | the `todo-state` snapshot the **pi-maestro-flow** `todo` tool persists after every mutation (re-read on each `tool_execution_end` and on `session_start`) | **No** — without the `todo` tool the block stays hidden |
-| Footer | `ctx.model`, `ctx.getContextUsage()`, session usage totals, `footerData.getGitBranch()` | **Yes** |
-
-So on a stock Pi (no teammate / no todo tool) the extension loads without error, the status stack renders nothing, and only the footer appears. The roster is **self-accumulated from event deltas** — teammates already running before the extension loads are not back-filled (the teammate extension broadcasts deltas, never a full roster). The todo list **is** back-filled on `session_start` from the persisted snapshot.
-
-This is the whole coupling story: cockpit has **no package dependency on `pi-maestro-flow`** and only a peer dependency on `pi-maestro-teammate`. It observes the other two plugins through public channels alone — teammate's event broadcasts for AGENTS, and the `todo-state` snapshot flow's `todo` tool persists for TODO. Remove either source and the matching block simply hides; the footer always remains.
-
-## Configuration
-
-`~/.pi/agent/cockpit.json` (created on first run):
-
-```json
-{
-  "enabled": true,
-  "quietMode": false,
-  "quietSymbols": "check",
-  "agentsMode": "list",
-  "todoMode": "list",
-  "todoExpanded": false,
-  "hideNativeAgents": true,
-  "icons": { "mode": "auto" },
-  "theme": ""
-}
-```
-
-- `quietMode`: when `true`, compresses built-in tool rendering and folds thinking blocks.
-- `quietSymbols`: `"check"` (✓/✗/⋯) or `"dot"` (●/○/◌) lifecycle glyphs for quiet tool rows.
-- `agentsMode` / `todoMode`: `"list"` or `"compact"`.
-- `todoExpanded`: when `true`, expands the todo widget by default.
-- `hideNativeAgents`: when `true`, clears the teammate extension's own `teammate-agents` widget (it draws a similar list *below* the editor) so the two don't duplicate. On by default.
-- `icons.mode`: `"auto"` (detect Nerd Font), `"nerd"`, or `"ascii"`.
-- `theme`: named theme override; empty string follows the Pi session theme.
-
-## Commands
-
-- `/cockpit` — opens an overlay to toggle `enabled`, `agentsMode`, `todoMode`, `quietMode`, and `hideNativeAgents`. `/cockpit quiet` toggles quiet mode directly; `/cockpit bg` shows background jobs.
-- `/theme` — switch theme with live preview; `/theme <name>` applies directly. Pi ships no standalone theme command; cockpit provides one.
-
-## Terminal feasibility — what this design deliberately does NOT do
-
-The original mockup was a browser page; a terminal is an ANSI stream with no DOM, no CSS, no focus, no hover. Four mockup effects are **out of scope** here, with replacements:
-
-| Mockup effect | Why it can't work in a TUI | Replacement |
-|---------------|----------------------------|-------------|
-| Input-focus "power-up" glow (`:has(:focus)`) | no focus pseudo-class; `render(width)` can't see focus | the stack's header dot turns accent-green while an agent is running |
-| Hover-to-expand chips/rows | no hover in a terminal | list mode shows everything; compact mode is one line; `/cockpit` toggles |
-| Scanlines / logo light-up animation | no overlay/animation layer | a braille spinner frame, advanced on each redraw |
-| In-stream thinking-collapse / edit progress bar / colored bash stdout | built-in message & built-in tool rendering is **not** replaceable by extensions (`renderCall`/`renderResult` only apply to tools *you* register) | the conversation stream is left to Pi's native renderer — it is context, not a cockpit deliverable |
-
-## Local development
-
-```bash
-cd packages/pi-cockpit
-node --test --experimental-transform-types tests/agents-store.test.ts tests/todo-store.test.ts tests/render.test.ts tests/footer.test.ts
-../../node_modules/.bin/tsc -p tsconfig.json     # type-check (uses the monorepo root's tsc + types)
-```
-
-The package lives inside the `pi-maestro-flow` monorepo under `packages/` so it resolves `@earendil-works/*` types from the root `node_modules`. It is also an exact-pinned dependency of `pi-maestro-flow` and ships as its own npm package (`pi-cockpit`).
-
-## License
-
-MIT
+# pi-cockpit
+
+A responsive **agent cockpit** for [Pi](https://pi.dev): wide terminals get a docked Maestro operations sidebar, narrow terminals automatically fall back to the existing Todo and Agent widgets, and every layout keeps the Starship-style footer.
+
+It is the third plugin of the `pi-maestro-flow` project (alongside `pi-maestro-flow` and `pi-maestro-teammate`). It is installed and registered with `pi-maestro-flow`, but it also runs standalone. Current version: **0.5.1**.
+
+The dock is a non-capturing top-right overlay. Cockpit reserves its columns by wrapping the active TUI renderer at runtime, so the Pi workspace reflows instead of rendering underneath it. No Pi source files are modified.
+
+```
+ ┌─ AGENTS · 2 running ─────────────────────────────┐   ← setWidget(aboveEditor)
+ │ ⠋ explorer  #a1f3c2  map auth   read routes.ts   │
+ │ ⠋ explorer  #b9e014  trace jwt  read jwt.ts      │
+ ├─ TODO · 1/4 ─────────────────────────────────────┤
+ │ 01 ✓ map auth entrypoints                        │
+ │ 02 ⠋ trace jwt verify                            │
+ │ 03 · implement refresh                           │
+ │ 04 · add tests                                   │
+ └──────────────────────────────────────────────────┘
+ >  dispatch a goal…                                  ← editor (Pi native)
+ pi/stream-70b · ctx [████░░░░] 42% · $0.52 · 01:23   ← setFooter
+```
+
+## Install
+
+`pi-cockpit` comes automatically with the orchestration layer — installing `pi-maestro-flow` pulls `pi-cockpit` and registers it into `settings.packages` on postinstall, no manual setup required. To use it on its own:
+
+```bash
+pi install npm:pi-cockpit     # standalone from npm
+# or, for one run:
+pi -e ./packages/pi-cockpit
+```
+
+## What it shows
+
+- **SIDEBAR** — Workflow Session/Run progress, Goal state and budget, Todo tasks, Teammate roster, background jobs, and read-only Team Swarm progress. Empty sections disappear and constrained heights retain current or failed work before secondary detail.
+- **AGENTS** — every running teammate as a table row (status spinner · role · id · label · live tail), sorted running-first. Completed/failed agents show their total duration. On narrow terminals this returns to the below-editor widget.
+- **TODO** — the active plan as numbered rows with four states (done ✓ / in-progress spinner / blocked ! / pending ·). On narrow terminals this returns to the above-editor widget.
+- **Footer** — `provider/model · context gauge · ↑in ↓out · $cost · elapsed · git branch`. `bash_bg` background-job state lives on a **dedicated second footer row** so it no longer competes with the primary line.
+- **Thinking timer** — while the model is thinking, the folded thinking row shows a spinner and running elapsed time; when the run ends, it settles to the actual duration (e.g. `thoughts · 8.4s`).
+- **Quiet mode** — compresses the seven built-in tool calls (read/bash/edit/write/grep/find/ls) into single-line ✓/✗/⋯ summaries and folds thinking blocks. Two glyph sets available: `check` (✓/✗/⋯) and `dot` (●/○/◌). Toggle with `/cockpit quiet`; turning off requires `/reload` to restore native tool renderers.
+
+Toggle each block between list and compact with `/cockpit`.
+
+## Data sources (and the dependency this implies)
+
+| Block | Source | Available on bare Pi? |
+|-------|--------|------------------------|
+| MAESTRO | Versioned `cockpit:maestro-query` / `maestro:ui-snapshot` full snapshots from **pi-maestro-flow** | **No** — Workflow, Goal, and Swarm sections stay hidden |
+| AGENTS | `pi.events` channels `teammate:started` / `teammate:message` / `teammate:complete`, broadcast by **pi-maestro-teammate** | **No** — without that extension no events fire, the block stays hidden |
+| TODO | the `todo-state` snapshot the **pi-maestro-flow** `todo` tool persists after every mutation (re-read on each `tool_execution_end` and on `session_start`) | **No** — without the `todo` tool the block stays hidden |
+| Footer | `ctx.model`, `ctx.getContextUsage()`, session usage totals, `footerData.getGitBranch()` | **Yes** |
+
+So on a stock Pi the extension loads without error, the Maestro sections stay empty, and the footer remains available. The roster is **self-accumulated from event deltas**; Todo is back-filled from the latest durable `todo-state`. Workflow, Goal, and Swarm use a versioned full-replacement snapshot with generation fencing and a query path for cold-start recovery.
+
+Cockpit has no package dependency on `pi-maestro-flow`. It observes optional producers through public event contracts; removing a producer hides only the matching section.
+
+## Configuration
+
+`~/.pi/agent/cockpit.json` (created on first run):
+
+```json
+{
+  "enabled": true,
+  "quietMode": false,
+  "quietSymbols": "check",
+  "agentsMode": "list",
+  "todoMode": "list",
+  "todoExpanded": false,
+  "hideNativeAgents": true,
+  "icons": { "mode": "auto" },
+  "sidebar": {
+    "mode": "auto",
+    "width": 40,
+    "density": "comfortable"
+  },
+  "theme": ""
+}
+```
+
+- `quietMode`: when `true`, compresses built-in tool rendering and folds thinking blocks.
+- `quietSymbols`: `"check"` (✓/✗/⋯) or `"dot"` (●/○/◌) lifecycle glyphs for quiet tool rows.
+- `agentsMode` / `todoMode`: `"list"` or `"compact"`.
+- `todoExpanded`: when `true`, expands the todo widget by default.
+- `hideNativeAgents`: when `true`, clears the teammate extension's own `teammate-agents` widget (it draws a similar list *below* the editor) so the two don't duplicate. On by default.
+- `sidebar.mode`: `"auto"` or `"on"` enables the dock when at least 72 main columns plus 32 sidebar columns fit; `"off"` always uses widgets.
+- `sidebar.width`: persisted dock width, rounded and clamped to `32..56`; default `40`.
+- `sidebar.density`: `"comfortable"` or `"compact"`.
+- `icons.mode`: `"auto"` (detect Nerd Font), `"nerd"`, or `"ascii"`.
+- `theme`: named theme override; empty string follows the Pi session theme.
+
+## Commands
+
+- `/cockpit` — opens the settings overlay.
+- `/cockpit sidebar` — reports the current sidebar mode, width, and density.
+- `/cockpit sidebar auto|on|off` — selects dock behavior.
+- `/cockpit sidebar resize` or `Ctrl+Shift+R` — enters temporary Resize mode. Left/Right adjusts one column, Shift+Left/Shift+Right adjusts four, Enter accepts, and Escape rolls back. Mouse reporting is active only during Resize mode.
+- `/cockpit quiet` — toggles quiet mode; `/cockpit bg` shows background jobs.
+- `/theme` — switch theme with live preview; `/theme <name>` applies directly. Pi ships no standalone theme command; cockpit provides one.
+
+## Sidebar compatibility
+
+The split-pane wrapper depends on Pi's current TUI renderer shape and is verified against Pi `0.82.1`. A render integration failure disables the split and retries the original renderer at full width.
+
+Do not enable `pi-cockpit`'s dock and `pi-atelier@0.7.0`'s sidebar together. Both reserve columns by wrapping the same renderer, and `pi-atelier@0.7.0` does not participate in Cockpit's split-owner marker protocol. Use `"sidebar": { "mode": "off" }` when running Atelier.
+
+## Terminal feasibility — what this design deliberately does NOT do
+
+The original mockup was a browser page; a terminal is an ANSI stream with no DOM, no CSS, no focus, no hover. Four mockup effects are **out of scope** here, with replacements:
+
+| Mockup effect | Why it can't work in a TUI | Replacement |
+|---------------|----------------------------|-------------|
+| Input-focus "power-up" glow (`:has(:focus)`) | no focus pseudo-class; `render(width)` can't see focus | the stack's header dot turns accent-green while an agent is running |
+| Hover-to-expand chips/rows | no hover in a terminal | list mode shows everything; compact mode is one line; `/cockpit` toggles |
+| Scanlines / logo light-up animation | no overlay/animation layer | a braille spinner frame, advanced on each redraw |
+| In-stream thinking-collapse / edit progress bar / colored bash stdout | built-in message & built-in tool rendering is **not** replaceable by extensions (`renderCall`/`renderResult` only apply to tools *you* register) | the conversation stream is left to Pi's native renderer — it is context, not a cockpit deliverable |
+
+## Local development
+
+```bash
+cd packages/pi-cockpit
+npm test
+npm run typecheck
+npm pack --dry-run
+```
+
+The package lives inside the `pi-maestro-flow` monorepo under `packages/` so it resolves `@earendil-works/*` types from the root `node_modules`. It is also an exact-pinned dependency of `pi-maestro-flow` and ships as its own npm package (`pi-cockpit`).
+
+## License
+
+MIT. The split-pane behavior is adapted from `pi-atelier` under its MIT license; attribution is retained in `src/split-pane.ts`.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-cockpit",
-  "version": "0.5.1",
-  "description": "Agent cockpit for Pi: a list-mode status stack (live teammates + todo plan) pinned above the editor, plus a Starship-style footer. Renders only via public extension APIs (setWidget/setFooter).",
+  "version": "0.7.0",
+  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
   "type": "module",
   "keywords": [
     "pi-package",
@@ -18,7 +18,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "node --test --experimental-transform-types tests/config.test.ts tests/quiet-tools.test.ts tests/agents-store.test.ts tests/bash-bg-store.test.ts tests/bash-bg-widget.test.ts tests/bash-bg-overlay.test.ts tests/todo-store.test.ts tests/render.test.ts tests/footer.test.ts tests/extension-status.test.ts tests/integration-contract.test.ts tests/stack-widget.test.ts tests/settings-view.test.ts tests/thinking-fold.test.ts tests/thinking-timer.test.ts tests/ambient.test.ts tests/viewport.test.ts tests/theme-picker.test.ts",
+    "test": "node --test --experimental-transform-types tests/config.test.ts tests/public-events.test.ts tests/maestro-store.test.ts tests/split-pane.test.ts tests/sidebar-render.test.ts tests/sidebar-controller.test.ts tests/viewport-stability.test.ts tests/quiet-tools.test.ts tests/agents-store.test.ts tests/bash-bg-store.test.ts tests/bash-bg-widget.test.ts tests/bash-bg-overlay.test.ts tests/todo-store.test.ts tests/render.test.ts tests/footer.test.ts tests/extension-status.test.ts tests/integration-contract.test.ts tests/stack-widget.test.ts tests/settings-view.test.ts tests/thinking-fold.test.ts tests/thinking-timer.test.ts tests/tick-policy.test.ts tests/ambient.test.ts tests/viewport.test.ts tests/theme-picker.test.ts",
     "typecheck": "tsc --noEmit"
   },
   "pi": {
@@ -34,7 +34,7 @@
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
-    "pi-maestro-teammate": "^1.0.0"
+    "pi-maestro-teammate": "^1.5.0"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-agent-core": {
@@ -59,12 +59,13 @@
     "@earendil-works/pi-coding-agent": "0.82.1",
     "@earendil-works/pi-tui": "0.82.1",
     "@types/node": "^22.0.0",
-    "pi-maestro-teammate": "1.3.1",
+    "pi-maestro-teammate": "1.5.0",
     "typescript": "^5.5.0"
   },
   "main": "./src/index.ts",
   "exports": {
     ".": "./src/index.ts",
+    "./v1/events": "./src/public/v1/events.ts",
     "./src/*": "./src/*"
   }
 }

package/src/agents-store.ts

@@ -1,4 +1,9 @@
-import type { TeammateCompleteEvent } from "pi-maestro-teammate/v1/events";
+import type {
+	TeammateCompleteEvent,
+	TeammateProgressMessageEvent,
+	TeammateStartedEvent,
+} from "pi-maestro-teammate/v1/events";
+import type { AgentProgressSnapshot } from "pi-maestro-teammate/v1/types";
 import { sanitizeExtensionStatusText } from "./extension-status.ts";
 import type { AgentRow, AgentStatus } from "./types.ts";
 
@@ -19,56 +24,28 @@ function truncateTail(raw: string): string {
 	return flat.length > TAIL_MAX ? flat.slice(0, TAIL_MAX - 1) + "…" : flat;
 }
 
-// Shapes mirror what pi-maestro-teammate emits on pi.events (teammate/.../index.ts:378/1636/3420).
-export interface StartedPayload {
-	correlationId: string;
-	agent: string;
-	name?: string;
-	spawnedBy?: string;
-	startedAt?: number | string;
-	lastActivityAt?: number | string;
-	status?: string;
-}
-export interface ProgressPayload {
-	agent: string;
-	name?: string;
-	correlationId: string;
-	taskIndex: number;
-	dependencies?: number[];
-	status?: string;
-	startedAt?: number | string;
-	completedAt?: number | string;
-	durationMs?: number;
-	lastActivityAt?: number | string;
+// Store inputs are compatibility-relaxed projections of the versioned public
+// contract. The event boundary validates discriminators and identifiers; the
+// optional fields let older teammate versions continue to feed the same store.
+export type StartedPayload = Pick<TeammateStartedEvent, "correlationId" | "agent">
+	& Partial<Omit<TeammateStartedEvent, "correlationId" | "agent" | "startedAt">>
+	& { startedAt?: number | string };
+export type ProgressPayload = Pick<AgentProgressSnapshot, "correlationId" | "agent" | "taskIndex">
+	& Partial<Omit<AgentProgressSnapshot, "correlationId" | "agent" | "taskIndex" | "startedAt" | "completedAt">>
+	& { startedAt?: number | string; completedAt?: number | string };
+export type MessagePayload = Partial<Omit<
+	TeammateProgressMessageEvent,
+	"progress" | "recentTools" | "isSend" | "isInteraction"
+>> & {
+	progress?: ProgressPayload[];
 	recentTools?: Array<string | { name?: string; status?: string }>;
-	toolCount?: number;
-	tokens?: number;
-	inputTokens?: number;
-	outputTokens?: number;
-	lastMessage?: string;
-}
-export interface MessagePayload {
-	correlationId: string;
-	taskCorrelationId?: string;
-	// Present on progress/interaction deltas (teammate/.../index.ts publishProgress);
-	// absent on send deltas. Used to self-heal a row when `started` was missed.
-	agent?: string;
-	name?: string;
-	taskIndex?: number;
-	dependencies?: number[];
+	isSend?: boolean;
+	isInteraction?: boolean;
+	/** Compatibility with pre-v1 progress deltas; discriminated send events are ignored. */
 	message?: string;
-	lastMessage?: string;
-	recentTools?: Array<string | { name?: string; status?: string }>;
-	toolCount?: number;
-	tokens?: number;
-	inputTokens?: number;
-	outputTokens?: number;
-	status?: string;
-	lastActivityAt?: number | string;
-	progress?: ProgressPayload[];
-}
+};
 export type CompletePayload = Pick<TeammateCompleteEvent, "correlationId" | "exitCode">
-	& Partial<Pick<TeammateCompleteEvent, "durationMs">>;
+	& Partial<Pick<TeammateCompleteEvent, "durationMs" | "wakeable" | "cancelled">>;
 
 /**
  * How long a failed agent stays on screen after it completes.
@@ -78,6 +55,22 @@ export type CompletePayload = Pick<TeammateCompleteEvent, "correlationId" | "exi
  */
 export const FAILED_LINGER_MS = 30_000;
 
+/**
+ * How long a sleeping (wakeable) row stays visible after completion.
+ *
+ * Matches the native widget's idle-hide window so both surfaces agree on
+ * when an idle agent stops occupying screen space.
+ */
+export const SLEEPING_LINGER_MS = 60_000;
+
+/**
+ * How long a terminated (cancelled/aborted) row stays on screen after it ends.
+ *
+ * Shorter than a failure: cancellation is expected, but the user should still
+ * see the × long enough to read which agent was taken down.
+ */
+export const TERMINATED_LINGER_MS = 15_000;
+
 /**
  * How long a completed agent's tombstone suppresses self-healing.
  *
@@ -113,12 +106,23 @@ export function mapAgentStatus(status: unknown): AgentStatus {
 			return "done";
 		case "failed":
 			return "failed";
+		case "terminated":
+			return "terminated";
 		case "running":
 		default:
 			return "running";
 	}
 }
 
+export const AGENT_STALL_TIMEOUT_MS = 30_000;
+export type AgentDisplayStatus = AgentStatus | "result-ready" | "stalled";
+
+export function effectiveAgentStatus(row: AgentRow, now: number = Date.now()): AgentDisplayStatus {
+	if (row.status !== "running") return row.status;
+	if (row.resultReadyAt !== undefined) return "result-ready";
+	return now - row.lastActivityAt >= AGENT_STALL_TIMEOUT_MS ? "stalled" : "running";
+}
+
 function normalizeStartedAt(value: number | string | undefined, fallback: number): number {
 	if (typeof value === "number" && Number.isFinite(value)) return value;
 	if (typeof value === "string") {
@@ -141,7 +145,7 @@ function terminalTime(
 	return row.finishedAt ?? now;
 }
 
-function latestTool(tools: MessagePayload["recentTools"]): string | undefined {
+function latestTool(tools: Array<string | { name?: string; status?: string }> | undefined): string | undefined {
 	if (!tools?.length) return undefined;
 	const tool = tools.find((candidate) => typeof candidate === "object" && candidate?.status === "running")
 		?? tools.at(-1);
@@ -170,7 +174,16 @@ export class AgentsStore {
 		return at !== undefined && now - at < COMPLETED_TOMBSTONE_MS;
 	}
 
+	private canMaterialize(id: string, parentId: string | undefined, now: number): boolean {
+		if (this.isTombstoned(parentId, now)) return false;
+		if (!this.isTombstoned(id, now)) return true;
+		// An explicit parent restart clears only the graph container's tombstone.
+		// Its next full snapshot is authoritative for the child lifecycle too.
+		return parentId !== undefined && parentId !== id && this.roster.has(parentId);
+	}
+
 	applyStarted(p: StartedPayload, now: number = Date.now()): void {
+		if (typeof p.correlationId !== "string" || p.correlationId.length === 0) return;
 		const id = p.correlationId;
 		// An explicit start is authoritative: a woken or re-dispatched agent
 		// reuses its correlationId and must reappear even if an earlier run was
@@ -194,18 +207,27 @@ export class AgentsStore {
 					? { parentCorrelationId: prev.parentCorrelationId }
 					: {}),
 		};
-		if (row.status !== "done" && row.status !== "failed") delete row.finishedAt;
+		if (row.status !== "done" && row.status !== "failed" && row.status !== "terminated") delete row.finishedAt;
 		this.roster.set(id, row);
 	}
 
 	applyMessage(p: MessagePayload, now = Date.now()): void {
+		if (p.isSend === true || p.isInteraction === true) return;
+		if (typeof p.correlationId !== "string" || p.correlationId.length === 0) return;
 		if (p.progress) {
-			for (const progress of p.progress) this.applyProgress(p.correlationId, progress, now);
+			for (const progress of p.progress) {
+				if (typeof progress.correlationId !== "string" || progress.correlationId.length === 0) continue;
+				this.applyProgress(p.correlationId, progress, now);
+			}
 		}
-		const targetId = p.taskCorrelationId ?? p.correlationId;
+		const targetId = typeof p.taskCorrelationId === "string" && p.taskCorrelationId.length > 0
+			? p.taskCorrelationId
+			: p.correlationId;
+		const parentId = p.taskCorrelationId && p.taskCorrelationId !== p.correlationId
+			? p.correlationId
+			: undefined;
 		if (!this.roster.has(targetId)
-			&& !this.isTombstoned(targetId, now)
-			&& !this.isTombstoned(p.correlationId, now)) {
+			&& this.canMaterialize(targetId, parentId, now)) {
 			// Self-heal the roster: a running agent must stay visible even when its
 			// `started` delta was missed (cold start, event reorder, or a foreground
 			// dispatch that detached to background). Materialize the row from this
@@ -228,7 +250,7 @@ export class AgentsStore {
 		if (!row) return;
 		const progressActivity = p.progress?.find((progress) => progress.correlationId === targetId)?.lastActivityAt;
 		row.lastActivityAt = normalizeStartedAt(p.lastActivityAt ?? progressActivity, now);
-		const tail = p.message ?? p.lastMessage;
+		const tail = p.lastMessage ?? p.message;
 		if (typeof tail === "string" && tail.length > 0) row.tail = truncateTail(tail);
 		if (p.recentTools) {
 			const tool = latestTool(p.recentTools);
@@ -239,17 +261,29 @@ export class AgentsStore {
 		if (typeof p.tokens === "number") row.tokens = p.tokens;
 		if (typeof p.inputTokens === "number") row.inputTokens = p.inputTokens;
 		if (typeof p.outputTokens === "number") row.outputTokens = p.outputTokens;
+		if (typeof p.cacheReadTokens === "number") row.cacheReadTokens = p.cacheReadTokens;
+		if (typeof p.cacheWriteTokens === "number") row.cacheWriteTokens = p.cacheWriteTokens;
+		if (typeof p.error === "string") row.error = truncateTail(p.error);
+		if (typeof p.requestedModel === "string") row.requestedModel = clean(p.requestedModel);
+		if (typeof p.resolvedModel === "string") row.resolvedModel = clean(p.resolvedModel);
+		if (Array.isArray(p.attemptedModels)) {
+			row.attemptedModels = p.attemptedModels.map((model) => clean(model)).filter(Boolean);
+		}
 		if (typeof p.status === "string") {
 			row.taskStatus = p.status;
 			row.status = mapAgentStatus(p.status);
-			if (row.status === "done" || row.status === "failed") row.finishedAt ??= now;
-			else delete row.finishedAt;
+			if (row.status === "done" || row.status === "failed" || row.status === "terminated") {
+				row.finishedAt ??= now;
+			} else {
+				delete row.finishedAt;
+			}
 		}
 		if (typeof p.taskIndex === "number") row.taskIndex = p.taskIndex;
 		if (Array.isArray(p.dependencies)) row.dependencies = [...p.dependencies];
 	}
 
 	applyComplete(p: CompletePayload, now = Date.now()): void {
+		if (typeof p.correlationId !== "string" || p.correlationId.length === 0) return;
 		const pending = [p.correlationId];
 		const visited = new Set<string>();
 		while (pending.length > 0) {
@@ -263,16 +297,33 @@ export class AgentsStore {
 			// only evidence of the failure disappeared in the same frame it appeared.
 			// Successes still vanish immediately — the work has simply moved on.
 			const row = this.roster.get(id);
+			const cancelledById = id === p.correlationId && p.cancelled === true;
 			const failedByExitCode = id === p.correlationId
 				&& Number.isFinite(p.exitCode)
 				&& p.exitCode !== 0;
-			if (row && (row.status === "failed" || failedByExitCode)) {
+			if (row && (cancelledById || row.status === "terminated")) {
+				// Cancelled/terminated runs carry exitCode 1 but are not failures:
+				// a user abort or a result-ready reclaim must not light the red ✗.
+				row.status = "terminated";
+				row.taskStatus = "terminated";
+				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
+				row.lastActivityAt = now;
+				delete row.activeTool;
+				delete row.failedAt;
+			} else if (row && (row.status === "failed" || failedByExitCode)) {
 				row.status = "failed";
 				row.taskStatus = "failed";
 				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
 				row.failedAt = now;
 				row.lastActivityAt = now;
 				delete row.activeTool;
+			} else if (row && id === p.correlationId && p.wakeable && p.exitCode === 0) {
+				// A wakeable agent enters sleeping state after completion.
+				// Keep the row visible so the user can see it is idle but recallable.
+				row.status = "sleeping";
+				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
+				row.lastActivityAt = now;
+				delete row.activeTool;
 			} else {
 				this.roster.delete(id);
 				// Tombstone even when the row never existed: a `complete` that beats
@@ -282,13 +333,19 @@ export class AgentsStore {
 		}
 	}
 
-	/** Drop failed rows that have had their time on screen. Returns true if any went. */
+	/** Drop failed, terminated or expired sleeping rows that have had their time on screen. Returns true if any went. */
 	prune(now = Date.now()): boolean {
 		let changed = false;
 		for (const [id, row] of this.roster) {
 			if (row.failedAt !== undefined && now - row.failedAt >= FAILED_LINGER_MS) {
 				this.roster.delete(id);
 				changed = true;
+			} else if (row.status === "terminated" && row.finishedAt !== undefined && now - row.finishedAt >= TERMINATED_LINGER_MS) {
+				this.roster.delete(id);
+				changed = true;
+			} else if (row.status === "sleeping" && row.finishedAt !== undefined && now - row.finishedAt >= SLEEPING_LINGER_MS) {
+				this.roster.delete(id);
+				changed = true;
 			}
 		}
 		for (const [id, at] of this.completedAt) {
@@ -297,18 +354,19 @@ export class AgentsStore {
 		return changed;
 	}
 
-	/** True while a failed row is still counting down, so the redraw loop must run. */
+	/** True while a failed, terminated or sleeping row is still counting down, so the redraw loop must run. */
 	hasLingering(): boolean {
 		for (const row of this.roster.values()) {
 			if (row.failedAt !== undefined) return true;
+			if (row.status === "terminated") return true;
+			if (row.status === "sleeping") return true;
 		}
 		return false;
 	}
 
 	private applyProgress(parentCorrelationId: string, p: ProgressPayload, now: number): void {
 		if (!this.roster.has(p.correlationId)
-			&& !this.isTombstoned(p.correlationId, now)
-			&& !this.isTombstoned(parentCorrelationId, now)) {
+			&& this.canMaterialize(p.correlationId, parentCorrelationId, now)) {
 			// Self-heal: see applyMessage. A graph child whose `started` delta was
 			// missed still materializes from its first progress event — unless the
 			// child or its graph parent already completed, in which case this late
@@ -339,12 +397,15 @@ export class AgentsStore {
 		if (typeof p.status === "string") {
 			row.taskStatus = p.status;
 			row.status = mapAgentStatus(p.status);
-			if (row.status === "done" || row.status === "failed") {
+			if (row.status === "done" || row.status === "failed" || row.status === "terminated") {
 				row.finishedAt = terminalTime(row, p, now);
 			} else {
 				delete row.finishedAt;
 			}
 		}
+		row.resultReadyAt = p.resultReadyAt === undefined
+			? undefined
+			: normalizeStartedAt(p.resultReadyAt, now);
 		row.taskIndex = p.taskIndex;
 		row.dependencies = Array.isArray(p.dependencies) ? [...p.dependencies] : [];
 		row.lastActivityAt = normalizeStartedAt(p.lastActivityAt, now);
@@ -357,6 +418,16 @@ export class AgentsStore {
 		if (typeof p.tokens === "number") row.tokens = p.tokens;
 		if (typeof p.inputTokens === "number") row.inputTokens = p.inputTokens;
 		if (typeof p.outputTokens === "number") row.outputTokens = p.outputTokens;
+		row.cacheReadTokens = p.cacheReadTokens;
+		row.cacheWriteTokens = p.cacheWriteTokens;
+		if (p.error === undefined) delete row.error;
+		else row.error = truncateTail(p.error);
+		if (p.requestedModel === undefined) delete row.requestedModel;
+		else row.requestedModel = clean(p.requestedModel);
+		if (p.resolvedModel === undefined) delete row.resolvedModel;
+		else row.resolvedModel = clean(p.resolvedModel);
+		if (p.attemptedModels === undefined) delete row.attemptedModels;
+		else row.attemptedModels = p.attemptedModels.map((model) => clean(model)).filter(Boolean);
 		if (typeof p.lastMessage === "string" && p.lastMessage.length > 0) {
 			row.tail = truncateTail(p.lastMessage);
 		}