@bacnh85/pi-sub 0.1.25 → 0.1.26

package/CHANGELOG.md

@@ -1,5 +1,55 @@
+## 0.1.26 (2026-08-21)
+
+- Router adapter: reads `router.baseUrl` from `~/.pi/agent/settings.json`
+  (env `ROUTER_BASE_URL`/`NINE_ROUTER_BASE_URL`) now that pi-router moved the
+  endpoint URL out of the old `9router-config.json` (which is migrated away on
+  pi-router load). Footer shows for both new `router/` and legacy `9router/`
+  provider models.
+
 # Changelog
 
+## 0.1.29 (2026-08-15)
+
+### Features
+
+- **tok/s speed now shown for all providers.** Previously the footer was cleared
+  for providers without a subscription adapter (e.g. `ollama`); now the last
+  response speed renders as a standalone `145 tok/s` line, and `/sub` reports
+  provider/model plus last and session-average speed instead of only
+  "tracking inactive".
+
+## 0.1.28 (2026-08-09)
+
+### Improvements
+
+- **Command Code monthly balance now shown in the footer.** The footer adds a
+  compact `M:$X.XX` segment (monthly credit balance from
+  `/alpha/billing/credits`) next to the 5-hour/weekly windows, e.g.
+  `(Command Code key#…) R:100%/5H W:100%/7D M:$69.99`. The `/sub` detail view
+  keeps the `Monthly: $X remaining` breakdown line.
+
+## 0.1.27 (2026-08-09)
+
+### Features
+
+- **Command Code now shows live usage windows.** The adapter fetches
+  `https://api.commandcode.ai/alpha/billing/credits` with the same Provider
+  API key used for `/provider/v1` models and renders the 5-hour and weekly
+  rolling windows (USD used/cap, remaining% + reset countdown) plus a
+  `Monthly: $X remaining` balance line — matching what the `cmd /usage` CLI
+  shows. Previously the footer showed session cost only.
+
+## 0.1.26 (2026-08-09)
+
+### Features
+
+- Added Command Code (`commandcode`) provider support. When a `commandcode`
+  model is active, the footer shows the account label plus session cost and
+  tok/s, and `/sub` reports the provider. Command Code's Provider API does not
+  expose usage windows via its API key (the rolling-window data is
+  web-session-cookie only), so live 5h/weekly meters are not shown — behavior
+  matches `opencode-go` and `9router`.
+
 ## 0.1.25 (2026-08-07)
 
 ### Improvements

package/README.md

@@ -2,7 +2,7 @@
 
 Pi extension that shows subscription usage for the currently selected supported model provider.
 
-Supports OpenAI Codex (`openai-codex`) with live usage windows from ChatGPT's usage endpoint, OpenCode Go (`opencode-go`) with session cost tracking, and Z.ai GLM Coding Plan — both the international (`zai`) and China (`zai-coding-cn`, `open.bigmodel.cn`) endpoints — with quota monitoring. Displays a subscription footer status after Pi's built-in status/token usage line.
+ Supports OpenAI Codex (`openai-codex`) with live usage windows from ChatGPT's usage endpoint, OpenCode Go (`opencode-go`) with session cost tracking, and Z.ai GLM Coding Plan — both the international (`zai`) and China (`zai-coding-cn`, `open.bigmodel.cn`) endpoints — with quota monitoring. Also tracks Command Code (`commandcode`) 5-hour/weekly windows and monthly credit balance. Displays a subscription footer status after Pi's built-in status/token usage line.
 
 ## Install
 
