pi-cockpit 0.24.4 → 0.24.5

package/package.json

@@ -1,88 +1,88 @@
-{
-  "name": "pi-cockpit",
-  "version": "0.24.4",
-  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
-  "type": "module",
-  "engines": {
-    "node": ">=22.19.0"
-  },
-  "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/terminal-emulator.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.8.1",
-    "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.8.1",
-    "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/*"
-  }
-}
+{
+  "name": "pi-cockpit",
+  "version": "0.24.5",
+  "description": "Responsive Maestro operations sidebar, fallback status widgets, and footer for Pi.",
+  "type": "module",
+  "engines": {
+    "node": ">=22.19.0"
+  },
+  "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/terminal-emulator.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.8.1",
+    "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.10.1",
+    "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/usage/core.ts

@@ -3,6 +3,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 
 export type ProviderKey =
+  | "chatgpt"
   | "codex"
   | "claude"
   | "zai"
@@ -15,6 +16,7 @@ export type ProviderKey =
   | "moonshot"
   | "moonshot-cn";
 export type PiProviderId =
+  | "openai"
   | "openai-codex"
   | "anthropic"
   | "zai"
@@ -570,6 +572,16 @@ function readCodexAccountId(token: string): string | undefined {
   }
 }
 
+export function getChatGPTUsage(): UsageData {
+  // Pi's direct-login grant is not a Codex/WHAM credential.
+  return {
+    session: 0,
+    weekly: 0,
+    quotaHidden: true,
+    notice: "Subscription quota is not exposed by Pi; check https://chatgpt.com/settings/usage",
+  };
+}
+
 export async function fetchCodexUsage(token: string, config: RequestConfig = {}): Promise<UsageData> {
   const headers: Record<string, string> = { Authorization: `Bearer ${token}` };
   // Without account routing, WHAM can return a different account's quota.
@@ -1183,6 +1195,7 @@ export function detectProvider(
 ): ProviderKey | null {
   if (!model || typeof model === "string") return null;
   switch ((model.provider || "").toLowerCase()) {
+    case "openai": return "chatgpt";
     case "openai-codex": return "codex";
     case "anthropic": return "claude";
     case "zai": return "zai";
@@ -1200,6 +1213,7 @@ export function detectProvider(
 
 export function providerToPiProviderId(provider: ProviderKey): PiProviderId {
   switch (provider) {
+    case "chatgpt": return "openai";
     case "codex": return "openai-codex";
     case "claude": return "anthropic";
     case "zai": return "zai";
@@ -1231,6 +1245,7 @@ export async function fetchAllUsages(
 ): Promise<UsageByProvider> {
   const endpoints = config.endpoints ?? resolveUsageEndpoints(config.env);
   const results: UsageByProvider = {
+    chatgpt: null,
     codex: null,
     claude: null,
     zai: null,
@@ -1253,6 +1268,7 @@ export async function fetchAllUsages(
     }));
   };
 
+  if (tokens.chatgpt) results.chatgpt = getChatGPTUsage();
   if (tokens.codex) assign("codex", fetchCodexUsage(tokens.codex, config));
   if (tokens.claude) {
     assign("claude", fetchClaudeUsageWithFallback(tokens.claude, {

package/src/usage/extension.ts

@@ -44,6 +44,7 @@ import {
 	fetchAllUsages,
 	fetchClaudeUsageWithFallback,
 	fetchCodexUsage,
+	getChatGPTUsage,
 	fetchDeepSeekBalance,
 	fetchKimiUsage,
 	fetchMiniMaxUsage,
@@ -65,6 +66,7 @@ import { type CockpitConfig, DEFAULT_CONFIG } from "../types.ts";
 const EXTENSION_ID = "pi-cockpit:usage-bars";
 const USAGE_UPDATE_EVENT = `${EXTENSION_ID}:update`;
 const PROVIDERS: readonly ProviderKey[] = [
+	"chatgpt",
 	"codex",
 	"claude",
 	"zai",
@@ -79,6 +81,7 @@ const PROVIDERS: readonly ProviderKey[] = [
 ];
 
 const PROVIDER_LABELS: Record<ProviderKey, string> = {
+	chatgpt: "ChatGPT (official)",
 	codex: "Codex",
 	claude: "Claude",
 	zai: "ZAI Coding Plan (Global)",
@@ -624,6 +627,7 @@ export function createUsageSubsystem(options: CreateUsageSubsystemOptions): Usag
 
 	const endpoints = resolveUsageEndpoints();
 	const state: UsageState = {
+		chatgpt: null,
 		codex: null,
 		claude: null,
 		zai: null,
@@ -731,7 +735,7 @@ export function createUsageSubsystem(options: CreateUsageSubsystemOptions): Usag
 		return false;
 	}
 
-	function isClaudeSubscriptionAuth(source: string | undefined): boolean {
+	function isSubscriptionAuth(source: string | undefined): boolean {
 		// Pi 0.84 exposes AuthResult.source as a human-readable label rather than a
 		// credential-type discriminator. Keep the compatibility assumption in one
 		// place until ModelRegistry exposes the resolved credential type directly.
@@ -746,7 +750,7 @@ export function createUsageSubsystem(options: CreateUsageSubsystemOptions): Usag
 
 		try {
 			const resolved = await ctx.modelRegistry.getProviderAuth(providerId);
-			if (provider === "claude" && !isClaudeSubscriptionAuth(resolved?.source)) return {};
+			if ((provider === "claude" || provider === "chatgpt") && !isSubscriptionAuth(resolved?.source)) return {};
 			const token = resolved?.auth.apiKey;
 			if (token) return { token };
 			// Some OAuth flows (e.g. kimi-coding) expose the token only as a Bearer
@@ -778,6 +782,7 @@ export function createUsageSubsystem(options: CreateUsageSubsystemOptions): Usag
 			return;
 		}
 
+		if (provider === "chatgpt") state.chatgpt = getChatGPTUsage();
 		if (provider === "codex") state.codex = await fetchCodexUsage(credential.token, { signal });
 		if (provider === "claude") state.claude = await fetchClaudeUsageWithFallback(credential.token, { signal });
 		if (provider === "zai") state.zai = await fetchZaiUsage(credential.token, "zai", { endpoints, signal });
@@ -886,6 +891,20 @@ export function createUsageSubsystem(options: CreateUsageSubsystemOptions): Usag
 		pollTimer.unref?.();
 	}
 
+	const unsubscribeAccountChanged = pi.events.on("pi:account-changed", (payload: unknown) => {
+		if (!payload || typeof payload !== "object" || !("providerId" in payload) ||
+			typeof payload.providerId !== "string") return;
+		const provider = detectProvider({ provider: payload.providerId });
+		if (!provider) return;
+		state[provider] = null;
+		delete state.available[provider];
+		if (provider === state.activeProvider) {
+			providerPollController?.abort();
+			onStatusChange();
+			if (!isManualRefresh()) void poll();
+		}
+	});
+
 	return {
 		async start(ctx) {
 			currentContext = ctx;
@@ -983,6 +1002,7 @@ export function createUsageSubsystem(options: CreateUsageSubsystemOptions): Usag
 		},
 
 		dispose() {
+			unsubscribeAccountChanged();
 			providerPollController?.abort();
 			providerPollController = undefined;
 			sessionController?.abort();