@bacnh85/pi-sub 0.1.30 → 0.1.32

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 0.1.32 (2026-08-22)
+
+- **DeepSeek via OmniRoute now shows the real USD balance** (e.g. `M:$18.25`)
+  instead of the misleading aggregate windows (R:100%/5H W:0%/2D). Credit-based
+  upstreams report "Unavailable" session/weekly in the usage text; pi-sub now
+  recognizes that shape and fetches `credits_usd` from the management usage
+  API. Needs `ROUTER_MGMT_TOKEN` (an `oma_` CLI token or manage-scope key) in
+  env / `~/.pi/agent/.env.local`; without it, the footer degrades to the clean
+  endpoint display (no aggregate leak).
+- The plain-retry fallback (drop `?provider=`) now fires only on "No cached
+  usage data" (wrong/unknown slug), not on "Unavailable" windows.
+- pi-sub now reads `.env.local`/`.env` (cwd then `~/.pi/agent`) for its own
+  env vars — same discovery chain as pi-munin, stdlib parser, no deps.
+
+## 0.1.31 (2026-08-22)
+
+- **Fixed glm-cn quota via OmniRoute**: OmniRoute's connection slug for the
+  Z.ai (CN) upstream is `glm-cn`, not `zai-coding-cn` (a Pi provider id).
+  Wrong slug returned "No cached usage data", so the plain-retry fallback
+  showed the aggregate snapshot (e.g. R:100% W:0%) instead of the Z.ai windows.
+  Alias `glmcn` now maps to the correct slug; footer shows `R:99%/3H`-style
+  windows matching the direct Z.ai display.
+- OmniRoute "reset in 2h 55m" countdowns are now converted into compact
+  footer labels (`/3H`), and "Unavailable" windows are skipped (previously
+  `0%`-style aggregates leaked in via the fallback).
+
 ## 0.1.30 (2026-08-22)
 
 - Router usage is now **provider-scoped**: the active router model's upstream

package/extensions/index.ts

@@ -4,6 +4,28 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
+/** Pi config dirs + .env.local/.env discovery (pi-munin convention, stdlib parse). */
+function loadEnvFiles(): void {
+  const dirs = process.env.PI_CODING_AGENT_DIR
+    ? [process.env.PI_CODING_AGENT_DIR]
+    : [path.join(os.homedir(), ".pi", "agent"), path.join(os.homedir(), ".pi", "agents")];
+  const candidates = [path.resolve(process.cwd(), ".env.local"), path.resolve(process.cwd(), ".env")]
+    .concat(dirs.flatMap((d) => [path.join(d, ".env.local"), path.join(d, ".env")]));
+  for (const file of candidates) {
+    try {
+      const text = fs.readFileSync(file, "utf8");
+      for (const line of text.split(/\r?\n/)) {
+        const m = line.match(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\s*$/);
+        if (!m) continue;
+        let v = m[2].trim();
+        if ((v.startsWith('"') && v.endsWith('"')) || (v.startsWith("'") && v.endsWith("'"))) v = v.slice(1, -1);
+        if (process.env[m[1]] === undefined) process.env[m[1]] = v;
+      }
+    } catch { /* optional file */ }
+  }
+}
+loadEnvFiles();
+
 const STATUS_KEY = "pi-sub";
 const MESSAGE_TYPE = "pi-sub-status";
 const USAGE_ENDPOINT = "https://chatgpt.com/backend-api/wham/usage";
@@ -340,10 +362,26 @@ function routerOrigin(baseUrl: string): string {
   return baseUrl.replace(/\/v1\/?$/, "");
 }
 
+/** OmniRoute management token (oma_ CLI token or manage-scope key) from env —
+ *  unlocks /api/usage/<connectionId> which carries the raw USD balance for
+ *  credit-based upstreams (deepseek) that the key-authable endpoints strip. */
+function readRouterMgmtToken(): string | undefined {
+  return process.env.ROUTER_MGMT_TOKEN || process.env.OMNIROUTE_MGMT_TOKEN || undefined;
+}
+
 /** Parse OmniRoute's `/api/usage/om-usage` plain-text report into windows.
  *  Sections: "Personal quota" (per-key USD budgets: Daily/Weekly) and
  *  "Provider quota" (connection session/weekly). Lines: `<Label>`,
  *  `NN% left`, `⏱ reset in <countdown>`. Robust to missing/unknown blocks. */
