pi-cockpit 0.24.0 → 0.24.1

package/node_modules/pi-maestro-settings-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-maestro-settings-core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Versioned Settings and i18n contracts shared by Pi Maestro plugins.",
   "type": "module",
   "engines": {

package/node_modules/pi-maestro-settings-core/src/pi-host.ts

@@ -0,0 +1,22 @@
+/** Classify only the supplied host version; prereleases and unsupported hosts are unknown. */
+export function getPiHostMode(version: unknown): "native" | "legacy" | "unknown" {
+  if (typeof version !== "string") return "unknown";
+  const match = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/.exec(version);
+  if (!match || match[0] !== version) return "unknown";
+
+  const [major, minor, patch] = match.slice(1, 4).map(Number);
+  if (![major, minor, patch].every(Number.isSafeInteger)) return "unknown";
+  if (major > 0 || minor >= 99) return "native";
+  if (minor >= 87) return "legacy";
+  return "unknown";
+}
+
+/** Missing native APIs never authorize legacy fallback on a native or unknown host. */
+export function getPiFeatureOwner(
+  version: unknown,
+  apiAvailable: boolean,
+): "native" | "legacy" | "unavailable" {
+  const mode = getPiHostMode(version);
+  if (mode === "legacy") return "legacy";
+  return mode === "native" && apiAvailable ? "native" : "unavailable";
+}

package/node_modules/pi-maestro-settings-core/src/public/v1/index.ts

@@ -1,6 +1,7 @@
 export * from "./events.ts";
 export * from "./provider.ts";
 export * from "./schema.ts";
+export { getPiHostMode, getPiFeatureOwner } from "../../pi-host.ts";
 
 // The keyboard-shortcut helpers live in the shared UI primitives module so
 // Cockpit, Flow, and Teammate all import the same implementation. Keep the

package/package.json

@@ -1,85 +1,85 @@
-{
-  "name": "pi-cockpit",
-  "version": "0.24.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/ui-ownership-runtime.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/compaction-style.test.ts tests/quiet-tools.test.ts tests/edit-guard.test.ts tests/agents-store.test.ts tests/endpoint-store.test.ts tests/session-ui-state.test.ts tests/session-tabs.test.ts tests/agent-bar.test.ts tests/supervision-store.test.ts tests/bash-bg-store.test.ts tests/bash-bg-widget.test.ts tests/bash-bg-overlay.test.ts tests/todo-overlay.test.ts tests/agent-overlay.test.ts tests/todo-store.test.ts tests/render.test.ts tests/agent-scroll.test.ts tests/session-bar.test.ts tests/session-detail.test.ts tests/footer.test.ts tests/extension-status.test.ts tests/teammate-message.test.ts tests/input-routing.test.ts tests/input-history-store.test.ts tests/unified-editor.test.ts tests/integration-contract.test.ts tests/stack-widget.test.ts tests/zen-render.test.ts tests/zen-browse.test.ts tests/zen-sheet.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/model-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/tui-i18n.test.ts tests/settings-shell.test.ts tests/settings-cockpit-provider.test.ts tests/settings-cross-package.test.ts tests/ui-primitives.test.ts tests/settings-shell-secret.test.ts tests/settings-shell-listcrud.test.ts tests/capturing-overlay.test.ts tests/claude-editor.test.ts tests/fullscreen-controller.test.ts tests/transcript-selection.test.ts tests/terminal-cleanup.test.ts tests/terminal-capability.test.ts tests/usage-core.test.ts tests/usage-extension.test.ts tests/usage-history.test.ts tests/usage-sparkline.test.ts tests/patch-health.test.ts",
-    "typecheck": "tsc --noEmit",
-    "prepack": "node ../../scripts/bundle-settings-core.mjs",
-    "postpack": "node ../../scripts/bundle-settings-core.mjs --clean"
-  },
-  "pi": {
-    "extensions": [
-      "./src/extension/index.ts"
-    ],
-    "themes": [
-      "./themes"
-    ]
-  },
-  "dependencies": {
-    "pi-maestro-settings-core": "0.2.2",
-    "proper-lockfile": "4.1.2"
-  },
-  "bundledDependencies": [
-    "pi-maestro-settings-core"
-  ],
-  "peerDependencies": {
-    "@earendil-works/pi-agent-core": "*",
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "pi-maestro-teammate": "^2.5.0",
-    "typebox": "*"
-  },
-  "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
-    },
-    "typebox": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "0.84.4",
-    "@earendil-works/pi-ai": "0.84.4",
-    "@earendil-works/pi-coding-agent": "0.84.4",
-    "@earendil-works/pi-tui": "0.84.4",
-    "@types/node": "^22.0.0",
-    "pi-maestro-teammate": "2.7.0",
-    "typebox": "1.3.7",
-    "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.24.1",
+  "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/ui-ownership-runtime.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/compaction-style.test.ts tests/quiet-tools.test.ts tests/native-host.test.ts tests/native-host-entry.test.ts tests/native-host-quiet.test.ts tests/edit-guard.test.ts tests/agents-store.test.ts tests/endpoint-store.test.ts tests/session-ui-state.test.ts tests/session-tabs.test.ts tests/agent-bar.test.ts tests/supervision-store.test.ts tests/bash-bg-store.test.ts tests/bash-bg-widget.test.ts tests/bash-bg-overlay.test.ts tests/todo-overlay.test.ts tests/agent-overlay.test.ts tests/todo-store.test.ts tests/render.test.ts tests/agent-scroll.test.ts tests/session-bar.test.ts tests/session-detail.test.ts tests/footer.test.ts tests/extension-status.test.ts tests/teammate-message.test.ts tests/input-routing.test.ts tests/input-history-store.test.ts tests/unified-editor.test.ts tests/integration-contract.test.ts tests/stack-widget.test.ts tests/zen-render.test.ts tests/zen-browse.test.ts tests/zen-sheet.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/model-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/tui-i18n.test.ts tests/settings-shell.test.ts tests/settings-cockpit-provider.test.ts tests/settings-cross-package.test.ts tests/ui-primitives.test.ts tests/settings-shell-secret.test.ts tests/settings-shell-listcrud.test.ts tests/capturing-overlay.test.ts tests/claude-editor.test.ts tests/fullscreen-controller.test.ts tests/transcript-selection.test.ts tests/terminal-cleanup.test.ts tests/terminal-capability.test.ts tests/usage-core.test.ts tests/usage-extension.test.ts tests/usage-history.test.ts tests/usage-sparkline.test.ts tests/patch-health.test.ts",
+    "typecheck": "tsc --noEmit",
+    "prepack": "node ../../scripts/bundle-settings-core.mjs",
+    "postpack": "node ../../scripts/bundle-settings-core.mjs --clean"
+  },
+  "pi": {
+    "extensions": [
+      "./src/extension/index.ts"
+    ],
+    "themes": [
+      "./themes"
+    ]
+  },
+  "dependencies": {
+    "pi-maestro-settings-core": "0.2.3",
+    "proper-lockfile": "4.1.2"
+  },
+  "bundledDependencies": [
+    "pi-maestro-settings-core"
+  ],
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": "*",
+    "@earendil-works/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "pi-maestro-teammate": "^2.5.0",
+    "typebox": "*"
+  },
+  "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
+    },
+    "typebox": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@earendil-works/pi-agent-core": "0.99.0",
+    "@earendil-works/pi-ai": "0.99.0",
+    "@earendil-works/pi-coding-agent": "0.99.0",
+    "@earendil-works/pi-tui": "0.99.0",
+    "@types/node": "^22.0.0",
+    "pi-maestro-teammate": "2.7.2",
+    "typebox": "1.3.27",
+    "typescript": "^5.5.0"
+  },
+  "main": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts",
+    "./v1/events": "./src/public/v1/events.ts",
+    "./src/*": "./src/*"
+  }
+}

