@narumitw/pi-usage 0.59.0 → 0.60.0

package/README.md

@@ -3,7 +3,6 @@
 [![npm](https://img.shields.io/npm/v/@narumitw/pi-usage)](https://www.npmjs.com/package/@narumitw/pi-usage) [![Pi extension](https://img.shields.io/badge/Pi-extension-blue)](https://pi.dev) [![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE)
 
 Inspect usage and DeepSeek API balance for Pi's active provider account, query other configured providers, and toggle Fast mode for supported OpenAI Codex models.
-
 The extension keeps each provider's native quota, allowance, and spending semantics instead of treating unlike values as equivalent.
 xAI OAuth subscription reporting follows the reviewed Grok Build contract and runs only after an explicit `/usage` action.
 
@@ -122,7 +121,6 @@ Submit a blank value from the TUI input, or remove the JSON field and run `/relo
 ### Codex Fast mode
 
 Run `/fast` without arguments to toggle Fast for the active supported Codex model, or use **Turn Fast mode on/off** in `/usage`.
-
 Fast is about 1.5× faster and uses more of your plan allowance.
 The `codexFastMode` preference defaults to Off.
 
@@ -138,7 +136,6 @@ Repair or remove an invalid file, then run `/reload` before trying the toggle ag
 ### Codex statusline reset countdown
 
 The `codexStatusResetCountdown` preference defaults to `true`. It replaces the window labels with the time remaining until each returned limit resets.
-
 Turn **Codex reset countdown** Off in the TUI Settings screen, or set it to `false` in `pi-usage.json` and run `/reload`, to restore the legacy `5h` and `wk` labels:
 
 ```json
@@ -374,9 +371,9 @@ xAI identity and billing requests occur only after an explicit current, configur
 
 - Provider ID: `zai` and `zai-coding-cn`
 - Semantics: GLM Coding Plan quota windows—the rolling 5-hour and weekly plan-usage windows plus the monthly MCP allowance
-- Source: the undocumented `GET {origin}/api/monitor/usage/quota/limit` endpoint also used by Z.AI's official coding plugin
+- Source: the undocumented `GET {origin}/api/monitor/usage/quota/limit` endpoint also used by Z.AI's official coding plugin, plus the undocumented `GET {origin}/api/biz/subscription/list` plan endpoint
 - Allowed origins: the model base URL must resolve to `https://api.z.ai` or `https://open.bigmodel.cn`
-- Displayed data: explicit used and remaining values, reset times, provider-reported per-tool MCP details, and the reported plan level
+- Displayed data: explicit used and remaining values, reset times, provider-reported per-tool MCP details, and the plan name with its renewal date
 - Percentage-only windows remain percent-based
 - Statusline: publishes remaining plan percentages such as `zai 87% 5h 76% wk`; monthly MCP details remain available through `/usage`
 
@@ -385,6 +382,7 @@ The extension classifies both forms by the provider's window unit and does not l
 The quota monitor expects a raw API key without a `Bearer` prefix.
 The extension removes that prefix from resolved authorization before sending it to the monitor endpoint.
 Fingerprinting and redaction keep using the original resolved credential.
+The plan endpoint only contributes the plan name and renewal date; when it is unavailable or fails, the quota windows remain reported and the plan note falls back to the quota response's plan level.
 Only the official `api.z.ai` and `open.bigmodel.cn` origins are queried; other origins fail before sending the credential.
 
 ## 🧭 Current and configured accounts
@@ -501,7 +499,6 @@ packages/pi-usage/
 ```
 
 `index.ts` is the Pi entrypoint and forwards the default factory from `usage.ts` while retaining the package's named helper exports; other source modules are internal.
-
 The generated runtime is built from the authoritative `src/index.ts` graph and does not import back into `src`.
 
 ## 🔎 Keywords

package/dist/index.ts

@@ -1604,7 +1604,7 @@ function isRecord2(value) {
 // src/providers/zai.ts
 var FIVE_HOUR_WINDOW_MINUTES2 = 300;
 var WEEKLY_WINDOW_MINUTES2 = 10080;
-function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt) {
+function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt, plan) {
   const data = asObject11(payload.data);
   if (!data) throw new Error("Z.AI quota response data was not an object.");
   const limits = Array.isArray(data.limits) ? data.limits : [];
@@ -1620,14 +1620,20 @@ function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt)
       addCountBucket(buckets, limit, "mcp-monthly", "MCP monthly allowance");
       addUsageDetailMetrics(metrics, limit.usageDetails);
     } else if (isPlanUsage && unit === 3) {
-      addPercentBucket(buckets, limit, "five-hour", "5h window", FIVE_HOUR_WINDOW_MINUTES2);
+      addPercentBucket(
+        buckets,
+        limit,
+        "five-hour",
+        sessionWindowLabel(limit),
+        sessionWindowMinutes(limit)
+      );
     } else if (isPlanUsage && unit === 6) {
       const used = asNonnegativeNumber4(limit.currentValue);
       const quota = asNonnegativeNumber4(limit.usage);
       if (used !== void 0 && quota !== void 0) {
-        addCountBucket(buckets, limit, "weekly", "Weekly window", WEEKLY_WINDOW_MINUTES2);
+        addCountBucket(buckets, limit, "weekly", "Weekly window", weeklyWindowMinutes(limit));
       } else {
-        addPercentBucket(buckets, limit, "weekly", "Weekly window", WEEKLY_WINDOW_MINUTES2);
+        addPercentBucket(buckets, limit, "weekly", "Weekly window", weeklyWindowMinutes(limit));
       }
     }
   }
@@ -1636,7 +1642,12 @@ function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt)
   }
   const notes = [];
   const level = asString5(data.level);
-  if (level) notes.push(`Plan: ${level}`);
+  const planLabel = plan?.name ?? level;
+  if (planLabel) {
+    notes.push(
+      plan?.renewsAt ? `Plan: ${planLabel} \xB7 renews ${plan.renewsAt}` : `Plan: ${planLabel}`
+    );
+  }
   return {
     providerId,
     providerName,
@@ -1648,6 +1659,57 @@ function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt)
     ...notes.length > 0 ? { notes } : {}
   };
 }
+function normalizeZaiSubscriptionPayload(payload) {
+  if (payload.success === false) return void 0;
+  if (typeof payload.code === "number" && payload.code !== 0 && payload.code !== 200) {
+    return void 0;
+  }
+  if (!Array.isArray(payload.data)) return void 0;
+  const candidates = [];
+  for (const raw of payload.data) {
+    const entry = asObject11(raw);
+    if (!entry) continue;
+    const name = asString5(entry.productName);
+    if (!name) continue;
+    const renewsAt = planRenewalDate(entry.nextRenewTime);
+    const status = asString5(entry.status)?.toUpperCase();
+    const inCurrentPeriod = asBoolean(entry.inCurrentPeriod);
+    candidates.push({
+      plan: { name, ...renewsAt !== void 0 ? { renewsAt } : {} },
+      ...status !== void 0 ? { status } : {},
+      ...inCurrentPeriod !== void 0 ? { inCurrentPeriod } : {}
+    });
+  }
+  const hasStateMetadata = candidates.some(
+    (candidate) => candidate.status !== void 0 || candidate.inCurrentPeriod !== void 0
+  );
+  if (!hasStateMetadata) return candidates[0]?.plan;
+  return candidates.find(
+    (candidate) => candidate.inCurrentPeriod === true && candidate.status === "VALID"
+  )?.plan ?? candidates.find(
+    (candidate) => candidate.inCurrentPeriod === true && candidate.status === void 0
+  )?.plan ?? candidates.find(
+    (candidate) => candidate.status === "VALID" && candidate.inCurrentPeriod === void 0
+  )?.plan;
+}
+function planRenewalDate(value) {
+  if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}/u.test(value)) return value.slice(0, 10);
+  const millis = asNonnegativeNumber4(value);
+  if (millis === void 0 || millis === 0) return void 0;
+  return new Date(millis).toISOString().slice(0, 10);
+}
+function sessionWindowMinutes(limit) {
+  const hours = asPositiveNumber(limit.number);
+  return hours === void 0 ? FIVE_HOUR_WINDOW_MINUTES2 : Math.round(hours * 60);
+}
+function sessionWindowLabel(limit) {
+  const minutes = sessionWindowMinutes(limit);
+  return minutes === FIVE_HOUR_WINDOW_MINUTES2 ? "5h window" : `${Math.round(minutes / 60)}h window`;
+}
+function weeklyWindowMinutes(limit) {
+  const weeks = asPositiveNumber(limit.number);
+  return weeks === void 0 ? WEEKLY_WINDOW_MINUTES2 : Math.round(weeks * WEEKLY_WINDOW_MINUTES2);
+}
 function addPercentBucket(buckets, limit, id, label, windowMinutes) {
   const used = asNonnegativeNumber4(limit.percentage);
   if (used === void 0) return;
@@ -1703,6 +1765,16 @@ function asNonnegativeNumber4(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value < 0) return void 0;
   return value;
 }
+function asPositiveNumber(value) {
+  const number = asNonnegativeNumber4(value);
+  return number !== void 0 && number > 0 ? number : void 0;
+}
+function asBoolean(value) {
+  if (typeof value === "boolean") return value;
+  if (value === 1) return true;
+  if (value === 0) return false;
+  return void 0;
+}
 function asEpochSeconds2(value) {
   const millis = asNonnegativeNumber4(value);
   if (millis === void 0) return void 0;
@@ -1958,35 +2030,16 @@ var SUPPORTED_ADAPTERS = [
     id: "zai",
     displayName: "Z.AI",
     semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
-    async query(auth, signal, timeoutMs) {
-      const payload = await fetchProviderJson(
-        zaiMonitorUrl(auth.model.baseUrl),
-        zaiMonitorAuth(auth),
-        signal,
-        timeoutMs,
-        "Z.AI quota endpoint"
-      );
-      return normalizeZaiQuotaPayload("zai", "Z.AI", payload, Date.now());
+    async query(auth, signal, timeoutMs, guard) {
+      return queryZaiUsage("zai", "Z.AI", auth, signal, timeoutMs, guard);
     }
   },
   {
     id: "zai-coding-cn",
     displayName: "Z.AI Coding CN",
     semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
-    async query(auth, signal, timeoutMs) {
-      const payload = await fetchProviderJson(
-        zaiMonitorUrl(auth.model.baseUrl),
-        zaiMonitorAuth(auth),
-        signal,
-        timeoutMs,
-        "Z.AI Coding CN quota endpoint"
-      );
-      return normalizeZaiQuotaPayload(
-        "zai-coding-cn",
-        "Z.AI Coding CN",
-        payload,
-        Date.now()
-      );
+    async query(auth, signal, timeoutMs, guard) {
+      return queryZaiUsage("zai-coding-cn", "Z.AI Coding CN", auth, signal, timeoutMs, guard);
     }
   }
 ];
@@ -2590,10 +2643,13 @@ function fireworksBillingSummaryUrl(accountId, startedAt) {
   url.searchParams.set("endTime", dayFloor(startedAt + dayMs));
   return url.toString();
 }
-function zaiMonitorUrl(baseUrl) {
+function zaiOrigin(baseUrl) {
   const base = baseUrl?.trim();
   if (!base) throw new Error("Z.AI model base URL is unavailable.");
-  return `${new URL(base).origin}/api/monitor/usage/quota/limit`;
+  return new URL(base).origin;
+}
+function zaiMonitorUrl(baseUrl) {
+  return `${zaiOrigin(baseUrl)}/api/monitor/usage/quota/limit`;
 }
 function zaiMonitorAuth(auth) {
   const authorization = headerValue(auth.headers, "Authorization");
@@ -2601,6 +2657,38 @@ function zaiMonitorAuth(auth) {
   if (token === void 0 || token === authorization) return auth;
   return { ...auth, headers: { ...auth.headers, Authorization: token } };
 }
+async function queryZaiUsage(providerId, providerName, auth, signal, timeoutMs, guard) {
+  if (!guard) throw new Error("Z.AI usage requires request-boundary revalidation.");
+  const startedAt = Date.now();
+  await guard();
+  const payload = await fetchProviderJson(
+    zaiMonitorUrl(auth.model.baseUrl),
+    zaiMonitorAuth(auth),
+    signal,
+    remainingTimeout(timeoutMs, startedAt, `fetching ${providerName} quota`),
+    `${providerName} quota endpoint`
+  );
+  await guard();
+  const planTimeoutMs = timeoutMs - (Date.now() - startedAt);
+  const plan = await fetchZaiPlan(providerName, auth, signal, planTimeoutMs);
+  return normalizeZaiQuotaPayload(providerId, providerName, payload, Date.now(), plan);
+}
+async function fetchZaiPlan(providerName, auth, signal, timeoutMs) {
+  if (timeoutMs <= 0 || signal.aborted) return void 0;
+  try {
+    const payload = await fetchProviderJson(
+      `${zaiOrigin(auth.model.baseUrl)}/api/biz/subscription/list`,
+      zaiMonitorAuth(auth),
+      signal,
+      timeoutMs,
+      `${providerName} plan endpoint`
+    );
+    return normalizeZaiSubscriptionPayload(payload);
+  } catch (error) {
+    if (isAbortError(error)) throw error;
+    return void 0;
+  }
+}
 function isAbortError(error) {
   return error instanceof Error && error.name === "AbortError";
 }
@@ -3077,6 +3165,10 @@ function formatOpenRouterReport(lines, report2) {
 }
 function formatOpenCodeZenReport(lines, report2) {
   for (const bucket of report2.buckets) {
+    if (bucket.unit === "percent" && bucket.used !== void 0) {
+      lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${formatPercentBucket(bucket)}`);
+      continue;
+    }
     const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
     const used = bucket.used ?? "unavailable";
     lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${used}% used${reset}`);
@@ -3251,8 +3343,7 @@ function formatXaiReport(lines, report2) {
   if (included) {
     let value = "unavailable";
     if (included.unit === "percent" && included.used !== void 0) {
-      value = `${included.used}% used`;
-      if (included.remaining !== void 0) value += ` \xB7 ${included.remaining}% left`;
+      value = formatPercentBar(included);
     } else if (included.used !== void 0) {
       value = `${formatUsd(included.used)} used`;
       if (included.limit !== void 0) value += ` of ${formatUsd(included.limit)}`;
@@ -3277,12 +3368,13 @@ function formatXaiReport(lines, report2) {
 }
 function formatZaiReport(lines, report2) {
   for (const bucket of report2.buckets) {
+    if (bucket.unit === "percent" && bucket.used !== void 0) {
+      lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${formatPercentBucket(bucket)}`);
+      continue;
+    }
     const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
     let value = "unavailable";