+/** Convert OmniRoute's "reset in 2h 55m" countdown into the compact footer
+ *  label (e.g. 3H), matching the direct Z.ai display (R:99%/4H). */
+function countdownToLabel(text: string): string | undefined {
+  const m = text.match(/(?:(\d+)\s*d)?\s*(?:(\d+)\s*h)?\s*(?:(\d+)\s*m)?/);
+  if (!m || (!m[1] && !m[2] && !m[3])) return undefined;
+  const secs = Number(m[1] || 0) * 86400 + Number(m[2] || 0) * 3600 + Number(m[3] || 0) * 60;
+  return secs ? formatRemainingTime(Date.now() / 1000 + secs) : undefined;
+}
+
 export function parseOmniUsageText(text: string): {
   personalDaily?: UsageWindow;
   personalWeekly?: UsageWindow;
@@ -369,7 +407,10 @@ export function parseOmniUsageText(text: string): {
     const remaining = Number(usedMatch[1]);
     if (remaining < 0 || remaining > 100) continue;
     const window: UsageWindow = { remaining };
-    if (resetMatch) window.resetLabel = `⏱ ${resetMatch[1].trim()}`;
+      if (resetMatch) {
+        window.resetLabel = `⏱ ${resetMatch[1].trim()}`;
+        window.remainingLabel = countdownToLabel(resetMatch[1]);
+      }
     if (inPersonal) {
       if (label.includes("daily")) out.personalDaily = window;
       else if (label.includes("weekly")) out.personalWeekly = window;
@@ -397,6 +438,10 @@ if (process.env.PI_SUB_SELF_CHECK === "1") {
   assert(rp("command-code/deepseek/deepseek-v4-flash") === "command-code", "prefix command-code");
   assert(rp("cmd/deepseek/deepseek-v4-flash") === "command-code", "alias cmd → command-code");
   assert(rp("oc/gpt-5") === "opencode-go", "alias oc → opencode-go");
+  // OmniRoute's connection slug is `glm-cn` (live-verified; zai-coding-cn is a
+  // Pi provider id, NOT an OmniRoute slug — wrong slug = no cached data).
+  assert(rp("glm-cn/glm-5.2") === "glm-cn", "glm-cn passes through");
+  assert(rp("glmcn/glm-5.2") === "glm-cn", "alias glmcn → glm-cn");
   assert(rp("zai-coding/glm-5.2") === "zai-coding", "prefix zai-coding");
   assert(rp("auto/best") === undefined, "generic auto filtered");
   assert(rp("openrouter/gpt-5") === undefined, "generic openrouter filtered");
@@ -404,7 +449,7 @@ if (process.env.PI_SUB_SELF_CHECK === "1") {
   assert(p.personalWeekly?.remaining === 90, "personal weekly 90");
   assert(p.session?.remaining === 47, "session 47");
   assert(p.providerWeekly?.remaining === 28, "provider weekly 28");
-  assert(p.personalDaily?.resetLabel?.includes("15h"), "daily reset label");
+  assert(p.personalDaily?.resetLabel?.includes("15h") === true, "daily reset label");
   const disabled = parseOmniUsageText("Usage command is disabled for this API key.");
   assert(Object.keys(disabled).length === 0, "disabled text parses empty");
   // Live-verified: provider without cached data → no windows (endpoint fallback).
@@ -416,7 +461,15 @@ if (process.env.PI_SUB_SELF_CHECK === "1") {
   );
   assert(live.session?.remaining === 90, "session 90");
   assert(live.providerWeekly?.remaining === 0, "weekly 0");
-  assert(live.session?.resetLabel?.includes("1h 59m"), "session reset");
+  assert(live.session?.resetLabel?.includes("1h 59m") === true, "session reset");
+  // Live-verified 2026-08-22: glm-cn scoped quota — Session 99%, Weekly
+  // "Unavailable" (skipped, so W stays absent like the direct Z.ai footer).
+  const glmCn = parseOmniUsageText(
+    "Provider quota\nSession\n99% left\n⏱ reset in 2h 55m\n\nWeekly\nUnavailable\n⏱ reset in unknown"
+  );
+  assert(glmCn.session?.remaining === 99, "glm-cn session 99");
+  assert(glmCn.session?.remainingLabel === "3H", "glm-cn reset label 3H");
+  assert(glmCn.providerWeekly === undefined, "glm-cn weekly unavailable skipped");
 }
 
 async function fetchUsageFromPiAuth(entry: PiAuthEntry, signal?: AbortSignal): Promise<UsageApiSnapshot | undefined> {
@@ -529,9 +582,11 @@ async function fetchRouterUsage(signal?: AbortSignal, provider?: string): Promis
         let text = await response.text();
         if (text && !text.includes("disabled")) {
           let w = parseOmniUsageText(text);
-          // Provider-scoped call but no cached quota for that upstream — retry
-          // without ?provider= so the report shows the best/all snapshot.
-          if (provider && !w.session && !w.providerWeekly) {
+          // "No cached usage data" = unknown/wrong slug — retry without
+          // ?provider= for the best/all snapshot. "Unavailable" windows mean a
+          // known credit-based upstream (deepseek) — keep them empty so the
+          // USD-balance path below takes over instead of showing the aggregate.
+          if (provider && !w.session && !w.providerWeekly && text.includes("No cached usage data")) {
             const plain = await fetch(url.replace(/\?provider=.*$/, ""), {
               headers: { Accept: "text/plain", Authorization: `Bearer ${apiKey}` },
               signal: combined,
@@ -544,6 +599,23 @@ async function fetchRouterUsage(signal?: AbortSignal, provider?: string): Promis
               }
             }
           }
+          // Credit-based upstreams (deepseek): the usage text prints "Unavailable"
+          // windows — pull the real USD balance from the management API instead.
+          const credits = await fetchRouterCredits(provider, w);
+          if (credits) {
+            const account: SubscriptionAccountSnapshot = {
+              ...baseAccount,
+              plan: `Router · ${provider}`,
+              monthlyCredits: credits.balanceUsd,
+              usageBreakdown: credits.breakdown,
+            };
+            return {
+              providerDisplayName: "Router",
+              accounts: [account],
+              activeAccount: account,
+              fetchedAt: Date.now(),
+            };
+          }
           // personalDaily = per-key budget (nearest reset → R slot),
           // provider weekly/session = upstream quota (W slot). Fall back sensibly.
           const account: SubscriptionAccountSnapshot = {
@@ -588,6 +660,56 @@ async function fetchRouterUsage(signal?: AbortSignal, provider?: string): Promis
   };
 }
 
+interface RouterCredits {
+  balanceUsd: number;
+  breakdown: string;
+}
+
+/** Fetch the raw USD balance for credit-based upstreams (deepseek: `credits_usd`)
+ *  via OmniRoute's management usage API. Only called when the key-authable
+ *  om-usage text reports no usable windows — the API-key surface normalizes
+ *  credits to meaningless percentages, so this needs ROUTER_MGMT_TOKEN.
+ *  Uses connection discovery from /api/v1/me/status (key-authable) +
+ *  /api/usage/<id> (management token). */
+async function fetchRouterCredits(provider: string | undefined, w: ReturnType<typeof parseOmniUsageText>): Promise<RouterCredits | undefined> {
+  if (!provider || w.session || w.providerWeekly) return undefined;
+  const cfg = readRouterConfig();
+  const apiKey = readRouterApiKey();
+  const mgmtToken = readRouterMgmtToken();
+  if (!cfg || !apiKey || !mgmtToken) return undefined;
+  const origin = routerOrigin(cfg.baseUrl);
+  try {
+    const combined = AbortSignal.timeout(7_000);
+    // 1. Connection id for this upstream via the key-authable status endpoint.
+    const statusRes = await fetch(`${origin}/api/v1/me/status`, {
+      headers: { Authorization: `Bearer ${apiKey}` },
+      signal: combined,
+    });
+    if (!statusRes.ok) return undefined;
+    const status = (await statusRes.json()) as { accountQuotas?: Array<{ provider?: string; connectionId?: string }> };
+    const connectionId = status.accountQuotas?.find((q) => q.provider === provider)?.connectionId;
+    if (!connectionId) return undefined;
+    // 2. Raw usage (management token) — quotas.credits_usd.remaining is the USD balance.
+    const usageRes = await fetch(`${origin}/api/usage/${connectionId}`, {
+      headers: { Authorization: `Bearer ${mgmtToken}` },
+      signal: combined,
+    });
+    if (!usageRes.ok) return undefined;
+    const usage = (await usageRes.json()) as { quotas?: Record<string, { remaining?: number }> };
+    const credits = usage.quotas?.credits_usd ?? usage.quotas?.credits;
+    const remaining = credits?.remaining;
+    if (typeof remaining !== "number" || !Number.isFinite(remaining)) return undefined;
+    const cny = usage.quotas?.credits_cny?.remaining;
+    return {
+      balanceUsd: remaining,
+      breakdown: `🪙 Balance (USD) $${remaining.toFixed(2)}` +
+        (typeof cny === "number" ? ` · ¥${cny.toFixed(2)} CNY` : ""),
+    };
+  } catch {
+    return undefined; // no mgmt token / upstream down — fall back to endpoint display
+  }
+}
+
 // 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.
@@ -913,7 +1035,7 @@ function routerUpstreamPrefix(model: ModelLike): string | undefined {
   if (first === "cmd") return "command-code";
   if (first === "oc") return "opencode-go";
   if (first === "ds") return "deepseek";
-  if (first === "glmcn" || first === "glm-cn") return "zai-coding-cn";
+  if (first === "glmcn") return "glm-cn"; // OmniRoute connection slug (not the Pi provider id zai-coding-cn)
   // Generic router aliases / upstreams without cached quota data — no provider
   // selection; the usage API returns the best snapshot instead.
   const generic = new Set(["auto", "aug", "no-think", "tllm", "combo", "openrouter", "nvidia", "felo", "pepper", "mcode", "ddgw", "veoaifree-web", "veo-free"]);

package/package.json

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