@@ -51,19 +51,41 @@ The built-in `zai-coding-cn` provider targets the domestic BigModel endpoint (`o
 (Z.ai (CN) key#1a2b3c4d) R:55%/2H W:80%/3D 42 tok/s
 ```
 
-### 9router
+### Router (pi-router — formerly 9router)
 
-9router is a proxy/router with no upstream usage API, so the footer shows the configured endpoint and last response speed:
+The router (9router, omniroute, …) is a proxy with no upstream usage API, so the footer shows the configured endpoint and last response speed. The endpoint URL is read from `~/.pi/agent/settings.json` (`router.baseUrl`) with `ROUTER_BASE_URL` env override:
 
 ```text
-9router (172.30.55.22:20128) 145 tok/s
+Router (172.30.55.22:20128) 145 tok/s
 ```
 
+### Command Code
+
+Command Code exposes live usage windows via its `/alpha/billing/credits` endpoint (same Provider API key used for `/provider/v1` models — no cookies). The footer shows the active account/key label, 5-hour and weekly remaining windows with reset countdowns, and last response speed:
+
+```text
+(Command Code key#1a2b3c4d) R:99%/4H W:99%/6D M:$69.99 42 tok/s
+```
+
+The `M:$X.XX` segment is the monthly credit balance (the plan's remaining
+monthly allowance in USD). The `/sub` detail view also shows a
+`Monthly: $X remaining` line.
+
 ### Tokens per second
 
 `pi-sub` tracks each response's tokens-per-second (tok/s) speed by measuring the time from provider request to message completion against the response's output token count. The last response's speed is shown in the footer next to usage data. The `/sub` detail view shows both the last response speed and the session-wide average.
 
-When the current model provider is not supported, `pi-sub` clears its subscription line and does not refresh subscription data.
+The tok/s speed line is shown for **all** providers — including ones without a
+subscription adapter, such as `ollama` and other OpenAI-compatible local
+providers. For those, the footer shows only the speed:
+
+```text
+145 tok/s
+```
+
+and `/sub` reports the provider/model and speed instead of usage windows.
+`pi-sub` still does not refresh subscription data for unsupported providers
+(there is nothing to fetch).
 
 ## Commands
 
@@ -98,6 +120,20 @@ Last response: 42 tok/s · Session avg: 39 tok/s
 OpenCode Go does not expose usage windows.
 ```
 
+For Command Code, `/sub` shows the provider/model, active account/key label, rolling windows, and speed:
+
+```text
+Provider: Command Code · Model: deepseek/deepseek-v4-flash · Fetched: 14:23
+Session cost: $0.05
+Last response: 42 tok/s · Session avg: 39 tok/s
+
+  ACCOUNT                        ROLLING  WEEKLY   LAST ACTIVITY
+-----------------------------------------------------------------
+* Command Code key#1a2b3c4d      99%/4H   99%/6D   Now
+
+Monthly: $69.99 remaining
+```
+
 For Z.ai, `/sub` shows the rolling and weekly quota windows and speed:
 
 ```text
@@ -130,6 +166,7 @@ Refreshes are cached briefly to avoid excessive usage endpoint calls.
 
 - **OpenAI Codex**: Pi auth must contain an `openai-codex` OAuth entry in `~/.pi/agent/auth.json` or `$PI_CODING_AGENT_DIR/auth.json`. The entry must include `access` and `accountId` fields.
 - **OpenCode Go**: Pi auth must contain an `opencode-go` API key entry (via `/login` or env var). The entry must have a `key` field or an `accountId` field. OpenCode Go/Zen usage windows and Zen balance are not shown because no public API is currently documented for those values.
+- **Command Code**: Pi auth must contain a `commandcode` API key entry (via `/login commandcode` or the `COMMAND_CODE_API_KEY` env var). The entry must have a `key` field or an `accountId` field. Usage is read from `https://api.commandcode.ai/alpha/billing/credits` with the same key; 5-hour and weekly windows plus the monthly credit balance are displayed.
 - **Z.ai**: Pi auth must contain a `zai` entry in `auth.json` with a `key` field (the same API key used for Z.ai model access via `@czottmann/pi-zai-api`). The Z.ai provider must be registered (e.g., `pi install npm:@czottmann/pi-zai-api`).
 - **Z.ai Coding Plan (China)**: The built-in `zai-coding-cn` provider targets `https://open.bigmodel.cn/api/coding/paas/v4`. Pi auth must contain a `zai-coding-cn` entry with a `key` field (set via `/login` or the `ZAI_CODING_CN_API_KEY` env var). Quota is read from the BigModel endpoint `https://open.bigmodel.cn/api/monitor/usage/quota/limit`.
 - For API-key-only providers, account labels come from stored auth metadata (`email`, `label`, `name`, or `accountId`) when available; otherwise `pi-sub` displays a non-secret SHA-256 key fingerprint such as `Z.ai key#1a2b3c4d`.
@@ -141,4 +178,4 @@ See [CHANGELOG.md](CHANGELOG.md) for release history.
 
 ## Design notes
 
-The extension is named `pi-sub` rather than `pi-codex-usage` so future subscription providers can be added as separate adapters. Supports OpenAI Codex (live usage API), OpenCode Go (session cost only), and the Z.ai GLM Coding Plan (international `zai` and China `zai-coding-cn`, which share a quota response format and are served by one parameterized adapter).
+The extension is named `pi-sub` rather than `pi-codex-usage` so future subscription providers can be added as separate adapters. Supports OpenAI Codex (live usage API), OpenCode Go (session cost only), the Z.ai GLM Coding Plan (international `zai` and China `zai-coding-cn`, which share a quota response format and are served by one parameterized adapter), and Command Code (live 5-hour/weekly windows + monthly balance via `/alpha/billing/credits`).

package/extensions/index.ts

@@ -16,8 +16,13 @@ const ZAI_PROVIDER = "zai";
 const ZAI_USAGE_URL = "https://api.z.ai/api/monitor/usage/quota/limit";
 const ZAI_CODING_CN_PROVIDER = "zai-coding-cn";
 const ZAI_CODING_CN_USAGE_URL = "https://open.bigmodel.cn/api/monitor/usage/quota/limit";
-const NINE_ROUTER_PROVIDER = "9router";
-const NINE_ROUTER_CONFIG_PATH = path.join(os.homedir(), ".pi", "agent", "9router-config.json");
+const ROUTER_PROVIDER = "router";
+const LEGACY_9ROUTER_PROVIDER = "9router";
+// pi-router (formerly pi-9router): URL lives in settings.json `router.baseUrl`
+// (env override ROUTER_BASE_URL), key in auth.json `router` credential.
+const ROUTER_SETTINGS_PATH = path.join(os.homedir(), ".pi", "agent", "settings.json");
+const COMMAND_CODE_PROVIDER = "commandcode";
+const COMMAND_CODE_USAGE_URL = "https://api.commandcode.ai/alpha/billing/credits";
 
 type ModelLike = { provider?: string; id?: string } | undefined;
 
@@ -59,6 +64,8 @@ interface SubscriptionAccountSnapshot {
   plan?: string;
   fiveHour?: UsageWindow;
   weekly?: UsageWindow;
+  // Command Code-only: monthly credit balance in USD (not a rolling window).
+  monthlyCredits?: number;
   // Z.ai-only extras surfaced in the /sub detail view.
   mcpMonthly?: UsageWindow; // from TIME_LIMIT already present in the quota response
   usageBreakdown?: string; // per-model / per-tool summary line(s)
@@ -113,8 +120,12 @@ function isZaiCodingCnModel(model: ModelLike): boolean {
   return (model?.provider?.toLowerCase() ?? "") === ZAI_CODING_CN_PROVIDER;
 }
 
-function isNineRouterModel(model: ModelLike): boolean {
-  return (model?.provider?.toLowerCase() ?? "") === NINE_ROUTER_PROVIDER;
+function isRouterModel(model: ModelLike, provider: string = ROUTER_PROVIDER): boolean {
+  return (model?.provider?.toLowerCase() ?? "") === provider;
+}
+
+function isCommandCodeModel(model: ModelLike): boolean {
+  return (model?.provider?.toLowerCase() ?? "") === COMMAND_CODE_PROVIDER;
 }
 
 function piAuthPath(): string {
@@ -301,16 +312,16 @@ async function readZaiAuth(providerId: string, label: string): Promise<{ key: st
   return { key: entry.key, account: authAccountSnapshot(label, entry) };
 }
 
-// ponytail: duplicated from pi-9router — no shared config lib, 8 lines, acceptable
-function readNineRouterConfig(): { baseUrl: string; apiKey?: string } | null {
+// ponytail: duplicated from pi-router — no shared config lib, ~12 lines, acceptable
+function readRouterConfig(): { baseUrl: string } | null {
   try {
-    const exists = (p: string) => { try { return fs.statSync(p).isFile(); } catch { return false; } };
-    if (!exists(NINE_ROUTER_CONFIG_PATH)) return null;
-    const data = JSON.parse(fs.readFileSync(NINE_ROUTER_CONFIG_PATH, "utf8")) as Record<string, unknown>;
-    const baseUrl = process.env.NINE_ROUTER_BASE_URL || (typeof data.baseUrl === "string" ? data.baseUrl : undefined);
-    const apiKey = process.env.NINE_ROUTER_API_KEY || (typeof data.apiKey === "string" ? data.apiKey : undefined);
-    if (!baseUrl || typeof baseUrl !== "string") return null;
-    return { baseUrl, apiKey };
+    let baseUrl = process.env.ROUTER_BASE_URL || process.env.NINE_ROUTER_BASE_URL;
+    if (!baseUrl && fs.statSync(ROUTER_SETTINGS_PATH).isFile()) {
+      const settings = JSON.parse(fs.readFileSync(ROUTER_SETTINGS_PATH, "utf8")) as Record<string, unknown>;
+      const router = settings.router as { baseUrl?: unknown } | undefined;
+      if (typeof router?.baseUrl === "string" && router.baseUrl) baseUrl = router.baseUrl;
+    }
+    return baseUrl ? { baseUrl } : null;
   } catch {
     return null;
   }
@@ -340,6 +351,7 @@ function redactedError(error: unknown, provider = "Codex"): string {
   if (/missing openai-codex/i.test(message)) return "openai-codex auth not found";
   if (/missing opencode-go/i.test(message)) return "opencode-go auth not found";
   if (/missing zai/i.test(message)) return "zai auth not found";
+  if (/missing commandcode/i.test(message)) return "commandcode auth not found";
   if (/timed out|timeout|aborted/i.test(message)) return `${provider} usage refresh timed out`;
   if (/401|403|auth|token|unauthorized|forbidden/i.test(message)) return `${provider} auth unavailable`;
   return `${provider} usage unavailable`;
@@ -386,15 +398,15 @@ async function fetchOpenCodeGoUsage(_signal?: AbortSignal): Promise<Subscription
   }
 }
 
-async function fetchNineRouterUsage(_signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
-  const cfg = readNineRouterConfig();
+async function fetchRouterUsage(_signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
+  const cfg = readRouterConfig();
   const now = Date.now();
   if (!cfg) {
     return {
-      providerDisplayName: "9router",
+      providerDisplayName: "Router",
       accounts: [],
       fetchedAt: now,
-      error: "9router not configured — run /login-9router",
+      error: "router not configured — set router.baseUrl in ~/.pi/agent/settings.json",
     };
   }
   const account: SubscriptionAccountSnapshot = {
@@ -404,13 +416,67 @@ async function fetchNineRouterUsage(_signal?: AbortSignal): Promise<Subscription
     lastActivity: "Now",
   };
   return {
-    providerDisplayName: "9router",
+    providerDisplayName: "Router",
     accounts: [account],
     activeAccount: account,
     fetchedAt: now,
   };
 }
 
+// Command Code's /alpha/billing/credits endpoint (auth: same Provider API key
+// as /provider/v1 models) returns live 5-hour and weekly rolling windows plus
+// the monthly credit balance — the same data as the cmd /usage CLI.
+async function fetchCommandCodeUsage(signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
+  try {
+    const { key: apiKey, account: authAccount } = await readZaiAuth(COMMAND_CODE_PROVIDER, "Command Code");
+    const timeoutSignal = AbortSignal.timeout(7_000);
+    const combinedSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+
+    const headers = {
+      Accept: "application/json",
+      Authorization: `Bearer ${apiKey}`,
+      "User-Agent": "pi-sub/0.1.27",
+    };
+    const response = await fetch(COMMAND_CODE_USAGE_URL, { headers, signal: combinedSignal });
+    if (!response.ok) {
+      throw new Error(`Command Code usage request failed with HTTP ${response.status}`);
+    }
+    const body = (await response.json()) as CommandCodeCreditsApiResponse;
+
+    const credits = body.credits;
+    const windowLimits = body.windowLimits;
+    const fiveHour = commandCodeWindowToUsageWindow(windowLimits?.fiveHour);
+    const weekly = commandCodeWindowToUsageWindow(windowLimits?.weekly);
+
+    // Monthly allowance is an absolute USD balance, not a rolling window.
+    const monthlyCredits = typeof credits?.monthlyCredits === "number" ? credits.monthlyCredits : undefined;
+    const monthlyLine = monthlyCredits !== undefined ? `Monthly: $${monthlyCredits.toFixed(2)} remaining` : undefined;
+    const breakdown = [monthlyLine].filter((s): s is string => !!s);
+
+    const account: SubscriptionAccountSnapshot = {
+      ...authAccount,
+      fiveHour,
+      weekly,
+      monthlyCredits,
+      usageBreakdown: breakdown.length > 0 ? breakdown.join("\n") : undefined,
+    };
+
+    return {
+      providerDisplayName: "Command Code",
+      accounts: [account],
+      activeAccount: account,
+      fetchedAt: Date.now(),
+    };
+  } catch (error) {
+    return {
+      providerDisplayName: "Command Code",
+      accounts: [],
+      fetchedAt: Date.now(),
+      error: redactedError(error, "Command Code"),
+    };
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Z.ai adapter
 // ---------------------------------------------------------------------------
@@ -438,6 +504,48 @@ interface ZaiUsageApiError {
   success?: boolean;
 }
 
+// ---------------------------------------------------------------------------
+// Command Code adapter
+// ---------------------------------------------------------------------------
+// Live-verified 2026-08-09: GET https://api.commandcode.ai/alpha/billing/credits
+// with the Provider API key (same user_... key as /provider/v1 models) returns
+// USD windows + monthly credit balance. resetAt is epoch milliseconds.
+
+interface CommandCodeWindowApi {
+  used: number;
+  cap: number;
+  exceeded?: boolean | null;
+  resetAt?: number;
+}
+
+interface CommandCodeCreditsApiResponse {
+  credits?: {
+    monthlyCredits?: number;
+    purchasedCredits?: number;
+    freeCredits?: number;
+    belowThreshold?: boolean;
+  };
+  windowLimits?: {
+    limited?: boolean;
+    fiveHour?: CommandCodeWindowApi;
+    weekly?: CommandCodeWindowApi;
+  };
+}
+
+/** Map a Command Code USD window (used/cap in dollars, resetAt in ms) into
+ *  the shared UsageWindow shape (remaining%, reset labels). */
+function commandCodeWindowToUsageWindow(window: CommandCodeWindowApi | undefined): UsageWindow | undefined {
+  if (!window || typeof window.used !== "number" || typeof window.cap !== "number" || window.cap <= 0) return undefined;
+  const usedPct = Math.round((window.used / window.cap) * 100);
+  const percent = Math.min(100, usedPct);
+  const remaining = Math.max(0, 100 - percent);
+  // resetAt is epoch ms; format helpers expect seconds.
+  const resetAtSec = window.resetAt ? window.resetAt / 1000 : undefined;
+  const resetLabel = formatReset(resetAtSec);
+  const remainingLabel = formatRemainingTime(resetAtSec);
+  return { percent, remaining, remainingLabel, resetLabel };
+}
+
 function zaiLimitToUsageWindow(limit: ZaiLimitEntry): UsageWindow | undefined {
   if (typeof limit.percentage !== "number") return undefined;
   const percent = Math.round(limit.percentage);
@@ -599,7 +707,9 @@ function supportedAdapter(model: ModelLike): SubscriptionProviderAdapter | undef
   if (isOpenCodeGoModel(model)) return { id: OPC_PROVIDER, displayName: "OpenCode Go", fetchUsage: fetchOpenCodeGoUsage };
   if (isZaiModel(model)) return { id: ZAI_PROVIDER, displayName: "Z.ai", ...zaiUsageAdapter(ZAI_PROVIDER, ZAI_USAGE_URL, "Z.ai") };
   if (isZaiCodingCnModel(model)) return { id: ZAI_CODING_CN_PROVIDER, displayName: "Z.ai (CN)", ...zaiUsageAdapter(ZAI_CODING_CN_PROVIDER, ZAI_CODING_CN_USAGE_URL, "Z.ai (CN)") };
-  if (isNineRouterModel(model)) return { id: NINE_ROUTER_PROVIDER, displayName: "9router", fetchUsage: fetchNineRouterUsage };
+  if (isRouterModel(model)) return { id: ROUTER_PROVIDER, displayName: "Router", fetchUsage: fetchRouterUsage };
+  if (isRouterModel(model, LEGACY_9ROUTER_PROVIDER)) return { id: LEGACY_9ROUTER_PROVIDER, displayName: "9router (legacy)", fetchUsage: fetchRouterUsage };
+  if (isCommandCodeModel(model)) return { id: COMMAND_CODE_PROVIDER, displayName: "Command Code", fetchUsage: fetchCommandCodeUsage };
   return undefined;
 }
 
@@ -627,11 +737,12 @@ function windowSegments(account: SubscriptionAccountSnapshot | undefined): strin
 }
 
 function renderSubscriptionLine(ctx: ExtensionContext, state: State): void {
+  const theme = ctx.ui.theme;
   if (!state.adapter) {
-    ctx.ui.setStatus(STATUS_KEY, undefined);
+    // Unsupported provider (e.g. Ollama): still show the last response speed.
+    ctx.ui.setStatus(STATUS_KEY, state.lastTokPerSec !== undefined ? theme.fg("dim", `${state.lastTokPerSec} tok/s`) : undefined);
     return;
   }
-  const theme = ctx.ui.theme;
   const snapshot = state.snapshot;
   let line: string;
   let color: "dim" | "warning" | "error" = "dim";
@@ -647,6 +758,8 @@ function renderSubscriptionLine(ctx: ExtensionContext, state: State): void {
     const segments = accountPart ? [accountPart, ...windowParts] : [...windowParts];
     const cost = state.cumulativeCost;
     const hasWindows = windowParts.length > 0;
+    // Command Code monthly balance: compact USD figure, e.g. M:$69.99.
+    if (typeof account?.monthlyCredits === "number") segments.push(`M:$${account.monthlyCredits.toFixed(2)}`);
     if (cost > 0) segments.push(`$${cost.toFixed(2)}`);
     if (state.lastTokPerSec !== undefined) segments.push(`${state.lastTokPerSec} tok/s`);
     if (segments.length === 0) {
@@ -736,7 +849,15 @@ function pad(value: string, width: number): string {
 }
 
 function buildDetails(snapshot: SubscriptionUsageSnapshot | undefined, state: State): string {
-  if (!state.adapter) return `Subscription tracking inactive for current model provider (${state.model?.provider ?? "unknown"}).`;
+  if (!state.adapter) {
+    const header = `Provider: ${state.model?.provider ?? "unknown"}${state.model?.id ? ` · Model: ${state.model.id}` : ""}`;
+    if (state.lastTokPerSec === undefined) return `${header}\nSubscription tracking inactive for this provider.`;
+    const tokPerSecLine = `Last response: ${state.lastTokPerSec} tok/s` +
+      (state.cumulativeDurationMs > 0
+        ? ` · Session avg: ${Math.round(state.cumulativeOutput / (state.cumulativeDurationMs / 1000))} tok/s`
+        : "");
+    return `${header}\n${tokPerSecLine}`;
+  }
   if (!snapshot) return "Subscription usage has not been loaded yet.";
   if (snapshot.error) return `${snapshot.providerDisplayName}: ${snapshot.error}`;
   if (snapshot.accounts.length === 0) {
@@ -820,7 +941,7 @@ export default function (pi: ExtensionAPI) {
           state.cumulativeDurationMs += elapsed;
         }
       }
-      if (state.adapter) renderSubscriptionLine(ctx, state);
+      renderSubscriptionLine(ctx, state);
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacnh85/pi-sub",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Pi extension showing subscription usage for supported model providers.",
   "type": "module",
   "license": "MIT",