pi-cockpit 0.6.0 → 0.8.0

package/README.md

@@ -2,7 +2,7 @@
 
 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**.
+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.8.0**.
 
 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.
 
@@ -73,6 +73,16 @@ Cockpit has no package dependency on `pi-maestro-flow`. It observes optional pro
     "width": 40,
     "density": "comfortable"
   },
+  "title": {
+    "enabled": true,
+    "showSession": true,
+    "showCwd": false,
+    "showModel": false,
+    "showThinking": false,
+    "showGit": false,
+    "showMaestro": false,
+    "maxLength": 80
+  },
   "theme": ""
 }
 ```
@@ -86,6 +96,17 @@ Cockpit has no package dependency on `pi-maestro-flow`. It observes optional pro
 - `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"`.
+- `title.enabled`: master switch for the terminal tab title (session summary + working state + opt-in tags). On by default.
+- `title.showSession`: include the session summary (the `session_info` name, else a short session id) right after `pi`. On by default.
+- `title.showCwd`: include the working directory after the session. Off by default — the title stays short, since the tab strip has no room for a wall of tags.
+- `title.showModel`: include the active model tag (`m:gpt-5.6-sol`). Off by default.
+- `title.showThinking`: include the thinking level tag (`t:high`); skipped while off. Off by default.
+- `title.showGit`: include the git branch tag (`git:main`, `git:detached`); read synchronously from `.git/HEAD`, so it costs no process spawn. Off by default.
+- `title.showMaestro`: include the Maestro workflow status tag (`wf:running`, `wf:done`). Off by default.
+- `title.maxLength`: hard cap on the composed title; the middle is ellided to keep the head and the working-state tail. Clamped to `20..200`; default `80`.
+- `title.generationModel`: `"provider/model"` (e.g. `"maestro-qwen/qwen3.8-max-preview"`) of a model registered with the `/api-manager` command (or any other provider pi resolves). When set, the session title is generated by that model over the first completed turn (user prompt + assistant reply) through its OpenAI-compatible endpoint, with a 10s timeout. Empty (default) uses the offline rule-based extractor instead. Generation is best-effort — on any failure the title silently falls back to the rule-based one.
+
+The tab title is `frame + pi - <session> - <working state>`. The session part follows Claude Code's chain (`sessionTitle ?? agentTitle ?? haikuTitle ?? default`): the `/session name` title wins, otherwise the generated title, otherwise a short session id. The frame is Claude Code's title chrome: `⠂`/`⠐` braille spinner while a turn runs, static `✳` when idle; failure replaces it with `✗`. On quit, Cockpit clears the title so no stale tab label lingers (Claude Code's `CLEAR_TERMINAL_TITLE`).
 - `theme`: named theme override; empty string follows the Pi session theme.
 
 ## Commands

package/package.json

@@ -1,71 +1,75 @@
-{
-  "name": "pi-cockpit",
-  "version": "0.6.0",
-  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
-  "type": "module",
-  "keywords": [
-    "pi-package",
-    "pi",
-    "pi-extension",
-    "tui",
-    "teammate",
-    "todo"
-  ],
-  "license": "MIT",
-  "files": [
-    "src/",
-    "themes/",
-    "README.md"
-  ],
-  "scripts": {
-    "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/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",
-    "typecheck": "tsc --noEmit"
-  },
-  "pi": {
-    "extensions": [
-      "./src/extension/index.ts"
-    ],
-    "themes": [
-      "./themes"
-    ]
-  },
-  "peerDependencies": {
-    "@earendil-works/pi-agent-core": "*",
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "pi-maestro-teammate": "^1.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@earendil-works/pi-agent-core": {
-      "optional": true
-    },
-    "@earendil-works/pi-ai": {
-      "optional": true
-    },
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    },
-    "@earendil-works/pi-tui": {
-      "optional": true
-    },
-    "pi-maestro-teammate": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "0.82.1",
-    "@earendil-works/pi-ai": "0.82.1",
-    "@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",
-    "typescript": "^5.5.0"
-  },
-  "main": "./src/index.ts",
-  "exports": {
-    ".": "./src/index.ts",
-    "./v1/events": "./src/public/v1/events.ts",
-    "./src/*": "./src/*"
-  }
-}
+{
+  "name": "pi-cockpit",
+  "version": "0.8.0",
+  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
+  "type": "module",
+  "keywords": [
+    "pi-package",
+    "pi",
+    "pi-extension",
+    "tui",
+    "teammate",
+    "todo"
+  ],
+  "license": "MIT",
+  "files": [
+    "src/",
+    "themes/",
+    "README.md"
+  ],
+  "scripts": {
+    "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/editor-bottom.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 tests/title-gen.test.ts tests/title-llm.test.ts tests/settings-registry.test.ts tests/settings-coordinator.test.ts tests/settings-locale.test.ts tests/settings-shell.test.ts tests/settings-cockpit-provider.test.ts tests/settings-cross-package.test.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "pi": {
+    "extensions": [
+      "./src/extension/index.ts"
+    ],
+    "themes": [
+      "./themes"
+    ]
+  },
+  "dependencies": {
+    "pi-maestro-settings-core": "0.1.0",
+    "proper-lockfile": "4.1.2"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": "*",
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "pi-maestro-teammate": "^1.6.0"
+  },
+  "peerDependenciesMeta": {
+    "@earendil-works/pi-agent-core": {
+      "optional": true
+    },
+    "@earendil-works/pi-ai": {
+      "optional": true
+    },
+    "@earendil-works/pi-coding-agent": {
+      "optional": true
+    },
+    "@earendil-works/pi-tui": {
+      "optional": true
+    },
+    "pi-maestro-teammate": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@earendil-works/pi-agent-core": "0.83.0",
+    "@earendil-works/pi-ai": "0.83.0",
+    "@earendil-works/pi-coding-agent": "0.83.0",
+    "@earendil-works/pi-tui": "0.83.0",
+    "@types/node": "^22.0.0",
+    "pi-maestro-teammate": "1.6.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" | "wakeable">>;
+	& Partial<Pick<TeammateCompleteEvent, "durationMs" | "wakeable" | "cancelled">>;
 
 /**
  * How long a failed agent stays on screen after it completes.
@@ -86,6 +63,14 @@ export const FAILED_LINGER_MS = 30_000;
  */
 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.
  *
@@ -121,12 +106,30 @@ export function mapAgentStatus(status: unknown): AgentStatus {
 			return "done";
 		case "failed":
 			return "failed";
+		case "terminated":
+			return "terminated";
 		case "running":
 		default:
 			return "running";
 	}
 }
 
+function activityFromProgressStatus(status: unknown): "running" | "sleeping" | undefined {
+	if (typeof status !== "string") return undefined;
+	return status === "sleeping" || status === "completed" || status === "failed" || status === "terminated"
+		? "sleeping"
+		: "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") {
@@ -142,14 +145,15 @@ function terminalTime(
 	now: number,
 ): number {
 	const completedAt = normalizeStartedAt(payload.completedAt, Number.NaN);
-	if (Number.isFinite(completedAt)) return Math.max(row.startedAt, completedAt);
+	const turnStartedAt = row.turnStartedAt ?? row.startedAt;
+	if (Number.isFinite(completedAt)) return Math.max(turnStartedAt, completedAt);
 	if (typeof payload.durationMs === "number" && Number.isFinite(payload.durationMs)) {
-		return row.startedAt + Math.max(0, payload.durationMs);
+		return turnStartedAt + Math.max(0, payload.durationMs);
 	}
 	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);
@@ -187,6 +191,7 @@ export class AgentsStore {
 	}
 
 	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
@@ -201,6 +206,14 @@ export class AgentsStore {
 			role: deriveRole(p.agent, p.name),
 			task: prev?.task ?? clean(p.name),
 			status: p.status === undefined ? prev?.status ?? "running" : mapAgentStatus(p.status),
+			phase: typeof p.phase === "string" ? clean(p.phase) : prev?.phase,
+			lastOutcome: p.lastOutcome
+				? {
+					status: p.lastOutcome.status,
+					...(p.lastOutcome.message ? { message: truncateTail(p.lastOutcome.message) } : {}),
+					settledAt: p.lastOutcome.settledAt,
+				}
+				: prev?.lastOutcome,
 			tail: prev?.tail ?? "",
 			startedAt: prev?.startedAt ?? normalizeStartedAt(p.startedAt, now),
 			lastActivityAt: normalizeStartedAt(p.lastActivityAt, now),
@@ -210,15 +223,30 @@ export class AgentsStore {
 					? { parentCorrelationId: prev.parentCorrelationId }
 					: {}),
 		};
-		if (row.status !== "done" && row.status !== "failed") delete row.finishedAt;
+		if (row.status === "running") {
+			row.turnStartedAt = now;
+			delete row.finishedAt;
+			delete row.failedAt;
+		} else if (row.status === "sleeping") {
+			row.finishedAt = row.lastOutcome?.settledAt ?? prev?.finishedAt ?? now;
+		} else 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;
@@ -235,7 +263,7 @@ export class AgentsStore {
 				correlationId: targetId,
 				agent: p.agent ?? "",
 				name: p.name,
-				status: p.status,
+				status: activityFromProgressStatus(p.status),
 				lastActivityAt: p.lastActivityAt,
 				...(p.taskCorrelationId && p.taskCorrelationId !== p.correlationId
 					? { spawnedBy: p.correlationId }
@@ -246,7 +274,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);
@@ -257,17 +285,31 @@ 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.phase === "string") row.phase = clean(p.phase);
+		else if (row.status === "sleeping") delete row.phase;
 		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) {
@@ -281,21 +323,46 @@ 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)) {
-				row.status = "failed";
-				row.taskStatus = "failed";
+			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.failedAt = now;
+				row.lastOutcome = { status: "terminated", settledAt: row.finishedAt };
 				row.lastActivityAt = now;
 				delete row.activeTool;
-			} else if (row && 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.
+				delete row.failedAt;
+			} else if (row && id === p.correlationId && p.wakeable) {
+				// A recoverable logical agent is sleeping regardless of the previous
+				// run outcome. Failure remains visible as orthogonal outcome metadata.
 				row.status = "sleeping";
+				row.taskStatus = "sleeping";
+				row.phase = undefined;
+				row.finishedAt = terminalTime(row, p, now);
+				row.lastActivityAt = now;
+				row.lastOutcome = {
+					status: failedByExitCode ? "failed" : "completed",
+					...(failedByExitCode && row.error ? { message: row.error } : {}),
+					settledAt: row.finishedAt,
+				};
+				if (failedByExitCode) row.failedAt = now;
+				else delete row.failedAt;
+				delete row.activeTool;
+			} else if (row && (row.status === "failed" || failedByExitCode)) {
+				row.status = "failed";
+				row.taskStatus = "failed";
 				row.finishedAt = terminalTime(row, id === p.correlationId ? p : {}, now);
+				row.lastOutcome = {
+					status: "failed",
+					...(row.error ? { message: row.error } : {}),
+					settledAt: row.finishedAt,
+				};
+				row.failedAt = now;
 				row.lastActivityAt = now;
 				delete row.activeTool;
 			} else {
@@ -307,13 +374,16 @@ export class AgentsStore {
 		}
 	}
 
-	/** Drop failed or expired sleeping 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;
@@ -325,10 +395,11 @@ export class AgentsStore {
 		return changed;
 	}
 
-	/** True while a failed or sleeping 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;
@@ -345,7 +416,7 @@ export class AgentsStore {
 				correlationId: p.correlationId,
 				agent: p.agent,
 				name: p.name,
-				status: p.status,
+				status: activityFromProgressStatus(p.status),
 				startedAt: p.startedAt,
 				lastActivityAt: p.lastActivityAt,
 				...(parentCorrelationId !== p.correlationId
@@ -367,12 +438,17 @@ 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;
 			}
 		}
+		if (typeof p.phase === "string") row.phase = clean(p.phase);
+		else if (row.status === "sleeping") delete row.phase;
+		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);
@@ -385,6 +461,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);
 		}