-    if (bucket.unit === "percent" && bucket.used !== void 0) {
-      value = `${bucket.used}% used`;
-      if (bucket.remaining !== void 0) value += ` \xB7 ${bucket.remaining}% left`;
-    } else if (bucket.used !== void 0 && bucket.limit !== void 0) {
+    if (bucket.used !== void 0 && bucket.limit !== void 0) {
       value = `${bucket.used} of ${bucket.limit} used`;
       if (bucket.remaining !== void 0) value += ` \xB7 ${bucket.remaining} left`;
     } else if (bucket.used !== void 0) {
@@ -3394,10 +3486,12 @@ function compactLimitLabel(label) {
   return (suffix || normalized).toLowerCase().replace(/\s+/g, " ");
 }
 function formatPercentBucket(bucket) {
+  return `${formatPercentBar(bucket)}${bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : ""}`;
+}
+function formatPercentBar(bucket) {
   const remaining = clampPercent4(bucket.remaining ?? 0);
   const filled = Math.round(remaining / 100 * BAR_SEGMENTS);
-  const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
-  return `[${"\u2588".repeat(filled)}${"\u2591".repeat(BAR_SEGMENTS - filled)}] ${remaining.toFixed(0)}% left${reset}`;
+  return `[${"\u2588".repeat(filled)}${"\u2591".repeat(BAR_SEGMENTS - filled)}] ${remaining.toFixed(0)}% left`;
 }
 function formatWindowLabel(minutes, fallback, compact) {
   if (!minutes || !Number.isFinite(minutes) || minutes <= 0) {
@@ -4157,7 +4251,9 @@ function usageExtension(pi, dependencies = {}) {
       "moonshotai",
       "moonshotai-cn",
       "vercel-ai-gateway",
-      "xai"
+      "xai",
+      "zai",
+      "zai-coding-cn"
     ].includes(adapter.id);
     const requestContextChanged = () => expectedSessionGeneration !== sessionGeneration || ctx.sessionManager.getSessionId() !== expectedSessionId || modelIdentity(ctx.model) !== expectedModelIdentity || adapter.id === "fireworks" && settingsRuntime.get().settings.fireworksAccountId !== expectedFireworksAccountId;
     if (requiresRequestBoundaryGuard && requestContextChanged()) throw abortError();
@@ -4963,6 +5059,7 @@ export {
   normalizeVercelAIGatewayCreditsPayload,
   normalizeXaiBillingPayload,
   normalizeZaiQuotaPayload,
+  normalizeZaiSubscriptionPayload,
   providerIsConfigured,
   queryProviderUsage,
   redactUsageError,