@narumitw/pi-usage 0.60.4 → 0.60.7

package/dist/index.ts

@@ -120,6 +120,9 @@ var UsageCache = class {
     }
     this.entries.set(key, { createdAt: now, report: report2 });
   }
+  delete(providerId, fingerprint) {
+    this.entries.delete(cacheKey(providerId, fingerprint));
+  }
   clearProvider(providerId) {
     for (const key of this.entries.keys()) {
       if (key.startsWith(`${providerId}:`)) this.entries.delete(key);
@@ -239,8 +242,6 @@ function redactUsageError(value, secrets = []) {
 function errorMessage(error) {
   return sanitizeDisplayText(error instanceof Error ? error.message : String(error), 600);
 }
-var UsageUnsupportedError = class extends Error {
-};
 function abortError() {
   return Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
 }
@@ -1732,22 +1733,98 @@ function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/providers/zai-errors.ts
+var ERROR_MESSAGES = {
+  "1000": "Authentication failed. Check your API key.",
+  "1001": "Authentication header missing. Check your API key.",
+  "1003": "Authentication token expired. Obtain a new token.",
+  "1005": "Two-factor authentication required.",
+  "1113": "Insufficient balance or no resource package. Recharge your account.",
+  "1200": "API call error. Try again later.",
+  "1210": "Invalid API parameter. Check the API documentation.",
+  "1211": "Unknown model. Check the model ID.",
+  "1212": "This model does not support the requested method.",
+  "1213": "A required parameter is missing.",
+  "1214": "Invalid parameter. Check the API documentation.",
+  "1215": "Conflicting parameters. Check the API documentation.",
+  "1220": "Access denied. Check your permissions.",
+  "1221": "This API has been taken offline.",
+  "1222": "This API does not exist.",
+  "1230": "API processing error. Try again later.",
+  "1234": "Network error. Try again later.",
+  "1261": "Prompt too long. Reduce the input length.",
+  "1301": "Content rejected by the safety policy.",
+  "1302": "Request rate limit reached. Try again later.",
+  "1305": "Service overloaded. Try again later.",
+  "1308": "Usage limit reached. Wait for the quota reset.",
+  "1309": "GLM Coding Plan expired. Renew your subscription.",
+  "1310": "Weekly or monthly limit exhausted. Wait for the quota reset.",
+  "1311": "Your subscription does not include this model.",
+  "1313": "Request frequency restricted by the Fair Usage Policy. Contact support.",
+  "1314": "Enterprise package expired. Contact your administrator.",
+  "1315": "This API key requires an enterprise coding package scenario. Replace the key.",
+  "1316": "5-hour limit reached; insufficient balance for extra usage. Wait for reset.",
+  "1317": "7-day limit reached; insufficient balance for extra usage. Wait for reset.",
+  "1318": "5-hour limit reached; extra usage blocked by monthly spend limit.",
+  "1319": "7-day limit reached; extra usage blocked by monthly spend limit.",
+  "1320": "5-hour limit reached; extra usage blocked by monthly spend limit.",
+  "1321": "7-day limit reached; extra usage blocked by monthly spend limit."
+};
+var HTTP_MESSAGES = {
+  400: "Invalid request. Check the API documentation.",
+  401: "Authentication failed. Check your API key.",
+  403: "Access denied. Check your permissions.",
+  429: "Request or usage limit reached. Try again later.",
+  500: "Internal error. Try again later."
+};
+function zaiPayloadError(payload) {
+  const object = asObject11(payload);
+  if (!object) return void 0;
+  const nested = asObject11(object.error);
+  const rawCode = nested?.code === void 0 ? object.code : nested.code;
+  const code = errorCode(rawCode);
+  if (object.error === void 0 && object.success !== false && (rawCode === void 0 || code === "0" || code === "200")) {
+    return void 0;
+  }
+  return code && code !== "0" && code !== "200" ? `Z.AI ${code}: ${ERROR_MESSAGES[code] ?? "API request failed."}` : "Z.AI: API request failed.";
+}
+function zaiResponseError(status, text) {
+  let payload;
+  try {
+    payload = JSON.parse(text);
+  } catch {
+    if (status >= 200 && status < 300) return "Z.AI: Invalid JSON response.";
+  }
+  const error = zaiPayloadError(payload);
+  if (error) return error;
+  if (status < 200 || status >= 300) {
+    return `Z.AI HTTP ${status}: ${HTTP_MESSAGES[status] ?? "API request failed."}`;
+  }
+  return void 0;
+}
+function errorCode(value) {
+  if (typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 9999) {
+    return String(value);
+  }
+  return typeof value === "string" && /^(?:0|[1-9]\d{0,3})$/u.test(value) ? value : void 0;
+}
+function asObject11(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+
 // src/providers/zai.ts
 var FIVE_HOUR_WINDOW_MINUTES2 = 300;
 var WEEKLY_WINDOW_MINUTES2 = 10080;
 function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt, plan) {
-  const data = asObject11(payload.data);
-  if (!data) {
-    const reason = asString5(payload.msg);
-    throw new UsageUnsupportedError(
-      `No GLM Coding Plan on this Z.AI credential; API usage is not metered.${reason ? ` Z.AI reported: ${reason}` : ""}`
-    );
-  }
+  const error = zaiPayloadError(payload);
+  if (error) throw new Error(error);
+  const data = asObject12(payload.data);
+  if (!data) throw new Error("Z.AI quota response data was not an object.");
   const limits = Array.isArray(data.limits) ? data.limits : [];
   const buckets = [];
   const metrics = [];
   for (const raw of limits) {
-    const limit = asObject11(raw);
+    const limit = asObject12(raw);
     if (!limit) continue;
     const type = asString5(limit.type);
     const unit = asNonnegativeNumber4(limit.unit);
@@ -1796,14 +1873,11 @@ function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt,
   };
 }
 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 (zaiPayloadError(payload)) return void 0;
   if (!Array.isArray(payload.data)) return void 0;
   const candidates = [];
   for (const raw of payload.data) {
-    const entry = asObject11(raw);
+    const entry = asObject12(raw);
     if (!entry) continue;
     const name = asString5(entry.productName);
     if (!name) continue;
@@ -1881,7 +1955,7 @@ function addCountBucket(buckets, limit, id, label, windowMinutes) {
 function addUsageDetailMetrics(metrics, value) {
   if (!Array.isArray(value)) return;
   for (const raw of value) {
-    const detail = asObject11(raw);
+    const detail = asObject12(raw);
     if (!detail) continue;
     const label = asString5(detail.modelCode);
     const usage = asNonnegativeNumber4(detail.usage);
@@ -1889,7 +1963,7 @@ function addUsageDetailMetrics(metrics, value) {
     metrics.push({ id: `mcp-${kebabCase(label)}`, label, value: usage, unit: "count" });
   }
 }
-function asObject11(value) {
+function asObject12(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
   return value;
 }
@@ -2227,6 +2301,7 @@ var SUPPORTED_ADAPTERS = [
   {
     id: "zai",
     displayName: "Z.AI",
+    invalidateCacheOnFailure: true,
     semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
     async query(auth, signal, timeoutMs, guard) {
       return queryZaiUsage("zai", "Z.AI", auth, signal, timeoutMs, guard);
@@ -2235,6 +2310,7 @@ var SUPPORTED_ADAPTERS = [
   {
     id: "zai-coding-cn",
     displayName: "Z.AI Coding CN",
+    invalidateCacheOnFailure: true,
     semantics: { kind: "consumer-subscription", label: "GLM Coding Plan usage" },
     async query(auth, signal, timeoutMs, guard) {
       return queryZaiUsage("zai-coding-cn", "Z.AI Coding CN", auth, signal, timeoutMs, guard);
@@ -2455,8 +2531,7 @@ async function queryProviderUsage(adapter, auth, signal, timeoutMs, guard, targe
     );
   } catch (error) {
     if (isStaleExtensionContextError(error) || isAbortError(error)) throw error;
-    const message = redactUsageError(errorMessage(error), auth.secrets);
-    throw error instanceof UsageUnsupportedError ? new UsageUnsupportedError(message) : new Error(message);
+    throw new Error(redactUsageError(errorMessage(error), auth.secrets));
   }
 }
 function providerIsConfigured(ctx, providerId) {
@@ -2537,6 +2612,8 @@ async function fetchProviderJson(url, auth, signal, timeoutMs, description, requ
     );
     if (controller.signal.aborted)
       throw Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
+    const responseError = request.responseError?.(response.status, text);
+    if (responseError) throw new Error(responseError);
     if (!response.ok) {
       throw new Error(
         `${description} returned ${response.status} ${response.statusText}: ${redactUsageError(text, auth.secrets)}`
@@ -2613,7 +2690,7 @@ function resolveXaiUsageAuth(auth, model, salt, candidates) {
   const matches = [];
   for (const candidate of candidates) {
     try {
-      const credential = asObject12(candidate);
+      const credential = asObject13(candidate);
       if (credential?.type !== "oauth") continue;
       sawOAuth = true;
       if (credential.access !== resolvedAccess) continue;
@@ -2667,7 +2744,7 @@ function resolveGitHubCopilotUsageAuth(auth, model, salt, candidates, standalone
   const matches = /* @__PURE__ */ new Map();
   for (const candidate of candidates) {
     try {
-      const credential = asObject12(candidate);
+      const credential = asObject13(candidate);
       if (credential?.type !== "oauth") continue;
       sawOAuth = true;
       const storedAccess2 = typeof credential.access === "string" && credential.access ? credential.access : void 0;
@@ -2729,7 +2806,7 @@ function bearerToken(authorization) {
   const match = /^Bearer\s+(.+)$/iu.exec(authorization ?? "");
   return match?.[1];
 }
-function asObject12(value) {
+function asObject13(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
   return value;
 }
@@ -2858,7 +2935,8 @@ async function queryZaiUsage(providerId, providerName, auth, signal, timeoutMs,
     zaiMonitorAuth(auth),
     signal,
     remainingTimeout2(timeoutMs, startedAt, `fetching ${providerName} quota`),
-    `${providerName} quota endpoint`
+    `${providerName} quota endpoint`,
+    { responseError: zaiResponseError }
   );
   await guard();
   const planTimeoutMs = timeoutMs - (Date.now() - startedAt);
@@ -2873,7 +2951,8 @@ async function fetchZaiPlan(providerName, auth, signal, timeoutMs) {
       zaiMonitorAuth(auth),
       signal,
       timeoutMs,
-      `${providerName} plan endpoint`
+      `${providerName} plan endpoint`,
+      { responseError: zaiResponseError }
     );
     return normalizeZaiSubscriptionPayload(payload);
   } catch (error) {
@@ -3023,7 +3102,7 @@ function normalizeCodexResetCreditsPayload(payload) {
   if (rawCredits !== void 0 && !Array.isArray(rawCredits)) {
     throw new Error("Codex reset credits response returned invalid credits.");
   }
-  const options = (rawCredits ?? []).map(asObject13).filter((credit) => Boolean(credit)).filter((credit) => credit.status === "available" && credit.reset_type === "codex_rate_limits").map(normalizeResetOption).sort(
+  const options = (rawCredits ?? []).map(asObject14).filter((credit) => Boolean(credit)).filter((credit) => credit.status === "available" && credit.reset_type === "codex_rate_limits").map(normalizeResetOption).sort(
     (left, right) => (left.expiresAt ?? Number.MAX_SAFE_INTEGER) - (right.expiresAt ?? Number.MAX_SAFE_INTEGER)
   ).slice(0, Math.min(availableCount, MAX_RESET_OPTIONS));
   if (availableCount > 0 && options.length === 0) {
@@ -3038,7 +3117,7 @@ function selectCodexResetCredential(candidates, resolvedAccess, resolvedAccountI
   const matches = /* @__PURE__ */ new Map();
   for (const candidate of candidates) {
     try {
-      const credential = asObject13(candidate);
+      const credential = asObject14(candidate);
       if (credential?.type !== "oauth") continue;
       sawOAuth = true;
       const storedAccess = asNonemptyString(credential.access);
@@ -3077,7 +3156,7 @@ function codexAccountIdFromAccessToken(access) {
     const parts = access.split(".");
     if (parts.length !== 3 || !parts[1]) return void 0;
     const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
-    const claims = asObject13(asObject13(payload)?.["https://api.openai.com/auth"]);
+    const claims = asObject14(asObject14(payload)?.["https://api.openai.com/auth"]);
     return validHeaderValue(claims?.chatgpt_account_id);
   } catch {
     return void 0;
@@ -3109,7 +3188,7 @@ function normalizeResetOption(credit) {
 function isCodexResetOutcomeCode(value) {
   return value === "reset" || value === "nothing_to_reset" || value === "no_credit" || value === "already_redeemed";
 }
-function asObject13(value) {
+function asObject14(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
   return value;
 }
@@ -4217,33 +4296,15 @@ import { stripVTControlCharacters } from "node:util";
 import {
   getSettingsListTheme
 } from "@earendil-works/pi-coding-agent";
-import {
-  Container,
-  Key,
-  matchesKey,
-  SettingsList,
-  Text
-} from "@earendil-works/pi-tui";
+import { Key, matchesKey, SettingsList, Text } from "@earendil-works/pi-tui";
 var OFF = "Off";
 var ON = "On";
-function fitSettingsRows(lines, maxRows) {
-  if (lines.length <= maxRows) return lines;
-  const content = lines.filter((line) => stripVTControlCharacters(line).trim().length > 0);
-  if (content.length <= maxRows) return content;
-  const selectedIndex = content.findIndex(
-    (line) => /^[→›]\s/u.test(stripVTControlCharacters(line))
-  );
-  if (selectedIndex < 0) return content.slice(0, maxRows);
-  return content.map((line, index) => ({ index, line })).sort(
-    (left, right) => Math.abs(left.index - selectedIndex) - Math.abs(right.index - selectedIndex) || left.index - right.index
-  ).slice(0, maxRows).sort((left, right) => left.index - right.index).map(({ line }) => line);
-}
 async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent, onApplied) {
   if (ctx.mode !== "tui") {
     if (ctx.hasUI) ctx.ui.notify(`Edit settings manually: ${settingsRuntime.get().path}`, "info");
     return false;
   }
-  const { HorizontalRule } = await import("@narumitw/pi-tui-kit");
+  const { HorizontalRule, renderBoundedFrame } = await import("@narumitw/pi-tui-kit");
   if (parentSignal.aborted || !isCurrent()) return false;
   return await ctx.ui.custom((tui, theme, _keybindings, done) => {
     const localController = new AbortController();
@@ -4268,9 +4329,7 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
         values: [OFF, ON]
       }
     ];
-    const container = new Container();
     const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
-    container.addChild(new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 1));
     let settingsList;
     const cancel = () => {
       if (closing) return;
@@ -4317,20 +4376,29 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
       },
       cancel
     );
-    container.addChild(settingsList);
     parentSignal.addEventListener("abort", cancel, { once: true });
     return {
       render(width) {
-        const content = container.render(width);
+        const title = new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 0).render(
+          width
+        );
+        const content = settingsList.render(width);
+        const focusedRow = content.findIndex(
+          (line) => /^[→›]\s/u.test(stripVTControlCharacters(line))
+        );
         const terminalRows = Number.isFinite(tui.terminal?.rows) ? Math.floor(tui.terminal.rows) : 24;
-        const availableRows = Math.max(1, terminalRows - 3);
-        if (content.length + 2 > availableRows) {
-          return fitSettingsRows(content, availableRows);
-        }
         const [ruleLine = ""] = rule.render(width);
-        return [ruleLine, ...content, ruleLine];
+        return renderBoundedFrame({
+          width,
+          maxRows: Math.max(1, terminalRows - 3),
+          rule: ruleLine,
+          title,
+          content,
+          priorityRows: focusedRow < 0 ? [] : [focusedRow],
+          focusedRow
+        });
       },
-      invalidate: () => container.invalidate(),
+      invalidate: () => settingsList.invalidate(),
       handleInput(data) {
         if (closing) return;
         if (matchesKey(data, Key.ctrl("c"))) cancel();
@@ -4568,7 +4636,7 @@ function usageExtension(pi, dependencies = {}) {
             providerId: adapter.id,
             providerName,
             displayState,
-            status: previousDiscoveryFailure.status,
+            status: "query-failed",
             message: previousDiscoveryFailure.message
           },
           fingerprint: auth.fingerprint,
@@ -4627,7 +4695,7 @@ function usageExtension(pi, dependencies = {}) {
             providerId: adapter.id,
             providerName,
             displayState,
-            status: previousFailure.status,
+            status: "query-failed",
             message: previousFailure.message
           },
           fingerprint: auth.fingerprint,
@@ -4680,16 +4748,16 @@ function usageExtension(pi, dependencies = {}) {
         );
       }
       const message = errorMessage(error);
-      const status = error instanceof UsageUnsupportedError ? "unsupported" : "query-failed";
       const now = Date.now();
       for (const [key, failure] of failureBackoff) {
         if (failure.until <= now) failureBackoff.delete(key);
       }
       if (queryId === void 0 || latestQueries.get(failureKey) === queryId) {
+        if (adapter.invalidateCacheOnFailure) cache.delete(adapter.id, queryFingerprint);
         setBoundedMap(
           failureBackoff,
           failureKey,
-          { until: now + FAILURE_BACKOFF_MS, message, status },
+          { until: now + FAILURE_BACKOFF_MS, message },
           MAX_ACCOUNT_STATES
         );
       }
@@ -4698,7 +4766,7 @@ function usageExtension(pi, dependencies = {}) {
           providerId: adapter.id,
           providerName,
           displayState,
-          status,
+          status: "query-failed",
           message
         },
         fingerprint: auth.fingerprint,