package/src/agent-bar.ts

@@ -8,13 +8,12 @@
 import type { Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth, type TUI } from "@earendil-works/pi-tui";
 import type { CockpitEndpoint } from "./endpoint-store.ts";
-import { formatAgentMetric } from "./render.ts";
 import type { SessionUiState } from "./session-ui-state.ts";
 import { formatUnreadCount, type SessionTab } from "./session-tabs.ts";
 import type { AgentRow } from "./types.ts";
 import { effectiveAgentStatus, isCliAgent, type AgentDisplayStatus } from "./agents-store.ts";
 import { visibleAgentRows } from "./stack-widget.ts";
-import { tuiT } from "./tui-i18n.ts";
+import { tuiStatus, tuiT } from "./tui-i18n.ts";
 import { ownerDisplayToken } from "./window-autocomplete.ts";
 
 export const SESSION_BAR_WIDGET_KEY = "cockpit-session-bar";
@@ -98,46 +97,23 @@ export function statusColor(status: AgentDisplayStatus): ThemeColor {
 	}
 }
 
-function chip(
-	label: string,
-	active: boolean,
-	color: ThemeColor,
-	theme: Theme,
-	unread = 0,
-	activity?: string,
-	attention = false,
-	outcome?: { status: "completed" | "failed" | "terminated"; message?: string },
-	cli = false,
-): string {
+/** Original chip shape retained exclusively for the legacy Session Bar facade. */
+function legacyChip(label: string, active: boolean, color: ThemeColor, theme: Theme): string {
 	const text = `@${label}`;
-	const cliBadge = cli ? theme.fg("accent", ` ${tuiT("widget.agent.cli")}`) : "";
-	const badge = unread > 0 ? theme.fg("warning", ` •${formatUnreadCount(unread)}`) : "";
-	const activitySuffix = activity ? theme.fg("dim", ` · ${activity}`) : "";
-	const attentionPrefix = attention ? theme.fg("error", "!") : "";
-	const outcomeSuffix = outcome
-		? outcome.status === "failed"
-			? theme.fg("error", ` ✗${outcome.message ? ` ${outcome.message}` : ""}`)
-			: outcome.status === "terminated"
-				? theme.fg("warning", " ✗")
-				: theme.fg("success", " ✓")
-		: "";
 	return active
-		? `${attentionPrefix}${theme.fg(color, "▸")} ${theme.fg(color, theme.bold(text))}${cliBadge}${outcomeSuffix}${activitySuffix}${badge}`
-		: `${attentionPrefix}${theme.fg(color, text)}${cliBadge}${outcomeSuffix}${activitySuffix}${badge}`;
+		? `${theme.fg(color, "▸")} ${theme.fg(color, theme.bold(text))}`
+		: theme.fg(color, text);
 }
 
 export type AgentBarStatus = AgentDisplayStatus | "idle";
 
 interface AgentBarTab extends SessionTab {
-	endpoint: CockpitEndpoint;
 	status: AgentBarStatus;
 	color: ThemeColor;
-	/** Current tool name while the agent is live; shown after the chip label. */
-	activity?: string;
-	/** Stalled state beyond the color channel: a leading error `!`. */
-	attention?: boolean;
-	/** Terminal outcome badge: ✓ completed, ✗ failed (with reason) or terminated. */
-	outcome?: { status: "completed" | "failed" | "terminated"; message?: string };
+	/** The rail has one suffix slot: live tool name when present, otherwise localized state. */
+	suffix: string;
+	/** Last terminal outcome selects the status glyph, but never exposes its error message. */
+	outcome?: "completed" | "failed" | "terminated";
 	/** External CLI backend (ACP `cli/<tool>` route): shown as an accent badge after the label. */
 	cli?: boolean;
 }
@@ -151,8 +127,7 @@ function endpointStatus(endpoint: CockpitEndpoint, now: number, mainRunning: boo
 	return "running";
 }
 
-function endpointColor(endpoint: CockpitEndpoint, status: AgentBarStatus, now: number, selected: boolean): ThemeColor {
-	if (selected) return "accent";
+function endpointColor(endpoint: CockpitEndpoint, status: AgentBarStatus, now: number): ThemeColor {
 	if (endpoint.kind === "root") return status === "running" ? "warning" : "muted";
 	if (endpoint.agentRow) return agentSessionColor(endpoint.agentRow, now, status === "idle" ? undefined : status);
 	if (status === "done" || status === "sleeping" || status === "terminated") return "muted";
@@ -160,6 +135,35 @@ function endpointColor(endpoint: CockpitEndpoint, status: AgentBarStatus, now: n
 	return assignedAgentColor(endpoint.correlationId ?? endpoint.id);
 }
 
+function statusVisual(
+	status: AgentBarStatus,
+	outcome?: AgentBarTab["outcome"],
+): { glyph: string; color: ThemeColor } {
+	if (outcome === "completed") return { glyph: "✓", color: "success" };
+	if (outcome === "failed") return { glyph: "✗", color: "error" };
+	if (outcome === "terminated") return { glyph: "✗", color: "warning" };
+	if (status === "failed") return { glyph: "✗", color: "error" };
+	if (status === "stalled") return { glyph: "!", color: "error" };
+	if (status === "terminated") return { glyph: "✗", color: "warning" };
+	if (status === "done" || status === "result-ready") return { glyph: "✓", color: "success" };
+	if (status === "retrying") return { glyph: "↻", color: "warning" };
+	if (status === "running") return { glyph: "●", color: "warning" };
+	if (status === "pending") return { glyph: "○", color: "dim" };
+	return { glyph: "○", color: "muted" };
+}
+
+function railChip(tab: AgentBarTab, active: boolean, theme: Theme): string {
+	const visual = statusVisual(tab.status, tab.outcome);
+	const selected = active ? `${theme.fg("accent", "▸")} ` : "";
+	const status = theme.fg(visual.color, visual.glyph);
+	const identity = theme.fg(tab.color, active ? theme.bold(`@${tab.label}`) : `@${tab.label}`);
+	const cli = tab.cli ? theme.fg("accent", ` ${tuiT("widget.agent.cli")}`) : "";
+	const unreadCount = tab.unread ?? 0;
+	const unread = unreadCount > 0 ? theme.fg("warning", ` •${formatUnreadCount(unreadCount)}`) : "";
+	const suffix = tab.suffix ? theme.fg("dim", ` · ${tab.suffix}`) : "";
+	return `${selected}${status} ${identity}${cli}${unread}${suffix}`;
+}
+
 export interface AgentBarRenderOptions {
 	mainRunning?: boolean;
 	now?: number;
@@ -177,21 +181,10 @@ const CHIP_SEPARATOR = "  ";
  * and its context visible no matter how many agents exist.
  */
 function renderAgentChipLine(tabs: AgentBarTab[], selectedId: string, width: number, theme: Theme): string {
-	const w = Math.max(1, width);
+	if (width <= 0 || tabs.length === 0) return "";
+	const w = width;
 	const selectedIndex = Math.max(0, tabs.findIndex((tab) => tab.id === selectedId));
-	const chips = tabs.map((tab) => chip(
-		tab.label,
-		tab.id === selectedId,
-		tab.color,
-		theme,
-		tab.unread,
-		tab.activity,
-		tab.attention,
-		tab.outcome
-			? { status: tab.outcome.status, message: tab.outcome.message ? truncateToWidth(tab.outcome.message, 24, "…") : undefined }
-			: undefined,
-		tab.cli,
-	));
+	const chips = tabs.map((tab) => railChip(tab, tab.id === selectedId, theme));
 	const chipWidths = chips.map((text) => visibleWidth(text));
 	const sepWidth = visibleWidth(CHIP_SEPARATOR);
 	const totalWidth = chipWidths.reduce((sum, chipWidth) => sum + chipWidth + sepWidth, 0) - sepWidth;
@@ -244,7 +237,8 @@ export function renderSessionBarLine(
 ): string {
 	// A live main-screen row must not write the terminal's final column: doing so
 	// arms auto-wrap, while pi-tui still tracks the cursor on the original row.
-	const w = Math.max(1, width - 1);
+	const w = Math.max(0, width - 1);
+	if (w === 0) return "";
 	if (!shortcutHint) return renderContent(w);
 	const hintSpec = typeof shortcutHint === "string" ? { text: shortcutHint, color: "dim" as const } : shortcutHint;
 	const hint = theme.fg(hintSpec.color ?? "dim", hintSpec.text);
@@ -265,7 +259,24 @@ export function renderAgentBar(
 	theme: Theme,
 	options: AgentBarRenderOptions = {},
 ): string[] {
-	if (endpoints.length === 0) return [truncateToWidth(chip(MAIN_SESSION_LABEL, true, "accent", theme), Math.max(1, width - 1), "…")];
+	if (endpoints.length === 0) {
+		const status: AgentBarStatus = options.mainRunning ? "running" : "idle";
+		const fallback: AgentBarTab = {
+			id: "root",
+			label: MAIN_SESSION_LABEL,
+			ordinal: 0,
+			unread: 0,
+			status,
+			color: status === "running" ? "warning" : "muted",
+			suffix: tuiStatus(status),
+		};
+		return [renderSessionBarLine(
+			(availableWidth) => truncateToWidth(railChip(fallback, true, theme), availableWidth, "…"),
+			width,
+			theme,
+			options.shortcutHint,
+		)];
+	}
 	const now = options.now ?? 0;
 	// A stale selection (id no longer in the endpoint list) must not leave the
 	// bar without a highlighted chip: fall back to root / first endpoint.
@@ -275,11 +286,11 @@ export function renderAgentBar(
 		? requestedId
 		: fallbackId;
 	const tabs: AgentBarTab[] = endpoints.map((endpoint) => {
-		const selected = endpoint.id === selectedId;
 		const status = endpointStatus(endpoint, now, options.mainRunning === true);
-		const live = status === "running" || status === "retrying";
+		const liveAgent = endpoint.kind === "agent" && (status === "running" || status === "retrying");
+		const activeTool = liveAgent ? endpoint.agentRow?.activeTool ?? endpoint.externalAgent?.activeTool : undefined;
 		const outcome = status === "done" || status === "failed" || status === "terminated" || status === "sleeping"
-			? endpoint.agentRow?.lastOutcome
+			? endpoint.agentRow?.lastOutcome?.status
 			: undefined;
 		const ownerId = endpoint.kind === "root" ? endpoint.registryEndpoint?.ownerId : undefined;
 		return {
@@ -287,39 +298,17 @@ export function renderAgentBar(
 			label: ownerId ? ownerDisplayToken(endpoint.label, ownerId) : endpoint.label,
 			ordinal: endpoint.ordinal,
 			unread: state.endpoint(endpoint.id).unread,
-			endpoint,
 			status,
-			color: endpointColor(endpoint, status, now, selected),
-			...(live && (endpoint.agentRow?.activeTool || endpoint.externalAgent?.activeTool)
-				? {
-					activity: endpoint.agentRow?.activeTool
-						? endpoint.agentRow.activeToolArgs
-							? `${endpoint.agentRow.activeTool} ${endpoint.agentRow.activeToolArgs}`
-							: endpoint.agentRow.activeTool
-						: endpoint.externalAgent!.activeToolArgs
-							? `${endpoint.externalAgent!.activeTool} ${endpoint.externalAgent!.activeToolArgs}`
-							: endpoint.externalAgent!.activeTool,
-				}
-				: {}),
-			...(status === "stalled" ? { attention: true } : {}),
+			color: endpointColor(endpoint, status, now),
+			suffix: liveAgent
+				? activeTool ? truncateToWidth(activeTool, 18, "…") : ""
+				: tuiStatus(status),
 			...(outcome ? { outcome } : {}),
 			...(endpoint.agentRow && isCliAgent(endpoint.agentRow) ? { cli: true } : {}),
 		};
 	});
-	// Selected-session metrics summary, appended only when the chip line leaves
-	// room for it: telemetry must never squeeze the chips that carry identity.
-	const selectedEndpoint = tabs.find((tab) => tab.id === selectedId)?.endpoint;
-	const selectedMetrics = selectedEndpoint?.agentRow ?? selectedEndpoint?.externalAgent?.metrics;
-	const metricParts: string[] = [];
-	if (selectedMetrics?.toolCount !== undefined) metricParts.push(tuiT("common.tools", { count: selectedMetrics.toolCount }));
-	if (selectedMetrics?.tokens !== undefined) metricParts.push(tuiT("widget.agent.tokens", { count: formatAgentMetric(selectedMetrics.tokens) }));
-	const metrics = metricParts.length > 0 ? theme.fg("muted", ` · ${metricParts.join(" · ")}`) : "";
 	return [renderSessionBarLine(
-		(availableWidth) => {
-			const chipsLine = renderAgentChipLine(tabs, selectedId, availableWidth, theme);
-			if (!metrics || visibleWidth(chipsLine) + visibleWidth(metrics) > availableWidth) return chipsLine;
-			return chipsLine + metrics;
-		},
+		(availableWidth) => renderAgentChipLine(tabs, selectedId, availableWidth, theme),
 		width,
 		theme,
 		options.shortcutHint,
@@ -364,7 +353,7 @@ export function renderSessionBar(
 		}
 	}
 	const chips = [
-		chip(
+		legacyChip(
 			MAIN_SESSION_LABEL,
 			viewingId === undefined,
 			viewingId === undefined ? "accent" : opts.mainRunning ? "warning" : "muted",
@@ -377,7 +366,7 @@ export function renderSessionBar(
 			const stableStatus = previousStatus === nextStatus ? previousStatus : nextStatus;
 			opts.stableStatuses?.set(row.correlationId, stableStatus);
 			const color = agentSessionColor(row, now, stableStatus);
-			return chip(label, row.correlationId === viewingId, color, theme);
+			return legacyChip(label, row.correlationId === viewingId, color, theme);
 		}),
 	];
 	const w = Math.max(1, width);

package/src/ambient.ts

@@ -23,6 +23,10 @@ export interface AmbientState {
 	hideLiveDuration?: boolean;
 	/** Separator glyph between label and elapsed time (e.g. " · "). */
 	separator?: string;
+	/** Parenthesized suffix appended after the elapsed (e.g. an interrupt hint). */
+	hint?: string;
+	/** Live output-token rate label (e.g. "45 tok/s"), shown while streaming. */
+	tokenRate?: string;
 	/** Session summary — the session_info name, else a short session id. */
 	session?: string;
 	/** Active model short id. */
@@ -59,20 +63,11 @@ export function nextUiPromptDepth(depth: number, event: "start" | "end"): number
 	return event === "start" ? depth + 1 : Math.max(0, depth - 1);
 }
 
-export function shouldHideWorkingDuration(
-	mode: "regular" | "fullscreen" | undefined,
-	staticMode: boolean,
-): boolean {
-	// Pi's regular renderer shares scrollback between the transcript and status
-	// row, so a moving live timer can be preserved as transcript height changes.
-	return staticMode || mode !== "fullscreen";
-}
-
 /**
  * The streaming working line.
  *
- * Cockpit hides the host indicator and renders the active state. Fullscreen may
- * add a live elapsed value; the regular main screen keeps this row stable.
+ * Cockpit hides the host indicator and renders the active state with a live
+ * elapsed value. Static mode keeps the row stable by omitting the timer.
  */
 export function workingMessage(state: AmbientState, now = Date.now()): string | undefined {
 	const label = state.waitingForInput
@@ -80,10 +75,14 @@ export function workingMessage(state: AmbientState, now = Date.now()): string |
 		: state.activeTool ?? (state.running ? tuiT("ambient.working") : undefined);
 	if (!label) return undefined;
 	const sep = state.separator ?? " ";
-	const text = (state.waitingForInput || state.hideLiveDuration || state.workingStartedAt === undefined)
-		? label
-		: `${label}${sep}${formatThinkingDuration(now - state.workingStartedAt)}`;
-	return `\x1b[3m${text}\x1b[23m`;
+	const parts = [label];
+	if (!state.waitingForInput && !state.hideLiveDuration && state.workingStartedAt !== undefined) {
+		parts.push(formatThinkingDuration(now - state.workingStartedAt));
+		if (state.tokenRate) parts.push(state.tokenRate);
+	}
+	let text = parts.join(sep);
+	if (state.hint) text += ` (${state.hint})`;
+	return text;
 }
 
 /** Composition options for titleFor. */

package/src/claude-editor.ts

@@ -1,6 +1,7 @@
 import { CustomEditor, type KeybindingsManager } from "@earendil-works/pi-coding-agent";
 import { isKeyRelease, isKeyRepeat, matchesKey, getKeybindings, truncateToWidth, visibleWidth, type EditorTheme, type TUI } from "@earendil-works/pi-tui";
 import { readAutocompleteState } from "./autocomplete-probe.ts";
+import { stripAnsi } from "./transcript-selection.ts";
 import { tuiT } from "./tui-i18n.ts";
 
 /** Invisible editor start marker consumed by the fullscreen controller (fullscreenInput only). */
@@ -22,8 +23,8 @@ export interface CockpitEditorRouteTarget {
 export interface CockpitClaudeEditorOptions {
 	/** Enable the double bare-Escape clear-input state machine. */
 	doubleEscapeClearInput: boolean;
-	/** Emit editor start/end markers in render() for the fullscreen controller. */
-	emitEditorMarkers: boolean;
+	/** Emit editor start/end markers while the fullscreen controller is active. */
+	emitEditorMarkers: boolean | (() => boolean);
 	/** Guard: true while pi is streaming or a capturing overlay is open (never arm). */
 	isBusy?: () => boolean;
 	/** Called after a double-Escape clears a non-empty draft. */
@@ -40,6 +41,12 @@ export interface CockpitClaudeEditorOptions {
 	getRouteTarget?: () => CockpitEditorRouteTarget | undefined;
 	/** Called with the constructed editor so the host can push route updates. */
 	onEditor?: (editor: CockpitClaudeEditor) => void;
+	/**
+	 * Repaints the embedded working-status row with a fixed color. The host
+	 * derives that row's color from the thinking-level border tint; Cockpit
+	 * keeps it neutral instead.
+	 */
+	workingStatusPaint?: (text: string) => string;
 }
 
 export interface DoubleEscapeDecision {
@@ -147,7 +154,10 @@ export class CockpitClaudeEditor extends CustomEditor {
 		const banner = this.browsing() && total > 0
 			? historyBanner(this.index + 1, total, width, this.getPaddingX(), this.borderColor)
 			: undefined;
-		if (!this.editorOptions.emitEditorMarkers) {
+		const emitEditorMarkers = typeof this.editorOptions.emitEditorMarkers === "function"
+			? this.editorOptions.emitEditorMarkers()
+			: this.editorOptions.emitEditorMarkers;
+		if (!emitEditorMarkers) {
 			return banner ? [...lines, banner] : lines;
 		}
 		// The fullscreen controller treats everything between the sentinels as the
@@ -204,6 +214,21 @@ export class CockpitClaudeEditor extends CustomEditor {
 		this.tui.requestRender();
 	}
 
+	/** Status row embedded in the top border keeps a constant color, never the thinking tint. */
+	override setWorkingStatusIndicator(indicator: {
+		renderInBorder(width: number): string;
+		renderSpinnerInBorder(width: number): string;
+	} | undefined): void {
+		const paint = this.editorOptions.workingStatusPaint;
+		if (indicator && paint) {
+			const render = indicator.renderInBorder.bind(indicator);
+			const renderSpinner = indicator.renderSpinnerInBorder.bind(indicator);
+			indicator.renderInBorder = (width: number) => paint(stripAnsi(render(width)));
+			indicator.renderSpinnerInBorder = (width: number) => paint(stripAnsi(renderSpinner(width)));
+		}
+		super.setWorkingStatusIndicator(indicator as Parameters<CustomEditor["setWorkingStatusIndicator"]>[0]);
+	}
+
 	private isBareEscape(data: string): boolean {
 		return matchesKey(data, "escape") && !isKeyRelease(data) && !isKeyRepeat(data);
 	}