pi-cockpit 0.1.2 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cockpit",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "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).",
   "type": "module",
   "keywords": [
@@ -34,7 +34,7 @@
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
-    "pi-maestro-teammate": "^0.6.0"
+    "pi-maestro-teammate": "^1.0.0"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-agent-core": {
@@ -59,7 +59,7 @@
     "@earendil-works/pi-coding-agent": "0.82.1",
     "@earendil-works/pi-tui": "0.82.1",
     "@types/node": "^22.0.0",
-    "pi-maestro-teammate": "0.6.0",
+    "pi-maestro-teammate": "1.0.0",
     "typescript": "^5.5.0"
   },
   "main": "./src/index.ts",

package/src/agents-store.ts

@@ -41,11 +41,17 @@ export interface 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[];
 	message?: string;
@@ -53,6 +59,8 @@ export interface MessagePayload {
 	recentTools?: Array<string | { name?: string; status?: string }>;
 	toolCount?: number;
 	tokens?: number;
+	inputTokens?: number;
+	outputTokens?: number;
 	status?: string;
 	lastActivityAt?: number | string;
 	progress?: ProgressPayload[];
@@ -116,6 +124,9 @@ function latestTool(tools: MessagePayload["recentTools"]): string | undefined {
 // Self-accumulating roster. The teammate extension only broadcasts deltas
 // (started/message/complete), never a full snapshot, so we rebuild the list here.
 // Cold start is empty by design — we only reflect activity observed after load.
+// The roster is self-healing: message/progress deltas for an agent whose
+// `started` delta was missed still materialize a row, so a running agent is
+// always represented as long as it keeps emitting activity.
 export class AgentsStore {
 	private readonly roster = new Map<string, AgentRow>();
 
@@ -146,6 +157,22 @@ export class AgentsStore {
 			for (const progress of p.progress) this.applyProgress(p.correlationId, progress, now);
 		}
 		const targetId = p.taskCorrelationId ?? p.correlationId;
+		if (!this.roster.has(targetId)) {
+			// 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
+			// event instead of dropping it; later deltas refine the placeholder.
+			this.applyStarted({
+				correlationId: targetId,
+				agent: p.agent ?? "",
+				name: p.name,
+				status: p.status,
+				lastActivityAt: p.lastActivityAt,
+				...(p.taskCorrelationId && p.taskCorrelationId !== p.correlationId
+					? { spawnedBy: p.correlationId }
+					: {}),
+			}, now);
+		}
 		const row = this.roster.get(targetId);
 		if (!row) return;
 		const progressActivity = p.progress?.find((progress) => progress.correlationId === targetId)?.lastActivityAt;
@@ -159,6 +186,8 @@ export class AgentsStore {
 		}
 		if (typeof p.toolCount === "number") row.toolCount = p.toolCount;
 		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.status === "string") {
 			row.taskStatus = p.status;
 			row.status = mapAgentStatus(p.status);
@@ -217,6 +246,21 @@ export class AgentsStore {
 	}
 
 	private applyProgress(parentCorrelationId: string, p: ProgressPayload, now: number): void {
+		if (!this.roster.has(p.correlationId)) {
+			// Self-heal: see applyMessage. A graph child whose `started` delta was
+			// missed still materializes from its first progress event.
+			this.applyStarted({
+				correlationId: p.correlationId,
+				agent: p.agent,
+				name: p.name,
+				status: p.status,
+				startedAt: p.startedAt,
+				lastActivityAt: p.lastActivityAt,
+				...(parentCorrelationId !== p.correlationId
+					? { spawnedBy: parentCorrelationId }
+					: {}),
+			}, now);
+		}
 		const row = this.roster.get(p.correlationId);
 		if (!row) return;
 		row.parentCorrelationId = parentCorrelationId === p.correlationId
@@ -241,6 +285,8 @@ export class AgentsStore {
 		}
 		if (typeof p.toolCount === "number") row.toolCount = p.toolCount;
 		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.lastMessage === "string" && p.lastMessage.length > 0) {
 			row.tail = truncateTail(p.lastMessage);
 		}

package/src/bash-bg-widget.ts

@@ -1,6 +1,5 @@
 import type { ThemeColor } from "@earendil-works/pi-coding-agent";
 import type { IconGlyphs } from "./icons.ts";
-import { sanitizeExtensionStatusText } from "./extension-status.ts";
 import { fitLineByPriority, type PrioritizedSegment } from "./layout.ts";
 import { formatDuration, type PaintTheme, type WidthUtils } from "./render.ts";
 import type { BashBgJob } from "./types.ts";
@@ -35,10 +34,7 @@ export function renderBashBgSummary(
 	].filter(Boolean).join(" · ");
 	const statusColor: ThemeColor = stopping > 0 ? "warning" : "accent";
 	const elapsed = formatDuration(options.now - current.startedAt);
-	const preview = lastOutputLine(current.outputTail);
 	const g = options.glyphs;
-	// The Alt+J hint is the only advertised route into the job detail overlay, so
-	// it outranks the command preview instead of being the first thing clipped.
 	const segments: PrioritizedSegment[] = [
 		{
 			text: theme.fg(statusColor, current.status === "stopping" ? g.blocked : options.spin),
@@ -47,24 +43,8 @@ export function renderBashBgSummary(
 		},
 		{ text: theme.fg("muted", "BG"), priority: 95, clippable: false },
 		{ text: theme.fg(statusColor, counts), priority: 90, clippable: false },
-		{ text: theme.fg("text", oneLine(current.command)), priority: 70, minWidth: 8 },
-		{ text: theme.fg("dim", `${options.hint ?? DEFAULT_BASH_BG_HINT} details`), priority: 60, clippable: false },
-		{ text: theme.fg("dim", elapsed), priority: 50, clippable: false },
-		{ text: theme.fg("mdLink", current.id), priority: 30, clippable: false },
+		{ text: theme.fg("dim", elapsed), priority: 80, clippable: false },
+		{ text: theme.fg("dim", `${options.hint ?? DEFAULT_BASH_BG_HINT} details`), priority: 70, clippable: false },
 	];
-	if (preview) segments.push({ text: theme.fg("dim", `${g.arrow} ${preview}`), priority: 20, minWidth: 8 });
 	return [fitLineByPriority(segments, width, utils, theme.fg("dim", g.separator), g.ellipsis)];
 }
-
-function lastOutputLine(output: string): string {
-	const lines = output.replace(/\r/g, "").split("\n");
-	for (let index = lines.length - 1; index >= 0; index--) {
-		const line = lines[index]?.trim();
-		if (line) return oneLine(line);
-	}
-	return "";
-}
-
-function oneLine(value: string): string {
-	return sanitizeExtensionStatusText(value);
-}

package/src/footer.ts

@@ -27,10 +27,10 @@ export interface FooterParts {
 	ctxTokens: number;
 	ctxWindow: number;
 	totals: UsageTotals;
-	git?: string;
-	agentSummary?: string;
-	bashBgStatus?: string;
-	workflowStatus?: string;
+	git?: string;
+	agentSummary?: string;
+	bashBgStatus?: string;
+	workflowStatus?: string;
 	extensionStatuses?: readonly ExtensionStatusSegment[];
 	width: number;
 	glyphs: IconGlyphs;
@@ -207,7 +207,9 @@ export function renderFooter(p: FooterParts): string[] {
 		(status) => isVisibleExtensionStatus(status, p.thinking),
 	);
 	const controlStatuses = visibleStatuses.filter(
-		(status) => status.key === "approval-mode" || status.key === "maestro-auto-compact-mode",
+		(status) => status.key === "mode"
+			|| status.key === "approval-mode"
+			|| status.key === "maestro-auto-compact-mode",
 	);
 
 	// line 1: prioritized identity and control segments
@@ -323,14 +325,14 @@ export function renderFooter(p: FooterParts): string[] {
 	}
 	if (!selected) fittedLeft = fitLeftBeside("");
 
-	const line1 = alignRight(fittedLeft.join(identitySeparator), right1, width, utils.measure);
-	const lines = [utils.clip(line1, width, ell)];
-	if (p.bashBgStatus) {
-		lines.push(utils.clip(p.bashBgStatus, width, ell));
-	}
-	if (p.workflowStatus) {
-		lines.push(utils.clip(theme.fg("muted", p.workflowStatus), width, ell));
-	}
+	const line1 = alignRight(fittedLeft.join(identitySeparator), right1, width, utils.measure);
+	const lines = [utils.clip(line1, width, ell)];
+	if (p.bashBgStatus) {
+		lines.push(utils.clip(p.bashBgStatus, width, ell));
+	}
+	if (p.workflowStatus) {
+		lines.push(utils.clip(theme.fg("muted", p.workflowStatus), width, ell));
+	}
 	const statuses = visibleStatuses.filter((status) => !controlStatuses.includes(status));
 	if (statuses.length > 0) {
 		const statusSeparator = ` ${sep} `;

package/src/index.ts

@@ -2,17 +2,17 @@ import { isAbsolute, relative, resolve, sep } from "node:path";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import type { TUI } from "@earendil-works/pi-tui";
 import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { AgentsStore, type CompletePayload, type MessagePayload, type StartedPayload } from "./agents-store.ts";
-import { statusText, titleFor, workingMessage, type AmbientState } from "./ambient.ts";
-import { BashBgStore } from "./bash-bg-store.ts";
-import { BashBgOverlay } from "./bash-bg-overlay.ts";
-import { renderBashBgSummary } from "./bash-bg-widget.ts";
-import { TodoStore } from "./todo-store.ts";
+import { AgentsStore, type CompletePayload, type MessagePayload, type StartedPayload } from "./agents-store.ts";
+import { statusText, titleFor, workingMessage, type AmbientState } from "./ambient.ts";
+import { BashBgStore } from "./bash-bg-store.ts";
+import { BashBgOverlay } from "./bash-bg-overlay.ts";
+import { renderBashBgSummary } from "./bash-bg-widget.ts";
+import { TodoStore } from "./todo-store.ts";
 import { makeTodoWidget, makeAgentWidget, terminalRows } from "./stack-widget.ts";
 import { activeThemeName, ThemePicker } from "./theme-picker.ts";
 import { getUsageTotals, invalidateUsageCache, renderFooter, type PaintTheme, type WidthUtils } from "./footer.ts";
 import { collectExtensionStatuses } from "./extension-status.ts";
-import { ANIMATION_PERIOD_MS, resolveGlyphs, spinFrame } from "./icons.ts";
+import { ANIMATION_PERIOD_MS, resolveGlyphs, spinFrame } from "./icons.ts";
 import { ensureConfigExists, loadConfig, saveConfig } from "./config.ts";
 import { applyRow, buildRows, rowKeyForAccel, type SaveState } from "./settings-view.ts";
 import {
@@ -133,6 +133,7 @@ export default function (pi: ExtensionAPI): void {
 		pi.events.emit(COCKPIT_UI_OWNERSHIP_EVENT, {
 			todo: config.enabled,
 			agents: config.enabled && config.hideNativeAgents,
+			footer: config.enabled,
 			todoExpanded: config.todoExpanded,
 		});
 	};
@@ -181,12 +182,12 @@ export default function (pi: ExtensionAPI): void {
 		ctx.ui.setWidget(
 			AGENT_WIDGET_KEY,
 			(tui, theme) => {
-				capturedTui = tui;
-				return makeAgentWidget({
-					getAgents: () => agents.snapshot(),
-					getConfig: () => config,
-					isRunning: () => running,
-					isAnimating,
+				capturedTui = tui;
+				return makeAgentWidget({
+					getAgents: () => agents.snapshot(),
+					getConfig: () => config,
+					isRunning: () => running,
+					isAnimating,
 				})(tui, theme);
 			},
 			{ placement: "belowEditor" },
@@ -210,23 +211,23 @@ export default function (pi: ExtensionAPI): void {
 			const component = {
 				render(width: number): string[] {
 					if (Number.isFinite(width) && width > 0) observedWidth = width;
-					const cu = ctx.getContextUsage();
-					const branch = footerData.getGitBranch();
-					const extensionStatuses = collectExtensionStatuses(footerData.getExtensionStatuses());
-					const glyphs = resolveGlyphs(config.icons.mode);
-					const now = Date.now();
-					const bashBgStatus = renderBashBgSummary(
-						bashBg.snapshot(),
-						width,
-						theme,
-						FOOTER_UTILS,
-						{
-							glyphs,
-							spin: spinFrame(glyphs, now, isAnimating()),
-							now,
-						},
-					)[0];
-					return renderFooter({
+					const cu = ctx.getContextUsage();
+					const branch = footerData.getGitBranch();
+					const extensionStatuses = collectExtensionStatuses(footerData.getExtensionStatuses());
+					const glyphs = resolveGlyphs(config.icons.mode);
+					const now = Date.now();
+					const bashBgStatus = renderBashBgSummary(
+						bashBg.snapshot(),
+						width,
+						theme,
+						FOOTER_UTILS,
+						{
+							glyphs,
+							spin: spinFrame(glyphs, now, isAnimating()),
+							now,
+						},
+					)[0];
+					return renderFooter({
 						width,
 						model: ctx.model?.id ?? "no-model",
 						provider: ctx.model?.provider,
@@ -234,13 +235,13 @@ export default function (pi: ExtensionAPI): void {
 						cwd: formatCwd(ctx.sessionManager.getCwd()),
 						ctxPct: cu?.percent ?? 0,
 						ctxTokens: cu?.tokens ?? 0,
-						ctxWindow: cu?.contextWindow ?? ctx.model?.contextWindow ?? 0,
-						totals: getUsageTotals(ctx.sessionManager.getEntries()),
-						git: branch ?? undefined,
-						bashBgStatus,
-						workflowStatus: extensionStatuses.find((status) => status.key === WORKFLOW_STATUS_KEY)?.text,
-						extensionStatuses: extensionStatuses.filter((status) => status.key !== WORKFLOW_STATUS_KEY),
-						glyphs,
+						ctxWindow: cu?.contextWindow ?? ctx.model?.contextWindow ?? 0,
+						totals: getUsageTotals(ctx.sessionManager.getEntries()),
+						git: branch ?? undefined,
+						bashBgStatus,
+						workflowStatus: extensionStatuses.find((status) => status.key === WORKFLOW_STATUS_KEY)?.text,
+						extensionStatuses: extensionStatuses.filter((status) => status.key !== WORKFLOW_STATUS_KEY),
+						glyphs,
 						theme,
 						utils: FOOTER_UTILS,
 					});
@@ -316,8 +317,13 @@ export default function (pi: ExtensionAPI): void {
 		// through /settings since — including an automatic "light/dark" pair, which
 		// cockpit cannot represent and would silently flatten to a single theme.
 		todos.hydrateFromEntries(ctx.sessionManager.getEntries());
-		applyUi(ctx);
-		publishUiOwnership();
+		if (config.enabled) {
+			publishUiOwnership();
+			applyUi(ctx);
+		} else {
+			applyUi(ctx);
+			publishUiOwnership();
+		}
 		pi.events.emit(BASH_BG_QUERY_EVENT, undefined);
 		req();
 	});
@@ -327,6 +333,7 @@ export default function (pi: ExtensionAPI): void {
 		pi.events.emit(COCKPIT_UI_OWNERSHIP_EVENT, {
 			todo: false,
 			agents: false,
+			footer: false,
 			todoExpanded: config.todoExpanded,
 		});
 		lastCtx = undefined;
@@ -520,10 +527,16 @@ export default function (pi: ExtensionAPI): void {
 					? { kind: "saved" }
 					: { kind: "failed", message: result.error ?? "unknown error" };
 				if (wasEnabled !== config.enabled) {
-					if (config.enabled) applyUi(ctx);
-					else uninstallUi(ctx);
+					if (config.enabled) {
+						publishUiOwnership();
+						applyUi(ctx);
+					} else {
+						uninstallUi(ctx);
+						publishUiOwnership();
+					}
+				} else {
+					publishUiOwnership();
 				}
-				publishUiOwnership();
 				req();
 			};
 			const ui = {

package/src/render.ts

@@ -106,6 +106,16 @@ export function formatDuration(ms: number): string {
 	return `${h}h ${m}m ${s}s`;
 }
 
+export function formatAgentMetric(value: number): string {
+	if (value < 100) return String(value);
+	if (value < 999_950) return `${trimMetric(value / 1_000)}k`;
+	return `${trimMetric(value / 1_000_000)}m`;
+}
+
+function trimMetric(value: number): string {
+	return value.toFixed(1).replace(/\.0$/, "");
+}
+
 // Role is identity, status is state — they must not share a palette. Reusing
 // success/warning/error for roles meant a green row could mean "executor" or
 // "done", and every theme inherits that ambiguity. Roles therefore draw from the
@@ -236,7 +246,12 @@ export function renderAgents(
 		if (r.activeTool) segs.push({ text: theme.fg("accent", `tool ${r.activeTool}`), priority: 50, minWidth: 8 });
 		if (r.tail) segs.push({ text: theme.fg("dim", r.tail), priority: 40, minWidth: 8 });
 		if (r.toolCount !== undefined) segs.push({ text: theme.fg("muted", `${r.toolCount} tools`), priority: 20, clippable: false });
-		if (r.tokens !== undefined) segs.push({ text: theme.fg("muted", `${r.tokens} tok`), priority: 10, clippable: false });
+		if (r.inputTokens !== undefined || r.outputTokens !== undefined) {
+			const usage = `in ${formatAgentMetric(r.inputTokens ?? 0)} · out ${formatAgentMetric(r.outputTokens ?? 0)}`;
+			segs.push({ text: theme.fg("muted", usage), priority: 10, clippable: false });
+		} else if (r.tokens !== undefined) {
+			segs.push({ text: theme.fg("muted", `${formatAgentMetric(r.tokens)} tok`), priority: 10, clippable: false });
+		}
 		return fitLineByPriority(segs, width, utils, " ", g.ellipsis);
 	});
 	if (hidden > 0) {
@@ -247,6 +262,12 @@ export function renderAgents(
 
 const TODO_MAX_VISIBLE = 8;
 
+const TODO_STATUS_RANK: Record<string, number> = { in_progress: 0, blocked: 1, pending: 2, completed: 3 };
+
+function todoStatusRank(status: string): number {
+	return TODO_STATUS_RANK[status] ?? 4;
+}
+
 // Tasks keep their creation order (the numeric id assigned at allocateTaskId).
 // Non-numeric ids (workflow mirrors) sort after numeric ones, then lexicographically.
 function todoIdOrder(id: string): number {
@@ -361,7 +382,11 @@ export function renderTodos(
 	// Creation order drives both the next-task pointer and the expanded rows, so
 	// compute it once up front. The pointer is the first task the user can act on:
 	// not done, not blocked, and free of unresolved dependencies.
-	const ordered = [...items].sort((a, b) => todoIdOrder(a.id) - todoIdOrder(b.id) || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
+	const ordered = [...items].sort((a, b) =>
+		todoStatusRank(a.status) - todoStatusRank(b.status)
+		|| todoIdOrder(a.id) - todoIdOrder(b.id)
+		|| (a.id < b.id ? -1 : a.id > b.id ? 1 : 0)
+	);
 	const next = ordered.find((it) => it.status !== "completed" && it.status !== "blocked" && it.blockedBy.length === 0);
 	if (next) {
 		const np = todoPaint(next.status, g, spin);

package/src/types.ts

@@ -35,6 +35,8 @@ export interface AgentRow {
 	lastActivityAt: number;
 	toolCount?: number;
 	tokens?: number;
+	inputTokens?: number;
+	outputTokens?: number;
 	taskStatus?: string;
 	activeTool?: string;
 	taskIndex?: number;