pi-cockpit 0.11.0 → 0.12.0

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

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

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

@@ -21,6 +21,11 @@ export interface SettingsTranslatorOptions {
   onMissing?: MissingTranslationCallback;
 }
 
+export interface SystemSettingsLocaleOptions {
+  environment?: Readonly<Record<string, string | undefined>>;
+  resolvedLocale?: string | null;
+}
+
 export interface SettingsTranslator {
   readonly locale: SupportedSettingsLocale;
   setLocale(locale: string | null | undefined): SupportedSettingsLocale;
@@ -50,6 +55,50 @@ export function normalizeSettingsLocale(locale: string | null | undefined): Supp
   return "en";
 }
 
+export function detectSystemSettingsLocale(
+  options: SystemSettingsLocaleOptions = {},
+): SupportedSettingsLocale {
+  const environment = options.environment ?? systemEnvironment();
+  const environmentLocale = [
+    environment.LC_ALL,
+    environment.LC_MESSAGES,
+    environment.LANGUAGE?.split(":", 1)[0],
+    environment.LANG,
+  ].find((value) => value?.trim());
+  if (environmentLocale) return normalizeSettingsLocale(environmentLocale);
+
+  const resolvedLocale = options.resolvedLocale === undefined
+    ? systemResolvedLocale()
+    : options.resolvedLocale;
+  return normalizeSettingsLocale(resolvedLocale);
+}
+
+export function resolveSettingsLocale(
+  locale: string | null | undefined,
+  options: SystemSettingsLocaleOptions = {},
+): SupportedSettingsLocale {
+  const requested = locale?.trim();
+  if (requested && requested.toLowerCase() !== "auto") {
+    return normalizeSettingsLocale(requested);
+  }
+  return detectSystemSettingsLocale(options);
+}
+
+function systemEnvironment(): Readonly<Record<string, string | undefined>> {
+  const processLike = (globalThis as {
+    process?: { env?: Record<string, string | undefined> };
+  }).process;
+  return processLike?.env ?? {};
+}
+
+function systemResolvedLocale(): string | undefined {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().locale;
+  } catch {
+    return undefined;
+  }
+}
+
 export function interpolateTranslation(template: string, params: TranslationParams = {}): string {
   return template.replace(/\{([A-Za-z0-9_.-]+)\}/g, (placeholder, name: string) => {
     if (!Object.hasOwn(params, name)) return placeholder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cockpit",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
     "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/edit-guard.test.ts tests/agents-store.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/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/input-routing.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/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/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",
+    "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/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/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/input-routing.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/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",
     "typecheck": "tsc --noEmit",
     "prepack": "node ../../scripts/bundle-settings-core.mjs",
     "postpack": "node ../../scripts/bundle-settings-core.mjs --clean"
@@ -32,7 +32,7 @@
     ]
   },
   "dependencies": {
-    "pi-maestro-settings-core": "0.1.1",
+    "pi-maestro-settings-core": "0.1.2",
     "proper-lockfile": "4.1.2"
   },
   "bundledDependencies": [
@@ -72,7 +72,7 @@
     "@earendil-works/pi-coding-agent": "0.83.0",
     "@earendil-works/pi-tui": "0.83.0",
     "@types/node": "^22.0.0",
-    "pi-maestro-teammate": "1.9.0",
+    "pi-maestro-teammate": "1.10.0",
     "typebox": "1.3.7",
     "typescript": "^5.5.0"
   },

package/src/agent-bar.ts

@@ -0,0 +1,330 @@
+/**
+ * Agent Bar and the legacy Session Bar facade implementation.
+ *
+ * Agent Bar consumes canonical local session endpoints and SessionUiState. The
+ * compatibility exports at the bottom preserve the former AgentRow-based API.
+ */
+
+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 type { SessionUiState } from "./session-ui-state.ts";
+import { formatUnreadCount, type SessionTab } from "./session-tabs.ts";
+import type { AgentRow } from "./types.ts";
+import { effectiveAgentStatus, type AgentDisplayStatus } from "./agents-store.ts";
+import { visibleAgentRows } from "./stack-widget.ts";
+
+export const SESSION_BAR_WIDGET_KEY = "cockpit-session-bar";
+export const AGENT_BAR_WIDGET_KEY = SESSION_BAR_WIDGET_KEY;
+
+/** Chip label for the main (root) session. */
+export const MAIN_SESSION_LABEL = "main";
+
+/** Stable compatibility order for legacy AgentRow callers. */
+export function byStartOrder(a: AgentRow, b: AgentRow): number {
+	return a.startedAt - b.startedAt || a.correlationId.localeCompare(b.correlationId);
+}
+
+export interface SessionBarDeps {
+	getAgents: () => AgentRow[];
+	/** Stable owner clock snapshot; render never reads the wall clock itself. */
+	getNow: () => number;
+	/** Whether the main (root) agent is currently working. */
+	isMainRunning?: () => boolean;
+	/** Current session shown at the right edge (@label + status color). */
+	getCurrentSession?: () => { label: string; color: ThemeColor } | undefined;
+}
+
+export interface AgentBarDeps {
+	getEndpoints: () => readonly CockpitEndpoint[];
+	getState: () => SessionUiState;
+	getNow: () => number;
+	isMainRunning?: () => boolean;
+	getShortcutHint?: () => string | undefined;
+}
+
+export const AGENT_SESSION_COLORS = [
+	"accent",
+	"warning",
+	"success",
+	"mdLink",
+	"thinkingLow",
+	"thinkingMedium",
+	"thinkingHigh",
+] as const satisfies readonly ThemeColor[];
+
+/** Stable pseudo-random color per agent lifecycle identity; never flickers. */
+export function assignedAgentColor(correlationId: string): ThemeColor {
+	let hash = 2166136261;
+	for (const char of correlationId) {
+		hash ^= char.codePointAt(0) ?? 0;
+		hash = Math.imul(hash, 16777619);
+	}
+	return AGENT_SESSION_COLORS[(hash >>> 0) % AGENT_SESSION_COLORS.length];
+}
+
+export function agentSessionColor(row: AgentRow, now: number, stableStatus?: AgentDisplayStatus): ThemeColor {
+	const status = stableStatus ?? effectiveAgentStatus(row, now);
+	if (status === "done" || status === "sleeping" || status === "terminated") return "muted";
+	if (status === "failed" || status === "stalled") return "error";
+	return assignedAgentColor(row.correlationId);
+}
+
+/** Map an agent display status to a theme color slot. */
+export function statusColor(status: AgentDisplayStatus): ThemeColor {
+	switch (status) {
+		case "running":
+		case "retrying":
+			return "warning";
+		case "stalled":
+		case "failed":
+		case "terminated":
+			return "error";
+		case "done":
+		case "result-ready":
+			return "success";
+		default:
+			return "muted";
+	}
+}
+
+function chip(label: string, active: boolean, color: ThemeColor, theme: Theme, unread = 0): string {
+	const text = `@${label}`;
+	const badge = unread > 0 ? theme.fg("warning", ` •${formatUnreadCount(unread)}`) : "";
+	return active
+		? `${theme.fg(color, "▸")} ${theme.fg(color, theme.bold(text))}${badge}`
+		: `${theme.fg(color, text)}${badge}`;
+}
+
+export type AgentBarStatus = AgentDisplayStatus | "idle";
+
+interface AgentBarTab extends SessionTab {
+	endpoint: CockpitEndpoint;
+	status: AgentBarStatus;
+	color: ThemeColor;
+}
+
+function endpointStatus(endpoint: CockpitEndpoint, now: number, mainRunning: boolean): AgentBarStatus {
+	if (endpoint.kind === "root") return mainRunning ? "running" : "idle";
+	if (endpoint.agentRow) return effectiveAgentStatus(endpoint.agentRow, now);
+	if (endpoint.status === "sleeping") return "sleeping";
+	if (endpoint.status === "settled") return "done";
+	return "running";
+}
+
+function endpointColor(endpoint: CockpitEndpoint, status: AgentBarStatus, now: number, selected: boolean): ThemeColor {
+	if (selected) return "accent";
+	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";
+	if (status === "failed" || status === "stalled") return "error";
+	return assignedAgentColor(endpoint.correlationId ?? endpoint.id);
+}
+
+export interface AgentBarRenderOptions {
+	mainRunning?: boolean;
+	now?: number;
+	shortcutHint?: string;
+}
+
+/** Chip-to-chip separator in the agent bar. */
+const CHIP_SEPARATOR = "  ";
+
+/**
+ * One-line horizontal panning for the agent chip list. When the chips overflow
+ * the width, the window is anchored so the selected chip sits at the right edge
+ * with as many preceding chips as fit, and dim ◀N / N▶ markers count what stays
+ * hidden on each side — arrow-cycling always keeps the highlighted selection
+ * 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);
+	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));
+	const chipWidths = chips.map((text) => visibleWidth(text));
+	const sepWidth = visibleWidth(CHIP_SEPARATOR);
+	const totalWidth = chipWidths.reduce((sum, chipWidth) => sum + chipWidth + sepWidth, 0) - sepWidth;
+	if (totalWidth <= w) return chips.join(CHIP_SEPARATOR);
+
+	const selectedWidth = chipWidths[selectedIndex] ?? 0;
+	// Farthest-left start whose window [start..selectedIndex] still fits budget.
+	const fitStart = (budget: number): number => {
+		let start = selectedIndex;
+		let acc = selectedWidth;
+		while (start > 0) {
+			const next = chipWidths[start - 1] ?? 0;
+			if (acc + sepWidth + next > budget) break;
+			acc += sepWidth + next;
+			start -= 1;
+		}
+		return start;
+	};
+
+	let start = fitStart(w);
+	// Markers are sized from the window itself; a wider marker shrinks the
+	// budget, which moves the start right, which can widen the left marker.
+	// Start only ever moves right, so this converges and terminates.
+	for (;;) {
+		const leftHidden = start;
+		const rightHidden = tabs.length - selectedIndex - 1;
+		const leftMarker = leftHidden > 0 ? theme.fg("dim", `◀${leftHidden}`) : "";
+		const rightMarker = rightHidden > 0 ? theme.fg("dim", `${rightHidden}▶`) : "";
+		const markerCount = (leftMarker ? 1 : 0) + (rightMarker ? 1 : 0);
+		const budget = w - visibleWidth(leftMarker) - visibleWidth(rightMarker) - markerCount * sepWidth;
+		if (budget < selectedWidth) {
+			// Too narrow for the selected chip beside the markers: show it alone.
+			return truncateToWidth(chips[selectedIndex] ?? "", w, "…");
+		}
+		const next = fitStart(budget);
+		if (next === start) {
+			const window = chips.slice(start, selectedIndex + 1);
+			return [leftMarker, ...window, rightMarker].filter(Boolean).join(CHIP_SEPARATOR);
+		}
+		start = next;
+	}
+}
+
+/** Keep the mode-switch hint at the right edge without hiding the selected tab. */
+export function renderSessionBarLine(
+	renderContent: (width: number) => string,
+	width: number,
+	theme: Theme,
+	shortcutHint?: string,
+): string {
+	const w = Math.max(1, width);
+	if (!shortcutHint) return renderContent(w);
+	const hint = theme.fg("dim", shortcutHint);
+	const hintWidth = visibleWidth(hint);
+	const gap = 2;
+	if (w < hintWidth + gap + 8) return renderContent(w);
+	const contentWidth = w - hintWidth - gap;
+	const content = renderContent(contentWidth);
+	const padding = Math.max(gap, w - visibleWidth(content) - hintWidth);
+	return `${content}${" ".repeat(padding)}${hint}`;
+}
+
+/** Render canonical main + local-agent chips with selection highlight and horizontal panning. */
+export function renderAgentBar(
+	endpoints: readonly CockpitEndpoint[],
+	state: SessionUiState,
+	width: number,
+	theme: Theme,
+	options: AgentBarRenderOptions = {},
+): string[] {
+	if (endpoints.length === 0) return [truncateToWidth(chip(MAIN_SESSION_LABEL, true, "accent", theme), Math.max(1, width), "…")];
+	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.
+	const fallbackId = endpoints.find((endpoint) => endpoint.kind === "root")?.id ?? endpoints[0]?.id;
+	const requestedId = state.selectedId("agent");
+	const selectedId = requestedId && endpoints.some((endpoint) => endpoint.id === requestedId)
+		? requestedId
+		: fallbackId;
+	const tabs: AgentBarTab[] = endpoints.map((endpoint) => {
+		const selected = endpoint.id === selectedId;
+		const status = endpointStatus(endpoint, now, options.mainRunning === true);
+		return {
+			id: endpoint.id,
+			label: endpoint.label,
+			ordinal: endpoint.ordinal,
+			unread: state.endpoint(endpoint.id).unread,
+			endpoint,
+			status,
+			color: endpointColor(endpoint, status, now, selected),
+		};
+	});
+	return [renderSessionBarLine(
+		(availableWidth) => renderAgentChipLine(tabs, selectedId, availableWidth, theme),
+		width,
+		theme,
+		options.shortcutHint,
+	)];
+}
+
+export function makeAgentBarWidget(deps: AgentBarDeps) {
+	return (_tui: TUI, theme: Theme) => ({
+		render(width: number): string[] {
+			return renderAgentBar(deps.getEndpoints(), deps.getState(), width, theme, {
+				mainRunning: deps.isMainRunning?.(),
+				now: deps.getNow(),
+				shortcutHint: deps.getShortcutHint?.(),
+			});
+		},
+		invalidate(): void {},
+		dispose(): void {},
+	});
+}
+
+export interface SessionBarRenderOptions {
+	mainRunning?: boolean;
+	current?: { label: string; color: ThemeColor } | undefined;
+	now?: number;
+	stableStatuses?: Map<string, AgentDisplayStatus>;
+}
+
+/** Legacy AgentRow-based pure renderer retained for downstream compatibility. */
+export function renderSessionBar(
+	rows: AgentRow[],
+	width: number,
+	theme: Theme,
+	opts: SessionBarRenderOptions = {},
+): string[] {
+	const agents = visibleAgentRows(rows).sort(byStartOrder);
+	const viewingId = agents.find((row) => row.viewing)?.correlationId;
+	const now = opts.now ?? agents.reduce((latest, row) => Math.max(latest, row.lastActivityAt), 0);
+	const liveIds = new Set(agents.map((row) => row.correlationId));
+	if (opts.stableStatuses) {
+		for (const id of opts.stableStatuses.keys()) {
+			if (!liveIds.has(id)) opts.stableStatuses.delete(id);
+		}
+	}
+	const chips = [
+		chip(
+			MAIN_SESSION_LABEL,
+			viewingId === undefined,
+			viewingId === undefined ? "accent" : opts.mainRunning ? "warning" : "muted",
+			theme,
+		),
+		...agents.map((row) => {
+			const label = row.name || row.role || row.agent || "agent";
+			const nextStatus = effectiveAgentStatus(row, now);
+			const previousStatus = opts.stableStatuses?.get(row.correlationId);
+			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);
+		}),
+	];
+	const w = Math.max(1, width);
+	const chipsLine = chips.join("  ");
+	const rawStatus = opts.current
+		? theme.fg(opts.current.color, `● @${opts.current.label}`)
+		: "";
+	if (!rawStatus) {
+		return [truncateToWidth(chipsLine, w, "…")];
+	}
+	const status = truncateToWidth(rawStatus, w, "…");
+	const measuredStatus = visibleWidth(status);
+	if (measuredStatus >= w) return [status];
+	const leftBudget = Math.max(0, w - measuredStatus - 2);
+	if (leftBudget === 0) return [" ".repeat(w - measuredStatus) + status];
+	const left = truncateToWidth(chipsLine, leftBudget, "…");
+	const pad = Math.max(0, w - visibleWidth(left) - measuredStatus);
+	return [left + " ".repeat(pad) + status];
+}
+
+export function makeSessionBarWidget(deps: SessionBarDeps) {
+	const stableStatuses = new Map<string, AgentDisplayStatus>();
+	return (_tui: TUI, theme: Theme) => ({
+		render(width: number): string[] {
+			return renderSessionBar(deps.getAgents(), width, theme, {
+				mainRunning: deps.isMainRunning?.(),
+				current: deps.getCurrentSession?.(),
+				now: deps.getNow(),
+				stableStatuses,
+			});
+		},
+		invalidate(): void {},
+		dispose(): void {},
+	});
+}

