pi-cockpit 0.18.0 → 0.20.0

package/README.md

@@ -120,7 +120,7 @@ The tab title is `frame + pi - <session> - <working state>`. The session part fo
 - `theme`: named theme override; empty string follows the Pi session theme.
 - `usage.enabled`: master switch for the usage bars (quota, balance, spend). On by default; off hides the footer segment and disables the `/usage` command. Ports the [`hknet/pi-usage-bars`](https://github.com/hknet/pi-usage-bars) extension.
 - `usage.footer`: when `true`, render the live quota bar on a dedicated footer line. The `/usage` command works regardless of this toggle. On by default.
-- `usage.pollIntervalMs`: how often to refresh usage data, in milliseconds. Clamped to `30000`..`1800000` (30s..30min). Default `120000` (2min). Lower values hit provider APIs more often.
+- `usage.pollIntervalMs`: how often to refresh usage data, in milliseconds. Clamped to `30000`..`1800000` (30s..30min); `0` switches to manual refresh — no background polling and no footer bar; the `/usage` overlay fetches on open and re-fetches with `r`. Default `120000` (2min). Lower values hit provider APIs more often.
 - `usage.barWidth`: characters per quota bar in the footer. Clamped to `4`..`16`. Default `8`.
 - `usage.commandKey`: the `/`-command that opens the usage selector overlay. Default `"usage"`. Requires `/reload` to take effect (commands register at session start).
 
@@ -136,7 +136,7 @@ The tab title is `frame + pi - <session> - <working state>`. The session part fo
 - `/cockpit sidebar auto|on|off` — selects dock behavior.
 - `/cockpit sidebar resize` or `Ctrl+Shift+R` — enters temporary Resize mode. Left/Right adjusts one column, Shift+Left/Shift+Right adjusts four, Enter accepts, and Escape rolls back. Mouse reporting is active only during Resize mode.
 - `/cockpit quiet` — toggles quiet mode; `/cockpit bg` shows background jobs.
-- `/usage` — opens the usage selector overlay: quota, balance, and spend for every configured provider, with the active one marked `✓`. Search filters by name; arrows/`j`/`k` move, Enter expands the selected provider, Esc closes. Expanding a provider also shows its **7-day token trend** — a sparkline of daily token usage, a `total tok · $cost · turns/day` summary, and the top 2 models by token share — read from the optional `pi-maestro-flow` usage-history store (`~/.pi/agent/usage-history`), so it appears once that extension has recorded turns and is omitted on bare Pi. The command key is configurable via `usage.commandKey` (default `"usage"`, requires `/reload`). Disabled while `usage.enabled` is off.
+- `/usage` — opens the usage selector overlay: quota, balance, and spend for every configured provider, with the active one marked `✓`. Search filters by name; arrows/`j`/`k` move, Enter expands the selected provider, Esc closes; `r` (with an empty search box) re-fetches all providers; `p` (with an empty search box) toggles background polling — persisted to `usage.pollIntervalMs` (off writes `0`, on restores the default `120000`), so the footer bar starts/stops. Expanding a provider also shows its **7-day token trend** — a sparkline of daily token usage, a `total tok · $cost · turns/day` summary, and the top 2 models by token share — read from the optional `pi-maestro-flow` usage-history store (`~/.pi/agent/usage-history`), so it appears once that extension has recorded turns and is omitted on bare Pi. The command key is configurable via `usage.commandKey` (default `"usage"`, requires `/reload`). Disabled while `usage.enabled` is off.
 - `/theme` — switch theme with live preview; `/theme <name>` applies directly. `cockpit-zen` is the restrained warm-gold theme designed for the Zen stack; selecting it does not change `stackStyle`. Pi ships no standalone theme command; cockpit provides one.
 
 ## Sidebar compatibility

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cockpit",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
   "type": "module",
   "keywords": [
@@ -67,12 +67,12 @@
     }
   },
   "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",
+    "@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.1.0",
+    "pi-maestro-teammate": "2.3.0",
     "typebox": "1.3.7",
     "typescript": "^5.5.0"
   },

package/src/agent-bar.ts

@@ -15,6 +15,7 @@ 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 { ownerDisplayToken } from "./window-autocomplete.ts";
 
 export const SESSION_BAR_WIDGET_KEY = "cockpit-session-bar";
 export const AGENT_BAR_WIDGET_KEY = SESSION_BAR_WIDGET_KEY;
