pi-cockpit 0.17.0 → 0.18.0

package/README.md

@@ -35,7 +35,7 @@ pi -e ./packages/pi-cockpit
 - **SIDEBAR** — Workflow Session/Run progress, Goal state and budget, Todo tasks, Teammate roster, background jobs, and read-only Team Swarm progress. Empty sections disappear and constrained heights retain current or failed work before secondary detail.
 - **AGENTS** — every running teammate as a table row (status spinner · role · id · label · live tail), sorted running-first. Completed/failed agents show their total duration. On narrow terminals this returns to the below-editor widget.
 - **TODO** — the active plan as numbered rows with four states (done ✓ / in-progress spinner / blocked ! / pending ·). On narrow terminals this returns to the above-editor widget.
-- **Footer** — `provider/model · context gauge · ↑in ↓out · $cost · elapsed · git branch`. `bash_bg` background-job state lives on a **dedicated second footer row** so it no longer competes with the primary line.
+- **Footer** — `provider/model · context gauge · ↑in ↓out · $cost · elapsed · git branch`. `bash_bg` background-job state lives on a **dedicated second footer row** so it no longer competes with the primary line. **Usage bars** (quota/balance/spend for the active provider, ported from `hknet/pi-usage-bars`) live on their own footer line when `usage.footer` is on — e.g. `Codex 5h [████░░░░] 42% · W [██░░░░░░] 25% · $20.00`.
 - **Thinking timer** — while the model is thinking, the folded thinking row shows a spinner and running elapsed time; when the run ends, it settles to the actual duration (e.g. `thoughts · 8.4s`).
 - **Quiet mode** — compresses the seven built-in tool calls (read/bash/edit/write/grep/find/ls) into single-line ✓/✗/⋯ summaries and folds thinking blocks. Two glyph sets available: `check` (✓/✗/⋯) and `dot` (●/○/◌). Toggle with `/cockpit quiet`; turning off requires `/reload` to restore native tool renderers.
 
@@ -49,6 +49,7 @@ Toggle each block between list and compact with `/cockpit`.
 | AGENTS | `pi.events` channels `teammate:started` / `teammate:message` / `teammate:complete`, broadcast by **pi-maestro-teammate** | **No** — without that extension no events fire, the block stays hidden |
 | TODO | the `todo-state` snapshot the **pi-maestro-flow** `todo` tool persists after every mutation (re-read on each `tool_execution_end` and on `session_start`) | **No** — without the `todo` tool the block stays hidden |
 | Footer | `ctx.model`, `ctx.getContextUsage()`, session usage totals, `footerData.getGitBranch()` | **Yes** |
+| Usage bars | the active provider's quota/balance/spend fetched directly from each provider's usage API, resolved through `ctx.modelRegistry.getProviderAuth`/`getProviderAuthStatus` (Codex, Claude, ZAI×2, Kimi, MiniMax×2, OpenRouter, DeepSeek, Moonshot×2); the `/usage` overlay's per-provider 7-day token trend additionally reads the `pi-maestro-flow` usage-history JSONL store at `~/.pi/agent/usage-history` | **Yes** — quota/balance/spend on bare Pi (no credentials → renders nothing); the 7-day trend needs `pi-maestro-flow` to have recorded turns |
 
 So on a stock Pi the extension loads without error, the Maestro sections stay empty, and the footer remains available. The roster is **self-accumulated from event deltas**; Todo is back-filled from the latest durable `todo-state`. Workflow, Goal, and Swarm use a versioned full-replacement snapshot with generation fencing and a query path for cold-start recovery.
 
@@ -84,7 +85,14 @@ Cockpit has no package dependency on `pi-maestro-flow`. It observes optional pro
     "showMaestro": false,
     "maxLength": 80
   },
-  "theme": ""
+  "theme": "",
+  "usage": {
+    "enabled": true,
+    "footer": true,
+    "pollIntervalMs": 120000,
+    "barWidth": 8,
+    "commandKey": "usage"
+  }
 }
 ```
 
@@ -110,9 +118,16 @@ Cockpit has no package dependency on `pi-maestro-flow`. It observes optional pro
 
 The tab title is `frame + pi - <session> - <working state>`. The session part follows Claude Code's chain (`sessionTitle ?? agentTitle ?? haikuTitle ?? default`): the `/session name` title wins, otherwise the generated title, otherwise a short session id. The frame is Claude Code's title chrome: `⠂`/`⠐` braille spinner while a turn runs, static `✳` when idle; failure replaces it with `✗`. On quit, Cockpit clears the title so no stale tab label lingers (Claude Code's `CLEAR_TERMINAL_TITLE`).
 - `theme`: named theme override; empty string follows the Pi session theme.
+- `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.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).
 
 ## Commands
 