package/src/agent-overlay.ts

@@ -19,6 +19,7 @@ import {
 } from "./session-detail.ts";
 import { visibleAgentRows } from "./stack-widget.ts";
 import type { AgentRow } from "./types.ts";
+import { tuiT } from "./tui-i18n.ts";
 import { overlayListRows } from "./viewport.ts";
 
 export interface AgentOverlayParams {
@@ -73,7 +74,7 @@ export class AgentOverlay implements Component, Focusable {
 				// re-target another agent because the roster selection moved.
 				const target = this.entries().find((entry) => entry.row.correlationId === targetId)?.row;
 				if (!target) {
-					this.ack(`steer aborted: @${this.agentName(targetId)} is gone`, true);
+					this.ack(tuiT("overlay.agents.aborted", { agent: this.agentName(targetId) }), true);
 				} else if (draft) {
 					this.params.onCommand(targetId, "steer", draft);
 					this.ack(`steer @${target.name || target.role || target.agent || targetId}: ${draft}`);
@@ -158,7 +159,13 @@ export class AgentOverlay implements Component, Focusable {
 				return [fit(`steer @${target}: ${this.compose.draft}_ · Enter · Esc`, safeWidth)];
 			}
 			const selected = entries.find((entry) => entry.row.correlationId === this.selectedId)?.row;
-			return [fit(selected ? `Agents ${entries.length} · ${agentLabel(selected)} · Esc` : "Agents · none · Esc", safeWidth)];
+			const title = tuiT("overlay.agents.title");
+			return [fit(
+				selected
+					? `${title} ${entries.length} · ${agentLabel(selected)} · Esc`
+					: `${title} · ${tuiT("overlay.agents.none")} · Esc`,
+				safeWidth,
+			)];
 		}
 		return safeWidth < 88
 			? this.renderNarrow(safeWidth, entries.map((entry) => entry.row))
@@ -204,7 +211,7 @@ export class AgentOverlay implements Component, Focusable {
 
 	private agentLines(width: number, maxRows: number): string[] {
 		const entries = this.entries();
-		if (entries.length === 0) return [this.params.theme.fg("dim", fit("No agents", width))];
+		if (entries.length === 0) return [this.params.theme.fg("dim", fit(tuiT("overlay.agents.noAgents"), width))];
 		const selected = Math.max(0, entries.findIndex((entry) => entry.row.correlationId === this.selectedId));
 		const start = visibleStart(selected, entries.length, maxRows);
 		return entries.slice(start, start + maxRows).map(({ row, prefix }) => {
@@ -222,7 +229,7 @@ export class AgentOverlay implements Component, Focusable {
 	private detailLines(rows: AgentRow[], width: number, maxRows: number): string[] {
 		this.detailWidth = width;
 		this.detailRows = maxRows;
-		if (!this.selectedId) return [this.params.theme.fg("dim", fit("No agent selected", width))];
+		if (!this.selectedId) return [this.params.theme.fg("dim", fit(tuiT("overlay.agents.noSelection"), width))];
 		return renderSessionDetail(
 			rows,
 			this.selectedId,
@@ -230,7 +237,7 @@ export class AgentOverlay implements Component, Focusable {
 			this.params.theme,
 			maxRows,
 			this.outputScroll,
-			"PgUp/PgDn scroll output",
+			tuiT("session.previewHint"),
 		);
 	}
 
@@ -245,10 +252,10 @@ export class AgentOverlay implements Component, Focusable {
 		const failed = statuses.filter((status) => status === "failed" || status === "stalled").length;
 		const ack = this.lastAck && Date.now() - this.lastAck.at < COMMAND_ACK_MS ? this.lastAck : null;
 		return fit([
-			this.params.theme.bold("Agents"),
-			`${rows.length} total`,
-			active ? `${active} active` : "",
-			failed ? `${failed} failed` : "",
+			this.params.theme.bold(tuiT("overlay.agents.title")),
+			tuiT("common.total", { count: rows.length }),
+			active ? tuiT("common.active", { count: active }) : "",
+			failed ? tuiT("common.failed", { count: failed }) : "",
 			ack
 				? this.params.theme.fg(ack.error ? "error" : "success", ack.error ? `✗ ${ack.text}` : `${this.params.glyphs.check} ${ack.text}`)
 				: "",
@@ -257,9 +264,9 @@ export class AgentOverlay implements Component, Focusable {
 
 	private help(width: number): string {
 		if (this.compose) {
-			return this.params.theme.fg("dim", fit("Enter send · Esc cancel", width));
+			return this.params.theme.fg("dim", fit(tuiT("overlay.agents.composeHelp"), width));
 		}
-		return this.params.theme.fg("dim", fit("Esc close · ↑↓ agent · Home/End jump · PgUp/PgDn output · i interrupt · s steer", width));
+		return this.params.theme.fg("dim", fit(tuiT("overlay.agents.help"), width));
 	}
 
 	private rule(width: number): string {

package/src/agents-store.ts

@@ -8,6 +8,21 @@ import { sanitizeExtensionStatusText } from "./extension-status.ts";
 import type { AgentRow, AgentStatus } from "./types.ts";
 
 const STATUS_TEXT_MAX = 48;
+const TEAMMATE_STALL_TIMEOUT_MS = 30_000;
+const TEAMMATE_EXPECTED_SILENCE_TIMEOUT_MS = 5 * 60_000;
+const EXPECTED_SILENCE_PHASES = new Set(["starting", "restoring", "prompting", "compacting", "continuing", "settling"]);
+
+function isAgentStalled(
+	projection: { status: string; phase?: string; resultReadyAt?: number; lastActivityAt?: number; pendingInteractions?: number },
+	now: number,
+): boolean {
+	if ((projection.status !== "running" && projection.status !== "pending") || projection.resultReadyAt !== undefined) return false;
+	if ((projection.pendingInteractions ?? 0) > 0 || projection.lastActivityAt === undefined) return false;
+	const idleCeiling = projection.status === "pending" || projection.phase === "retrying" || (projection.phase !== undefined && EXPECTED_SILENCE_PHASES.has(projection.phase))
+		? TEAMMATE_EXPECTED_SILENCE_TIMEOUT_MS
+		: TEAMMATE_STALL_TIMEOUT_MS;
+	return now - projection.lastActivityAt >= idleCeiling;
+}
 /** Selected-session output kept for the expandable fixed detail region. */
 export const SESSION_CONTENT_MAX = 2_048;
 
@@ -113,13 +128,17 @@ function activityFromProgressStatus(status: unknown): "running" | "sleeping" | u
 		: "running";
 }
 
-export const AGENT_STALL_TIMEOUT_MS = 30_000;
+export const AGENT_STALL_TIMEOUT_MS = TEAMMATE_STALL_TIMEOUT_MS;
 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.status !== "running" && row.status !== "pending") return row.status;
 	if (row.resultReadyAt !== undefined) return "result-ready";
-	return now - row.lastActivityAt >= AGENT_STALL_TIMEOUT_MS ? "stalled" : "running";
+	return isAgentStalled({
+		status: row.status,
+		phase: row.phase,
+		lastActivityAt: row.lastActivityAt,
+	}, now) ? "stalled" : row.status;
 }
 
 function normalizeStartedAt(value: number | string | undefined, fallback: number): number {

package/src/ambient.ts

@@ -9,6 +9,7 @@
 
 import type { AgentRow, BashBgJob, TodoItem } from "./types.ts";
 import { formatThinkingDuration } from "./thinking-timer.ts";
+import { tuiT } from "./tui-i18n.ts";
 
 export interface AmbientState {
 	todos: readonly TodoItem[];
@@ -60,7 +61,7 @@ function failedJobs(jobs: readonly BashBgJob[]): BashBgJob[] {
  * elapsed value, matching the compact folded-thinking label.
  */
 export function workingMessage(state: AmbientState, now = Date.now()): string | undefined {
-	const label = state.activeTool ?? (state.running ? "working" : undefined);
+	const label = state.activeTool ?? (state.running ? tuiT("ambient.working") : undefined);
 	if (!label) return undefined;
 	const sep = state.separator ?? " ";
 	const text = (state.hideLiveDuration || state.workingStartedAt === undefined)
@@ -98,10 +99,12 @@ export function titleFor(
 	const prefix = state.frame ? `${state.frame} ` : "";
 	let title: string;
 	if (broken > 0) {
-		title = `${marks.fail} ${base}${sep}${broken} failed`;
+		title = `${marks.fail} ${base}${sep}${tuiT("ambient.failed", { count: broken })}`;
 	} else if (state.running) {
 		const live = liveAgents(state.agents).length;
-		title = live > 0 ? `${prefix}${base}${sep}${live} agents` : `${prefix}${base}${sep}working`;
+		title = live > 0
+			? `${prefix}${base}${sep}${tuiT("ambient.agents", { count: live })}`
+			: `${prefix}${base}${sep}${tuiT("ambient.working")}`;
 	} else {
 		const jobs = state.jobs.filter((job) => job.status === "running").length;
 		title = jobs > 0 ? `${prefix}${base}${sep}${jobs} bg` : `${prefix}${base}`;