@@ -37,12 +38,19 @@ export interface SessionBarDeps {
 	getCurrentSession?: () => { label: string; color: ThemeColor } | undefined;
 }
 
+export interface SessionBarHint {
+	text: string;
+	color?: ThemeColor;
+}
+
+export type SessionBarHintValue = string | SessionBarHint;
+
 export interface AgentBarDeps {
 	getEndpoints: () => readonly CockpitEndpoint[];
 	getState: () => SessionUiState;
 	getNow: () => number;
 	isMainRunning?: () => boolean;
-	getShortcutHint?: () => string | undefined;
+	getShortcutHint?: () => SessionBarHintValue | undefined;
 }
 
 export const AGENT_SESSION_COLORS = [
@@ -154,7 +162,7 @@ function endpointColor(endpoint: CockpitEndpoint, status: AgentBarStatus, now: n
 export interface AgentBarRenderOptions {
 	mainRunning?: boolean;
 	now?: number;
-	shortcutHint?: string;
+	shortcutHint?: SessionBarHintValue;
 }
 
 /** Chip-to-chip separator in the agent bar. */
@@ -231,11 +239,12 @@ export function renderSessionBarLine(
 	renderContent: (width: number) => string,
 	width: number,
 	theme: Theme,
-	shortcutHint?: string,
+	shortcutHint?: SessionBarHintValue,
 ): string {
 	const w = Math.max(1, width);
 	if (!shortcutHint) return renderContent(w);
-	const hint = theme.fg("dim", shortcutHint);
+	const hintSpec = typeof shortcutHint === "string" ? { text: shortcutHint, color: "dim" as const } : shortcutHint;
+	const hint = theme.fg(hintSpec.color ?? "dim", hintSpec.text);
 	const hintWidth = visibleWidth(hint);
 	const gap = 2;
 	if (w < hintWidth + gap + 8) return renderContent(w);
@@ -269,9 +278,10 @@ export function renderAgentBar(
 		const outcome = status === "done" || status === "failed" || status === "terminated" || status === "sleeping"
 			? endpoint.agentRow?.lastOutcome
 			: undefined;
+		const ownerId = endpoint.kind === "root" ? endpoint.registryEndpoint?.ownerId : undefined;
 		return {
 			id: endpoint.id,
-			label: endpoint.label,
+			label: ownerId ? ownerDisplayToken(endpoint.label, ownerId) : endpoint.label,
 			ordinal: endpoint.ordinal,
 			unread: state.endpoint(endpoint.id).unread,
 			endpoint,

package/src/ambient.ts

@@ -16,6 +16,7 @@ export interface AmbientState {
 	agents: readonly AgentRow[];
 	jobs: readonly BashBgJob[];
 	running: boolean;
+	waitingForInput?: boolean;
 	cwd?: string;
 	activeTool?: string;
 	workingStartedAt?: number;
@@ -54,17 +55,32 @@ function failedJobs(jobs: readonly BashBgJob[]): BashBgJob[] {
 	return jobs.filter((job) => job.status === "failed" || (job.exitCode !== null && job.exitCode !== 0));
 }
 
+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 with a live
- * elapsed value, matching the compact folded-thinking label.
+ * 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.
  */
 export function workingMessage(state: AmbientState, now = Date.now()): string | undefined {
-	const label = state.activeTool ?? (state.running ? tuiT("ambient.working") : undefined);
+	const label = state.waitingForInput
+		? tuiT("ambient.waitingForInput")
+		: state.activeTool ?? (state.running ? tuiT("ambient.working") : undefined);
 	if (!label) return undefined;
 	const sep = state.separator ?? " ";
-	const text = (state.hideLiveDuration || state.workingStartedAt === undefined)
+	const text = (state.waitingForInput || state.hideLiveDuration || state.workingStartedAt === undefined)
 		? label
 		: `${label}${sep}${formatThinkingDuration(now - state.workingStartedAt)}`;
 	return `\x1b[3m${text}\x1b[23m`;
@@ -100,6 +116,8 @@ export function titleFor(
 	let title: string;
 	if (broken > 0) {
 		title = `${marks.fail} ${base}${sep}${tuiT("ambient.failed", { count: broken })}`;
+	} else if (state.waitingForInput) {
+		title = `${prefix}${base}${sep}${tuiT("ambient.waitingForInput")}`;
 	} else if (state.running) {
 		const live = liveAgents(state.agents).length;
 		title = live > 0
@@ -135,3 +153,51 @@ export function titleFor(
 export function statusText(problem: string | undefined, mark: string): string | undefined {
 	return problem ? `${mark} cockpit: ${problem}` : undefined;
 }
+
+/**
+ * Some host UI setters invalidate the whole TUI even when the value did not
+ * change. Cache the last ambient values so the 250ms Cockpit tick only mutates
+ * host surfaces when there is a real text change.
+ */
+export class AmbientSurfaceCache {
+	private workingMessageKnown = false;
+	private workingMessage: string | undefined;
+	private titleKnown = false;
+	private title: string | undefined;
+	private readonly statuses = new Map<string, string | undefined>();
+
+	reset(): void {
+		this.workingMessageKnown = false;
+		this.workingMessage = undefined;
+		this.titleKnown = false;
+		this.title = undefined;
+		this.statuses.clear();
+	}
+
+	setWorkingMessage(setter: (message: string | undefined) => void, message: string | undefined): boolean {
+		if (this.workingMessageKnown && this.workingMessage === message) return false;
+		this.workingMessageKnown = true;
+		this.workingMessage = message;
+		setter(message);
+		return true;
+	}
+
+	setTitle(setter: (title: string) => void, title: string): boolean {
+		if (this.titleKnown && this.title === title) return false;
+		this.titleKnown = true;
+		this.title = title;
+		setter(title);
+		return true;
+	}
+
+	setStatus(
+		key: string,
+		setter: (key: string, text: string | undefined) => void,
+		text: string | undefined,
+	): boolean {
+		if (this.statuses.has(key) && this.statuses.get(key) === text) return false;
+		this.statuses.set(key, text);
+		setter(key, text);
+		return true;
+	}
+}

package/src/config.ts

@@ -23,7 +23,9 @@ function mergeUsageConfig(base: UsageConfig, raw: unknown): UsageConfig {
 	const isFiniteInt = (v: unknown): v is number =>
 		typeof v === "number" && Number.isFinite(v) && Number.isSafeInteger(v);
 	const pollIntervalMs = isFiniteInt(o.pollIntervalMs)
-		? Math.min(USAGE_POLL_MAX_MS, Math.max(USAGE_POLL_MIN_MS, o.pollIntervalMs))
+		? o.pollIntervalMs <= 0
+			? 0 // 0 = manual refresh: no background poll, /usage fetches on open and on `r`
+			: Math.min(USAGE_POLL_MAX_MS, Math.max(USAGE_POLL_MIN_MS, o.pollIntervalMs))
 		: base.pollIntervalMs;
 	const barWidth = isFiniteInt(o.barWidth)
 		? Math.min(USAGE_BAR_MAX_WIDTH, Math.max(USAGE_BAR_MIN_WIDTH, o.barWidth))

package/src/editor/input-history-store.ts

@@ -7,7 +7,7 @@
  * so a brand new session picks up where the previous one left off.
  */
 
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, join, resolve } from "node:path";
@@ -19,6 +19,9 @@ const DEFAULT_MAX_ENTRIES = 100;
 const DEFAULT_SAVE_DEBOUNCE_MS = 250;
 const PRIVATE_DIRECTORY_MODE = 0o700;
 const PRIVATE_FILE_MODE = 0o600;
+const DEFAULT_SAVE_RETRY_DELAYS_MS = Object.freeze([25, 75, 150]);
+
+type RenameFile = (oldPath: string, newPath: string) => Promise<void>;
 
 /**
  * Serializes every save across store instances so a fresh store's load() never
@@ -32,6 +35,8 @@ export interface InputHistoryStoreOptions {
   maxEntries?: number;
   debounceMs?: number;
   onError?: (error: unknown) => void;
+  renameFile?: RenameFile;
+  retryDelaysMs?: readonly number[];
 }
 
 /**
@@ -59,6 +64,8 @@ export class InputHistoryStore {
   private readonly maxEntries: number;
   private readonly debounceMs: number;
   private readonly onError: ((error: unknown) => void) | undefined;
+  private readonly renameFile: RenameFile;
+  private readonly retryDelaysMs: readonly number[];
   private entries: string[] = [];
   private timer: NodeJS.Timeout | undefined;
   private writes: Promise<void> = Promise.resolve();
@@ -70,6 +77,8 @@ export class InputHistoryStore {
     this.maxEntries = Math.max(1, options.maxEntries ?? DEFAULT_MAX_ENTRIES);
     this.debounceMs = Math.max(0, options.debounceMs ?? DEFAULT_SAVE_DEBOUNCE_MS);
     this.onError = options.onError;
+    this.renameFile = options.renameFile ?? rename;
+    this.retryDelaysMs = retryDelays(options.retryDelaysMs);
   }
 
   /** Newest first. */
@@ -124,21 +133,30 @@ export class InputHistoryStore {
   }
 
   private async save(): Promise<void> {
+    await mkdir(this.dir, { recursive: true, mode: PRIVATE_DIRECTORY_MODE });
+    for (let attempt = 0; ; attempt += 1) {
+      await this.mergeDiskEntries();
+      const temp = `${this.filePath}.${process.pid}.${randomUUID()}.tmp`;
+      try {
+        const payload = JSON.stringify({ version: 1, entries: this.entries }, null, 2);
+        await writeFile(temp, payload, { mode: PRIVATE_FILE_MODE, flag: "wx" });
+        await this.renameFile(temp, this.filePath);
+        return;
+      } catch (error) {
+        await rm(temp, { force: true }).catch(() => undefined);
+        const retryDelay = this.retryDelaysMs[attempt];
+        if (retryDelay === undefined || !isTransientReplaceError(error)) throw error;
+        await delay(retryDelay);
+      }
+    }
+  }
+
+  private async mergeDiskEntries(): Promise<void> {
     // Another pi window in the same workspace may have written since we loaded;
     // keep whatever it added instead of overwriting it.
     const known = new Set(this.entries);
     const disk = (await this.readFromDisk()).filter((value) => !known.has(value));
     this.entries = capped([...this.entries, ...disk], this.maxEntries);
-    await mkdir(this.dir, { recursive: true, mode: PRIVATE_DIRECTORY_MODE });
-    const temp = `${this.filePath}.${process.pid}.tmp`;
-    try {
-      const payload = JSON.stringify({ version: 1, entries: this.entries }, null, 2);
-      await writeFile(temp, payload, { mode: PRIVATE_FILE_MODE });
-      await rename(temp, this.filePath);
-    } catch (error) {
-      await rm(temp, { force: true });
-      throw error;
-    }
   }
 
   private async readFromDisk(): Promise<string[]> {
@@ -171,3 +189,17 @@ function parseEntries(raw: unknown): string[] {
 function capped(entries: string[], maxEntries: number): string[] {
   return entries.length > maxEntries ? entries.slice(0, maxEntries) : entries;
 }
+
+function retryDelays(value: readonly number[] | undefined): readonly number[] {
+  const source = value ?? DEFAULT_SAVE_RETRY_DELAYS_MS;
+  return Object.freeze(source.map((delayMs) => Math.max(0, delayMs)).filter(Number.isFinite));
+}
+
+function isTransientReplaceError(error: unknown): boolean {
+  const code = (error as NodeJS.ErrnoException | null)?.code;
+  return code === "EPERM" || code === "EBUSY" || code === "EACCES";
+}
+
+function delay(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/src/endpoint-store.ts

@@ -507,7 +507,7 @@ export class EndpointStore {
 				id: `${MONITOR_CONTROL_ENDPOINT_PREFIX}${encodeURIComponent(root.id)}`,
 				logicalKey: `monitor-control:${root.ownerId}:${root.ownerNonce}`,
 				kind: "window",
-				label: "control",
+				label: `control·${root.ownerId.slice(0, 6)}`,
 				ordinal: Number.MIN_SAFE_INTEGER,
 				status: root.status,
 				contentRevision: revisionOf([root.contentRevision, controlActivityRevision]),

package/src/icons.ts

@@ -149,13 +149,11 @@ export function resolveGlyphs(mode: IconMode): IconGlyphs {
 /**
  * One source of truth for animation cadence.
  *
- * The frame clock and the redraw tick must be the same number. When frames
- * advanced every 120ms but the UI only repainted every 250ms, each repaint
- * skipped ~2 frames: the 6-frame braille spinner ran at half speed and the
- * 4-frame ASCII spinner degenerated into a two-glyph flip (| ↔ -), which reads
- * as blinking rather than rotation.
+ * The frame clock and redraw tick stay aligned so terminal animation advances
+ * one frame per paint. A half-second cadence remains legible without keeping
+ * the terminal renderer busy during long-running work.
  */
-export const ANIMATION_PERIOD_MS = 250;
+export const ANIMATION_PERIOD_MS = 500;
 
 /**
  * The frame to draw at `now`, or a stable glyph when nothing is driving redraws.