+> **macOS:** every `Alt+…` shortcut is the **option** key, and the hints render as `Option+…` there. The terminal has to deliver option as Meta or the keystroke inserts a character instead of firing the shortcut — iTerm2: *Profiles → Keys → Left/Right Option key → `Esc+`*; Terminal.app: *Settings → Profiles → Keyboard → Use Option as Meta key*. The registered binding is `alt+…` on every platform; only its name changes.
+
 - `/cockpit` — opens the settings overlay.
 - `/maestro-settings` — opens the unified settings shell (Cockpit, Flow, Teammate and integrations).
 - `Alt+J` — opens the background Bash jobs overlay (live status, command, cwd, duration, output tail).
@@ -121,6 +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.
 - `/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/node_modules/pi-maestro-settings-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-maestro-settings-core",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "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

@@ -193,3 +193,39 @@ export function checkCatalogCompleteness(
     issues,
   };
 }
+
+/**
+ * What to call the modifier that terminals deliver as Meta, on this platform.
+ *
+ * Every `alt+…` shortcut this product registers is delivered by the key macOS
+ * labels **option** — there is no key called Alt on a Mac keyboard, so a hint
+ * reading `Alt+R` sends a Mac user looking for a key that is not there. The
+ * binding is unchanged and stays `alt+…`; only its name differs.
+ *
+ * Lives beside the locale helpers because it answers the same question they do
+ * — what to show this user for a fixed underlying value — and both packages
+ * that render shortcut hints already depend on this module. The axis is the
+ * platform rather than the locale, so it is a separate function rather than a
+ * catalog entry: the label is identical in every language.
+ *
+ * `⌥` is deliberately not used: U+2325 is East-Asian Ambiguous, so a terminal
+ * rendering the zh-CN locale may give it two columns and break hint widths this
+ * product computes.
+ *
+ * @param platform - platform to name the modifier for; defaults to the running one.
+ * @returns `Option` on macOS, `Alt` everywhere else.
+ */
+export function altModifierLabel(platform: string = process.platform): string {
+  return platform === "darwin" ? "Option" : "Alt";
+}
+
+/**
+ * Name one `alt+…` shortcut the way this platform's keyboard labels it.
+ *
+ * @param key - the rest of the chord, such as `R` or `Shift+P`.
+ * @param platform - platform to name it for; defaults to the running one.
+ * @returns the hint text, e.g. `Option+R` on macOS and `Alt+R` elsewhere.
+ */
+export function altKey(key: string, platform?: string): string {
+  return `${altModifierLabel(platform ?? process.platform)}+${key}`;
+}

package/package.json

@@ -1,85 +1,85 @@
-{
-  "name": "pi-cockpit",
-  "version": "0.17.0",
-  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
-  "type": "module",
-  "keywords": [
-    "pi-package",
-    "pi",
-    "pi-extension",
-    "tui",
-    "teammate",
-    "todo"
-  ],
-  "license": "MIT",
-  "files": [
-    "src/",
-    "themes/",
-    "README.md"
-  ],
-  "scripts": {
-    "test": "node --test --experimental-transform-types tests/config.test.ts tests/public-events.test.ts tests/maestro-store.test.ts tests/split-pane.test.ts tests/editor-bottom.test.ts tests/sidebar-render.test.ts tests/sidebar-controller.test.ts tests/viewport-stability.test.ts tests/quiet-tools.test.ts tests/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/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",
-    "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.0",
-    "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.0.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.83.0",
-    "@earendil-works/pi-ai": "0.83.0",
-    "@earendil-works/pi-coding-agent": "0.83.0",
-    "@earendil-works/pi-tui": "0.83.0",
-    "@types/node": "^22.0.0",
-    "pi-maestro-teammate": "2.0.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.18.0",
+  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
+  "type": "module",
+  "keywords": [
+    "pi-package",
+    "pi",
+    "pi-extension",
+    "tui",
+    "teammate",
+    "todo"
+  ],
+  "license": "MIT",
+  "files": [
+    "src/",
+    "themes/",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "node --test --experimental-transform-types tests/config.test.ts tests/public-events.test.ts tests/maestro-store.test.ts tests/split-pane.test.ts tests/editor-bottom.test.ts tests/sidebar-render.test.ts tests/sidebar-controller.test.ts tests/viewport-stability.test.ts tests/quiet-tools.test.ts tests/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",
+    "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.1",
+    "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.1.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.83.0",
+    "@earendil-works/pi-ai": "0.83.0",
+    "@earendil-works/pi-coding-agent": "0.83.0",
+    "@earendil-works/pi-tui": "0.83.0",
+    "@types/node": "^22.0.0",
+    "pi-maestro-teammate": "2.1.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/*"
+  }
+}

package/src/agent-bar.ts

@@ -12,7 +12,7 @@ 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, type AgentDisplayStatus } from "./agents-store.ts";
+import { effectiveAgentStatus, isCliAgent, type AgentDisplayStatus } from "./agents-store.ts";
 import { visibleAgentRows } from "./stack-widget.ts";
 import { tuiT } from "./tui-i18n.ts";
 
@@ -99,8 +99,10 @@ function chip(
 	activity?: string,
 	attention = false,
 	outcome?: { status: "completed" | "failed" | "terminated"; message?: string },
+	cli = false,
 ): 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", "!") : "";
@@ -112,8 +114,8 @@ function chip(
 				: theme.fg("success", " ✓")
 		: "";
 	return active
-		? `${attentionPrefix}${theme.fg(color, "▸")} ${theme.fg(color, theme.bold(text))}${outcomeSuffix}${activitySuffix}${badge}`
-		: `${attentionPrefix}${theme.fg(color, text)}${outcomeSuffix}${activitySuffix}${badge}`;
+		? `${attentionPrefix}${theme.fg(color, "▸")} ${theme.fg(color, theme.bold(text))}${cliBadge}${outcomeSuffix}${activitySuffix}${badge}`
+		: `${attentionPrefix}${theme.fg(color, text)}${cliBadge}${outcomeSuffix}${activitySuffix}${badge}`;
 }
 
 export type AgentBarStatus = AgentDisplayStatus | "idle";
@@ -128,6 +130,8 @@ interface AgentBarTab extends SessionTab {
 	attention?: boolean;
 	/** Terminal outcome badge: ✓ completed, ✗ failed (with reason) or terminated. */
 	outcome?: { status: "completed" | "failed" | "terminated"; message?: string };
+	/** External CLI backend (ACP `cli/<tool>` route): shown as an accent badge after the label. */
+	cli?: boolean;
 }
 
 function endpointStatus(endpoint: CockpitEndpoint, now: number, mainRunning: boolean): AgentBarStatus {
@@ -177,6 +181,7 @@ function renderAgentChipLine(tabs: AgentBarTab[], selectedId: string, width: num
 		tab.outcome
 			? { status: tab.outcome.status, message: tab.outcome.message ? truncateToWidth(tab.outcome.message, 24, "…") : undefined }
 			: undefined,
+		tab.cli,
 	));
 	const chipWidths = chips.map((text) => visibleWidth(text));
 	const sepWidth = visibleWidth(CHIP_SEPARATOR);
@@ -281,6 +286,7 @@ export function renderAgentBar(
 				: {}),
 			...(status === "stalled" ? { attention: true } : {}),
 			...(outcome ? { outcome } : {}),
+			...(endpoint.agentRow && isCliAgent(endpoint.agentRow) ? { cli: true } : {}),
 		};
 	});
 	// Selected-session metrics summary, appended only when the chip line leaves

package/src/agent-overlay.ts

@@ -9,7 +9,7 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@earendil-works/pi-tui";
-import { effectiveAgentStatus, isExpertLeader, type AgentDisplayStatus } from "./agents-store.ts";
+import { effectiveAgentStatus, isCliAgent, isExpertLeader, type AgentDisplayStatus } from "./agents-store.ts";
 import { scrollBy, type AgentScrollState } from "./agent-scroll.ts";
 import type { IconGlyphs } from "./icons.ts";
 import { visibleStart } from "./layout.ts";
@@ -454,8 +454,11 @@ export class AgentOverlay implements Component, Focusable {
 			const expertTag = isExpertLeader(row)
 				? `${this.params.theme.fg("accent", tuiT("widget.agent.expert"))} `
 				: "";
+			const cliTag = isCliAgent(row)
+				? `${this.params.theme.fg("accent", tuiT("widget.agent.cli"))} `
+				: "";
 			return fit(
-				`${prefix}${marker} ${this.params.theme.fg(visual.color, visual.glyph)} ${expertTag}${this.params.theme.bold(agentLabel(row))}${task}`,
+				`${prefix}${marker} ${this.params.theme.fg(visual.color, visual.glyph)} ${expertTag}${cliTag}${this.params.theme.bold(agentLabel(row))}${task}`,
 				width,
 			);
 		});