@narumitw/pi-usage 0.60.6 → 0.60.8

package/dist/index.ts

@@ -80,9 +80,7 @@ function hasCompleteUsage(value) {
   );
 }
 function costsEqual(left, right) {
-  return ["input", "output", "cacheRead", "cacheWrite", "total"].every(
-    (key) => left[key] === right[key]
-  );
+  return ["input", "output", "cacheRead", "cacheWrite", "total"].every((key) => left[key] === right[key]);
 }
 
 // src/codex-resets.ts
@@ -157,8 +155,7 @@ function fingerprintResolvedAuth(auth, salt) {
 }
 async function runWithConcurrency(items, limit, worker, signal) {
   if (signal.aborted) throw abortError();
-  if (!Number.isSafeInteger(limit) || limit < 1)
-    throw new Error("Concurrency limit must be positive.");
+  if (!Number.isSafeInteger(limit) || limit < 1) throw new Error("Concurrency limit must be positive.");
   const results = new Array(items.length);
   let nextIndex = 0;
   const runners = Array.from({ length: Math.min(limit, items.length) }, async () => {
@@ -194,10 +191,9 @@ async function awaitWithDeadline(operation, signal, timeoutMs, description) {
           "abort",
           () => {
             reject(
-              signal.aborted ? abortError() : Object.assign(
-                new Error(`Timed out after ${Math.round(timeoutMs / 1e3)}s ${description}.`),
-                { name: "TimeoutError" }
-              )
+              signal.aborted ? abortError() : Object.assign(new Error(`Timed out after ${Math.round(timeoutMs / 1e3)}s ${description}.`), {
+                name: "TimeoutError"
+              })
             );
           },
           { once: true }
@@ -283,9 +279,7 @@ function truncate(value, maxChars) {
 }
 
 // src/oauth-credential-source.ts
-import {
-  readStoredCredential
-} from "@earendil-works/pi-coding-agent";
+import { readStoredCredential } from "@earendil-works/pi-coding-agent";
 var OAUTH_CREDENTIAL_SOURCE_CHANNEL = "oauth:credential-source:v1";
 function createOAuthCredentialCandidateReader(pi, credentialReader = readStoredCredential) {
   return (ctx, providerId) => collectOAuthCredentialCandidates(pi, ctx, providerId, credentialReader);
@@ -397,13 +391,7 @@ function normalizeCodexBackendPayload(payload, capturedAt) {
     const id = asString(value?.metered_feature) ?? asString(value?.limit_name);
     if (!value || !id) continue;
     try {
-      normalizeRateLimitGroup(
-        buckets,
-        id,
-        asString(value.limit_name) ?? id,
-        value.rate_limit,
-        true
-      );
+      normalizeRateLimitGroup(buckets, id, asString(value.limit_name) ?? id, value.rate_limit, true);
     } catch {
     }
   }
@@ -657,9 +645,7 @@ function createFireworksAdapter(fetchProviderJson2) {
           if (!pageToken) break;
         }
         if (pageToken) {
-          throw new Error(
-            `Fireworks account listing exceeded ${FIREWORKS_MAX_ACCOUNT_PAGES} pages.`
-          );
+          throw new Error(`Fireworks account listing exceeded ${FIREWORKS_MAX_ACCOUNT_PAGES} pages.`);
         }
         return accounts.map((id) => ({ id, label: id }));
       }
@@ -726,9 +712,7 @@ function normalizeFireworksBillingSummaryPayload(payload, accountId, capturedAt)
       });
     }
   }
-  const notes = [
-    "Rated line items may differ from the final invoice once credits or adjustments are applied."
-  ];
+  const notes = ["Rated line items may differ from the final invoice once credits or adjustments are applied."];
   if (metrics.length === 0) {
     notes.push("Fireworks returned no rated line items for the last 30 days.");
   }
@@ -807,14 +791,8 @@ function fireworksNextPageToken(value) {
 function fireworksBillingSummaryUrl(accountId, startedAt) {
   const dayMs = 24 * 60 * 60 * 1e3;
   const dayFloor = (time) => `${new Date(time).toISOString().slice(0, 10)}T00:00:00Z`;
-  const url = new URL(
-    `/v1/accounts/${accountId}/billing/summary`,
-    FIREWORKS_BILLING_SUMMARY_ORIGIN
-  );
-  url.searchParams.set(
-    "startTime",
-    dayFloor(startedAt - (FIREWORKS_SPEND_WINDOW_DAYS - 1) * dayMs)
-  );
+  const url = new URL(`/v1/accounts/${accountId}/billing/summary`, FIREWORKS_BILLING_SUMMARY_ORIGIN);
+  url.searchParams.set("startTime", dayFloor(startedAt - (FIREWORKS_SPEND_WINDOW_DAYS - 1) * dayMs));
   url.searchParams.set("endTime", dayFloor(startedAt + dayMs));
   return url.toString();
 }
@@ -848,10 +826,7 @@ function normalizeGitHubCopilotUsagePayload(payload, capturedAt) {
       if (entitlement === void 0 || rawRemaining === void 0) {
         throw new Error(`GitHub Copilot ${label.toLowerCase()} quota was incomplete.`);
       }
-      const overageUsed = Math.max(
-        asNonnegativeNumber(premium.overage_count) ?? 0,
-        Math.max(0, -rawRemaining)
-      );
+      const overageUsed = Math.max(asNonnegativeNumber(premium.overage_count) ?? 0, Math.max(0, -rawRemaining));
       if (overageUsed > 0) {
         metrics.push({
           id: "overage-used",
@@ -983,15 +958,21 @@ function normalizeKimiCodingUsagePayload(payload, capturedAt) {
 function parseUsageRow(value, windowMinutes, label) {
   const row = asObject6(value);
   if (!row) return void 0;
-  const used = asNonnegativeInteger2(row.used);
   const limit = asNonnegativeInteger2(row.limit);
-  if (used === void 0 || limit === void 0 || limit === 0) return void 0;
+  if (limit === void 0 || limit === 0) return void 0;
+  const usedRaw = asNonnegativeInteger2(row.used);
+  const remainingRaw = asNonnegativeInteger2(row.remaining);
+  if (row.used !== void 0 && usedRaw === void 0 || row.remaining !== void 0 && remainingRaw === void 0) {
+    return void 0;
+  }
+  const used = usedRaw ?? (remainingRaw === void 0 ? 0 : Math.max(0, limit - remainingRaw));
+  const remaining = remainingRaw ?? Math.max(0, limit - used);
   const resetsAt = asIsoEpochSeconds(row.resetTime);
   return {
     id: windowId(windowMinutes),
     label,
     used,
-    remaining: Math.max(0, limit - used),
+    remaining,
     limit,
     unit: "count",
     windowMinutes,
@@ -1018,9 +999,7 @@ function parseBoosterWallet(value) {
   const monthlyLimit = parseMoney(wallet.monthlyChargeLimit);
   const monthlyUsed = parseMoney(wallet.monthlyUsed);
   const currencies = new Set(
-    [monthlyLimit?.currency, monthlyUsed?.currency].filter(
-      (currency2) => currency2 !== void 0
-    )
+    [monthlyLimit?.currency, monthlyUsed?.currency].filter((currency2) => currency2 !== void 0)
   );
   if (currencies.size !== 1) return [];
   const currency = currencies.values().next().value;
@@ -1091,22 +1070,9 @@ function asPositiveInteger(value) {
 }
 function asIsoEpochSeconds(value) {
   if (typeof value !== "string") return void 0;
-  const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?(?:Z|([+-])(\d{2}):(\d{2}))$/u.exec(
-    value
-  );
+  const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?(?:Z|([+-])(\d{2}):(\d{2}))$/u.exec(value);
   if (!match) return void 0;
-  const [
-    ,
-    yearText,
-    monthText,
-    dayText,
-    hourText,
-    minuteText,
-    secondText,
-    ,
-    offsetHour,
-    offsetMinute
-  ] = match;
+  const [, yearText, monthText, dayText, hourText, minuteText, secondText, , offsetHour, offsetMinute] = match;
   const year = Number(yearText);
   const month = Number(monthText);
   const day = Number(dayText);
@@ -1159,12 +1125,7 @@ function normalizeBalance(providerId, payload, capturedAt) {
   assertSuccess(payload);
   const provider = PROVIDERS[providerId];
   const metrics = [
-    balanceMetric(
-      "available-balance",
-      "Available balance",
-      payload.available_amount,
-      provider.currency
-    ),
+    balanceMetric("available-balance", "Available balance", payload.available_amount, provider.currency),
     balanceMetric("cash-balance", "Cash balance", payload.cash_balance, provider.currency, true),
     balanceMetric("voucher-balance", "Voucher balance", payload.voucher_balance, provider.currency),
     balanceMetric("credit-balance", "Credit balance", payload.credit_balance, provider.currency),
@@ -1584,11 +1545,7 @@ function normalizeXaiBillingPayload(payload, subscriptionTier, capturedAt) {
   const metrics = [];
   const notes = [];
   if (config) {
-    const period = normalizePeriod(
-      config.currentPeriod,
-      config.billingPeriodStart,
-      config.billingPeriodEnd
-    );
+    const period = normalizePeriod(config.currentPeriod, config.billingPeriodStart, config.billingPeriodEnd);
     const preferredPercent = optionalPercent2(config.creditUsagePercent, "creditUsagePercent");
     if (preferredPercent !== void 0) {
       buckets.push({
@@ -1686,8 +1643,7 @@ function normalizePeriod(currentPeriod, legacyStart, legacyEnd) {
 function periodLabel(type, start) {
   if (type === "USAGE_PERIOD_TYPE_WEEKLY") return "Weekly";
   if (type === "USAGE_PERIOD_TYPE_MONTHLY") return "Monthly";
-  if (type)
-    return sanitizeDisplayText(type.replace(/^USAGE_PERIOD_TYPE_/u, "").replaceAll("_", " "), 40);
+  if (type) return sanitizeDisplayText(type.replace(/^USAGE_PERIOD_TYPE_/u, "").replaceAll("_", " "), 40);
   return start === void 0 ? void 0 : "Current period";
 }
 function optionalUsd(value, field) {
@@ -1833,13 +1789,7 @@ 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",
-        sessionWindowLabel(limit),
-        sessionWindowMinutes(limit)
-      );
+      addPercentBucket(buckets, limit, "five-hour", sessionWindowLabel(limit), sessionWindowMinutes(limit));
     } else if (isPlanUsage && unit === 6) {
       const used = asNonnegativeNumber4(limit.currentValue);
       const quota = asNonnegativeNumber4(limit.usage);
@@ -1857,9 +1807,7 @@ function normalizeZaiQuotaPayload(providerId, providerName, payload, capturedAt,
   const level = asString5(data.level);
   const planLabel = plan?.name ?? level;
   if (planLabel) {
-    notes.push(
-      plan?.renewsAt ? `Plan: ${planLabel} \xB7 renews ${plan.renewsAt}` : `Plan: ${planLabel}`
-    );
+    notes.push(plan?.renewsAt ? `Plan: ${planLabel} \xB7 renews ${plan.renewsAt}` : `Plan: ${planLabel}`);
   }
   return {
     providerId,
@@ -1894,13 +1842,7 @@ function normalizeZaiSubscriptionPayload(payload) {
     (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;
+  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);
@@ -2018,12 +1960,7 @@ async function listUsageTargets(adapter, auth, signal, timeoutMs, guard) {
   if (!adapter.targets) return [];
   const startedAt = Date.now();
   await guard();
-  const listed = await adapter.targets.list(
-    auth,
-    signal,
-    remainingTargetTimeout(timeoutMs, startedAt),
-    guard
-  );
+  const listed = await adapter.targets.list(auth, signal, remainingTargetTimeout(timeoutMs, startedAt), guard);
   await guard();
   remainingTargetTimeout(timeoutMs, startedAt);
   const choices = normalizeUsageTargets(listed);
@@ -2149,13 +2086,7 @@ var SUPPORTED_ADAPTERS = [
       label: "ChatGPT subscription limits"
     },
     async query(auth, signal, timeoutMs) {
-      const payload = await fetchProviderJson(
-        CODEX_USAGE_URL,
-        auth,
-        signal,
-        timeoutMs,
-        "Codex usage endpoint"
-      );
+      const payload = await fetchProviderJson(CODEX_USAGE_URL, auth, signal, timeoutMs, "Codex usage endpoint");
       return normalizeCodexBackendPayload(payload, Date.now());
     }
   },
@@ -2203,13 +2134,7 @@ var SUPPORTED_ADAPTERS = [
     displayName: "OpenRouter",
     semantics: { kind: "api-key", label: "API-key spend limits" },
     async query(auth, signal, timeoutMs) {
-      const payload = await fetchProviderJson(
-        OPENROUTER_KEY_URL,
-        auth,
-        signal,
-        timeoutMs,
-        "OpenRouter key endpoint"
-      );
+      const payload = await fetchProviderJson(OPENROUTER_KEY_URL, auth, signal, timeoutMs, "OpenRouter key endpoint");
       return normalizeOpenRouterKeyPayload(payload, Date.now());
     }
   },
@@ -2218,8 +2143,7 @@ var SUPPORTED_ADAPTERS = [
     displayName: "Vercel AI Gateway",
     semantics: { kind: "api-key", label: "AI Gateway credits and lifetime spend" },
     async query(auth, signal, timeoutMs, guard) {
-      if (!guard)
-        throw new Error("Vercel AI Gateway usage requires request-boundary revalidation.");
+      if (!guard) throw new Error("Vercel AI Gateway usage requires request-boundary revalidation.");
       const startedAt = Date.now();
       await guard();
       const payload = await fetchProviderJson(
@@ -2376,9 +2300,7 @@ async function resolveUsageAuth(ctx, adapter, salt = AUTH_FINGERPRINT_SALT, cred
       `${adapter.displayName} usage cannot send a custom provider base URL credential to the official usage endpoint.`
     );
   }
-  const model = candidateModels(ctx, adapter.id).find(
-    (candidate) => hasOfficialOrigin(candidate, adapter.id)
-  );
+  const model = candidateModels(ctx, adapter.id).find((candidate) => hasOfficialOrigin(candidate, adapter.id));
   if (!model) return void 0;
   const registry = ctx.modelRegistry;
   const provider = registry.getProvider?.(adapter.id);
@@ -2453,15 +2375,7 @@ async function resolveUsageAuth(ctx, adapter, salt = AUTH_FINGERPRINT_SALT, cred
     if (!offered.ok) {
       throw new Error("GitHub Copilot OAuth credential discovery failed closed.");
     }
-    return finalize(
-      resolveGitHubCopilotUsageAuth(
-        auth,
-        model,
-        salt,
-        offered.candidates,
-        offered.offeredCount === 0
-      )
-    );
+    return finalize(resolveGitHubCopilotUsageAuth(auth, model, salt, offered.candidates, offered.offeredCount === 0));
   }
   if (adapter.id === "xai") {
     const offered = candidateReader ? candidateReader(ctx, adapter.id) : fallbackOAuthCredentialCandidates(adapter.id, credentialReader);
@@ -2601,8 +2515,7 @@ async function fetchProviderJson(url, auth, signal, timeoutMs, description, requ
       signal: controller.signal
     });
     if (response.redirected) throw new Error(`${description} refused a redirected response.`);
-    if (controller.signal.aborted)
-      throw Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
+    if (controller.signal.aborted) throw Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
     const text = await readBoundedResponse(
       response,
       response.ok ? MAX_SUCCESS_BODY_BYTES : MAX_ERROR_BODY_BYTES,
@@ -2610,8 +2523,7 @@ async function fetchProviderJson(url, auth, signal, timeoutMs, description, requ
       description,
       controller.signal
     );
-    if (controller.signal.aborted)
-      throw Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
+    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) {
@@ -2633,8 +2545,7 @@ async function fetchProviderJson(url, auth, signal, timeoutMs, description, requ
     if (timedOut) {
       throw new Error(`Timed out after ${Math.round(timeoutMs / 1e3)}s while fetching usage.`);
     }
-    if (signal.aborted)
-      throw Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
+    if (signal.aborted) throw Object.assign(new Error("Usage query aborted."), { name: "AbortError" });
     throw error;
   } finally {
     clearTimeout(timeout);
@@ -2769,9 +2680,7 @@ function resolveGitHubCopilotUsageAuth(auth, model, salt, candidates, standalone
   }
   if (sawIncompleteMatch) throw new Error("GitHub Copilot OAuth credentials were incomplete.");
   if (matches.size > 1) {
-    throw new Error(
-      "Conflicting OAuth credentials match the active GitHub Copilot runtime account."
-    );
+    throw new Error("Conflicting OAuth credentials match the active GitHub Copilot runtime account.");
   }
   const match = matches.values().next().value;
   if (!match) {
@@ -2850,9 +2759,7 @@ function hasOfficialUrlOrigin(value, providerId) {
   }
 }
 function headerValue(headers, name) {
-  const entry = Object.entries(headers ?? {}).find(
-    ([candidate]) => candidate.toLowerCase() === name.toLowerCase()
-  );
+  const entry = Object.entries(headers ?? {}).find(([candidate]) => candidate.toLowerCase() === name.toLowerCase());
   return entry?.[1] ?? void 0;
 }
 function hasHeader(headers, name) {
@@ -3051,9 +2958,7 @@ async function resolveCodexResetAuth(ctx, salt = AUTH_FINGERPRINT_SALT, credenti
     apiKey: resolvedAccess,
     headers,
     fingerprint: fingerprintResolvedAuth({ headers }, salt),
-    secrets: [
-      .../* @__PURE__ */ new Set([...auth.secrets, storedAccess, resolvedAccess, authorization, accountId])
-    ],
+    secrets: [.../* @__PURE__ */ new Set([...auth.secrets, storedAccess, resolvedAccess, authorization, accountId])],
     model: auth.model
   };
 }
@@ -3102,9 +3007,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(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));
+  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) {
     options.push(genericCodexResetOption());
   }
@@ -3219,9 +3122,7 @@ function bearerToken2(authorization) {
   return /^Bearer\s+(.+)$/iu.exec(authorization ?? "")?.[1];
 }
 function headerValue2(headers, name) {
-  return Object.entries(headers).find(
-    ([candidate]) => candidate.toLowerCase() === name.toLowerCase()
-  )?.[1];
+  return Object.entries(headers).find(([candidate]) => candidate.toLowerCase() === name.toLowerCase())?.[1];
 }
 
 // src/format.ts
@@ -3322,9 +3223,7 @@ function formatCodexReport(lines, report2) {
     if (metric2.id === "reset-credits") {
       lines.push(`${"Usage limit resets:".padEnd(VALUE_COLUMN)}${metric2.value} available`);
     } else if (metric2.id === "credits") {
-      lines.push(
-        `${"Credits:".padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`
-      );
+      lines.push(`${"Credits:".padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`);
     }
   }
 }
@@ -3346,9 +3245,7 @@ function formatDeepSeekStatusline(report2) {
   const availability = report2.metrics.find((metric2) => metric2.id === "api-availability");
   if (availability?.value !== "available") return "deepseek API unavailable";
   const totals = ["CNY", "USD"].flatMap((currency) => {
-    const metric2 = report2.metrics.find(
-      (candidate) => candidate.id === `${currency.toLowerCase()}-total`
-    );
+    const metric2 = report2.metrics.find((candidate) => candidate.id === `${currency.toLowerCase()}-total`);
     return metric2 ? [`${currency} ${metric2.value}`] : [];
   });
   return totals.length > 0 ? `deepseek ${totals.join(" \xB7 ")}` : "deepseek balance unavailable";
@@ -3412,9 +3309,7 @@ function formatGitHubCopilotStatusline(report2) {
   return `copilot ${kind === "premium" ? "" : `${kind} `}${quota.remaining}/${quota.limit} ${percentRemaining(quota)}%${overageSuffix}`;
 }
 function findGitHubCopilotQuota(report2) {
-  return report2.buckets.find(
-    (bucket) => ["ai-credits", "premium-requests", "chat-requests"].includes(bucket.id)
-  );
+  return report2.buckets.find((bucket) => ["ai-credits", "premium-requests", "chat-requests"].includes(bucket.id));
 }
 function compactGitHubCopilotQuotaKind(bucket) {
   if (bucket?.id === "ai-credits") return "credits";
@@ -3433,9 +3328,7 @@ function formatOpenRouterReport(lines, report2) {
     lines.push(`${`Key limit${period}:`.padEnd(VALUE_COLUMN)}${value}`);
   }
   for (const metric2 of report2.metrics) {
-    lines.push(
-      `${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`
-    );
+    lines.push(`${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`);
   }
 }
 function formatOpenCodeZenReport(lines, report2) {
@@ -3497,9 +3390,7 @@ function formatKimiCodingStatusline(report2) {
   for (const bucket of selected) {
     if (!bucket.limit || bucket.remaining === void 0) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
-    parts.push(
-      `${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`
-    );
+    parts.push(`${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`);
   }
   return parts.length > 1 ? parts.join(" ") : void 0;
 }
@@ -3557,9 +3448,7 @@ function formatMiniMaxStatusline(report2, model) {
 }
 function selectMiniMaxGroup(report2, model) {
   const groups = [
-    ...new Set(
-      report2.buckets.map((bucket) => bucket.groupId).filter((group) => group !== void 0)
-    )
+    ...new Set(report2.buckets.map((bucket) => bucket.groupId).filter((group) => group !== void 0))
   ];
   if (groups.length <= 1) return groups[0];
   if (model && model.provider !== report2.providerId) return void 0;
@@ -3575,9 +3464,7 @@ function selectMiniMaxGroup(report2, model) {
     );
     if (exact) return exact.group;
     const wildcard = candidates.find(
-      ({ patterns }) => patterns.some(
-        (pattern) => pattern.includes("*") && modelKeys.some((key) => wildcardKeyMatches(pattern, key))
-      )
+      ({ patterns }) => patterns.some((pattern) => pattern.includes("*") && modelKeys.some((key) => wildcardKeyMatches(pattern, key)))
     );
     if (wildcard) return wildcard.group;
   }
@@ -3608,9 +3495,7 @@ function formatZaiStatusline(report2) {
   for (const bucket of selected) {
     if (!bucket?.limit || bucket.remaining === void 0) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
-    parts.push(
-      `${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`
-    );
+    parts.push(`${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`);
   }
   return parts.length > 1 ? parts.join(" ") : void 0;
 }
@@ -3644,9 +3529,7 @@ function formatXaiReport(lines, report2) {
     lines.push(`${"On-demand usage:".padEnd(VALUE_COLUMN)}${value}`);
   }
   for (const metric2 of report2.metrics) {
-    lines.push(
-      `${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`
-    );
+    lines.push(`${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`);
   }
 }
 function formatZaiReport(lines, report2) {
@@ -3668,9 +3551,7 @@ function formatZaiReport(lines, report2) {
     lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${value}${reset}`);
   }
   for (const metric2 of report2.metrics) {
-    lines.push(
-      `${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`
-    );
+    lines.push(`${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`);
   }
 }
 function formatGenericReport(lines, report2) {
@@ -3680,9 +3561,7 @@ function formatGenericReport(lines, report2) {
     );
   }
   for (const metric2 of report2.metrics) {
-    lines.push(
-      `${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`
-    );
+    lines.push(`${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`);
   }
 }
 function formatCodexStatusline(report2, model, now = Date.now(), showResetCountdown = true) {
@@ -3690,9 +3569,7 @@ function formatCodexStatusline(report2, model, now = Date.now(), showResetCountd
   if (!group) return formatCodexCreditsStatus(report2);
   const buckets = report2.buckets.filter((bucket) => (bucket.groupId ?? bucket.id) === group);
   const labelBucket = buckets[0];
-  const parts = [
-    group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`
-  ];
+  const parts = [group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`];
   for (const bucket of buckets) {
     if (bucket.remaining === void 0) continue;
     const percent = `${clampPercent4(bucket.remaining).toFixed(0)}%`;
@@ -3722,9 +3599,7 @@ function selectCodexGroup(report2, model) {
   }
   const modelKeys = normalizedModelKeys(model);
   for (const group of groups) {
-    const bucket = report2.buckets.find(
-      (candidate) => (candidate.groupId ?? candidate.id) === group
-    );
+    const bucket = report2.buckets.find((candidate) => (candidate.groupId ?? candidate.id) === group);
     const keys = [group, bucket?.groupLabel, ...bucket?.modelKeys ?? []].map(normalizeKey).filter((key) => key !== void 0);
     if (keys.some((key) => modelKeys.has(key))) return group;
   }
@@ -3787,20 +3662,15 @@ function formatWindowLabel(minutes, fallback, compact) {
   return `${minutes}m`;
 }
 function formatResetCountdown(resetsAt, now) {
-  if (resetsAt === void 0 || !Number.isFinite(resetsAt) || !Number.isFinite(now))
-    return void 0;
+  if (resetsAt === void 0 || !Number.isFinite(resetsAt) || !Number.isFinite(now)) return void 0;
   const totalMinutes = Math.max(0, Math.ceil((resetsAt * 1e3 - now) / 6e4));
   const days = Math.floor(totalMinutes / 1440);
   const hours = Math.floor(totalMinutes % 1440 / 60);
   const minutes = totalMinutes % 60;
   if (days > 0) {
-    return [
-      `${String(days)}d`,
-      hours > 0 ? `${String(hours)}h` : minutes > 0 ? `${String(minutes)}m` : ""
-    ].filter(Boolean).join("");
+    return [`${String(days)}d`, hours > 0 ? `${String(hours)}h` : minutes > 0 ? `${String(minutes)}m` : ""].filter(Boolean).join("");
   }
-  if (hours > 0)
-    return [`${String(hours)}h`, minutes > 0 ? `${String(minutes)}m` : ""].filter(Boolean).join("");
+  if (hours > 0) return [`${String(hours)}h`, minutes > 0 ? `${String(minutes)}m` : ""].filter(Boolean).join("");
   return `${String(minutes)}m`;
 }
 function formatMetricValue(value, unit) {
@@ -3938,24 +3808,13 @@ function createUsageSettingsRuntime(options = {}) {
       return structuredClone(state);
     }),
     updateSelectedTarget: (providerId, targetId, signal, checkPublishedSelection) => enqueue(async () => {
-      const transaction = await saveUsageTargetSelection(
-        path,
-        providerId,
-        targetId,
-        operations,
-        signal
-      );
+      const transaction = await saveUsageTargetSelection(path, providerId, targetId, operations, signal);
       try {
         await checkPublishedSelection?.();
         throwIfAborted(signal);
       } catch (error) {
         try {
-          await restoreUsageSettingsState(
-            path,
-            transaction.saved,
-            transaction.previous,
-            operations
-          );
+          await restoreUsageSettingsState(path, transaction.saved, transaction.previous, operations);
           state = transaction.previous;
         } catch (rollbackError) {
           state = await loadUsageSettings(path);
@@ -4133,10 +3992,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
         return;
       }
       if (!ctx.hasUI) throw new Error("/fast requires TUI or RPC mode.");
-      const availability = codexFastAvailability(
-        ctx.model,
-        settingsRuntime.get().settings.codexFastMode
-      );
+      const availability = codexFastAvailability(ctx.model, settingsRuntime.get().settings.codexFastMode);
       if (availability.kind === "not-codex") {
         ctx.ui.notify("/fast is available only for the active OpenAI Codex model.", "warning");
         return;
@@ -4146,10 +4002,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
         return;
       }
       if (settingsRuntime.get().kind === "invalid") {
-        ctx.ui.notify(
-          "pi-usage.json is invalid; repair it and run /reload before changing Fast mode.",
-          "error"
-        );
+        ctx.ui.notify("pi-usage.json is invalid; repair it and run /reload before changing Fast mode.", "error");
         return;
       }
       await toggle(ctx, !availability.enabled);
@@ -4169,10 +4022,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
       } catch (error) {
         if (sessionController.signal.aborted || ownerGeneration !== generation) return;
         if (ctx.hasUI) {
-          ctx.ui.notify(
-            `Could not load pi-usage.json; using defaults. ${errorMessage(error)}`,
-            "warning"
-          );
+          ctx.ui.notify(`Could not load pi-usage.json; using defaults. ${errorMessage(error)}`, "warning");
         }
         return;
       }
@@ -4180,10 +4030,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
         return;
       }
       if (ctx.hasUI && state.kind === "invalid") {
-        ctx.ui.notify(
-          `Invalid pi-usage.json; using defaults without overwriting it. ${state.issue}`,
-          "warning"
-        );
+        ctx.ui.notify(`Invalid pi-usage.json; using defaults without overwriting it. ${state.issue}`, "warning");
       }
       refreshStatus(ctx);
     })();
@@ -4192,11 +4039,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
     pi.on("session_start", async (_event, ctx) => prepareSession(ctx));
   }
   pi.on("before_provider_request", (event, ctx) => {
-    const rewritten = rewriteCodexFastPayload(
-      event.payload,
-      ctx.model,
-      settingsRuntime.get().settings.codexFastMode
-    );
+    const rewritten = rewriteCodexFastPayload(event.payload, ctx.model, settingsRuntime.get().settings.codexFastMode);
     const key = activeRequestKey(ctx);
     if (key && ctx.model) {
       pendingFastRequests.set(key, {
@@ -4209,11 +4052,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
   pi.on("message_end", (event, ctx) => {
     const request = consumeFastRequest(ctx, event.message, pendingFastRequests);
     if (request === NO_FAST_REQUEST) return void 0;
-    const message = correctCodexFastMessageCost(
-      event.message,
-      request.model,
-      request.fastRequested
-    );
+    const message = correctCodexFastMessageCost(event.message, request.model, request.fastRequested);
     return message ? { message } : void 0;
   });
   pi.on("session_shutdown", async () => {
@@ -4228,10 +4067,7 @@ function registerCodexFastMode(pi, settingsRuntime, refreshStatus, options = {})
       return codexFastAvailability(model, settingsRuntime.get().settings.codexFastMode);
     },
     decorateStatus(model, status) {
-      return codexFastStatusLabel(
-        status,
-        codexFastIsEffective(model, settingsRuntime.get().settings.codexFastMode)
-      );
+      return codexFastStatusLabel(status, codexFastIsEffective(model, settingsRuntime.get().settings.codexFastMode));
     },
     toggle
   };
@@ -4293,36 +4129,16 @@ function isTimeoutError(error) {
 
 // src/usage-settings-ui.ts
 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 { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
+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();
@@ -4347,9 +4163,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;
@@ -4396,20 +4210,25 @@ 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();
@@ -4518,12 +4337,7 @@ function usageExtension(pi, dependencies = {}) {
     }
     const showCodexResetCountdown = outcome.state.report.providerId === "openai-codex" && settingsRuntime.get().settings.codexStatusResetCountdown;
     const now = Date.now();
-    const rawValue = formatUsageStatusline(
-      outcome.state.report,
-      model,
-      now,
-      showCodexResetCountdown
-    );
+    const rawValue = formatUsageStatusline(outcome.state.report, model, now, showCodexResetCountdown);
     const value = rawValue ? fastRuntime.decorateStatus(model, rawValue) : void 0;
     if (!safeSetStatus(ctx, value)) return;
     if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
@@ -4748,15 +4562,7 @@ function usageExtension(pi, dependencies = {}) {
         if (queryId !== void 0 && latestQueries.get(failureKey) === queryId) {
           latestQueries.delete(failureKey);
         }
-        return queryAdapterState(
-          ctx,
-          adapter,
-          displayState,
-          true,
-          signal,
-          authRetry + 1,
-          deadlineAt
-        );
+        return queryAdapterState(ctx, adapter, displayState, true, signal, authRetry + 1, deadlineAt);
       }
       const message = errorMessage(error);
       const now = Date.now();
@@ -4765,12 +4571,7 @@ function usageExtension(pi, dependencies = {}) {
       }
       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 },
-          MAX_ACCOUNT_STATES
-        );
+        setBoundedMap(failureBackoff, failureKey, { until: now + FAILURE_BACKOFF_MS, message }, MAX_ACCOUNT_STATES);
       }
       return {
         state: {
@@ -4812,13 +4613,7 @@ function usageExtension(pi, dependencies = {}) {
         throw abortError();
       }
     };
-    const choices = await listUsageTargets(
-      adapter,
-      auth,
-      signal,
-      Math.max(1, deadlineAt - Date.now()),
-      guard
-    );
+    const choices = await listUsageTargets(adapter, auth, signal, Math.max(1, deadlineAt - Date.now()), guard);
     return { choices, fingerprint: auth.fingerprint };
   };
   const queryCurrentState = async (ctx, model, force, signal) => {
@@ -4970,12 +4765,7 @@ function usageExtension(pi, dependencies = {}) {
     const controller = new AbortController();
     activeControllers.add(controller);
     try {
-      let stableCurrent = await queryStableCurrent(
-        ctx,
-        false,
-        controller,
-        "Checking current usage\u2026"
-      );
+      let stableCurrent = await queryStableCurrent(ctx, false, controller, "Checking current usage\u2026");
       if (!stableCurrent) return;
       publishStableCurrent(ctx, stableCurrent);
       let current = stableCurrent.outcome;
@@ -5217,12 +5007,7 @@ function usageExtension(pi, dependencies = {}) {
                 (signal) => queryAdapterState(ctx, adapter, "configured", true, signal)
               );
               if (!outcome) return { kind: "stay" };
-              const revalidated = await queryStableCurrent(
-                ctx,
-                false,
-                controller,
-                "Revalidating current usage\u2026"
-              );
+              const revalidated = await queryStableCurrent(ctx, false, controller, "Revalidating current usage\u2026");
               if (!revalidated) return { kind: "stay" };
               stableCurrent = revalidated;
               current = revalidated.outcome;
@@ -5251,12 +5036,7 @@ function usageExtension(pi, dependencies = {}) {
               }
             );
             fastState = settingsRuntime.get();
-            const revalidated = await queryStableCurrent(
-              ctx,
-              false,
-              controller,
-              "Applying usage settings\u2026"
-            );
+            const revalidated = await queryStableCurrent(ctx, false, controller, "Applying usage settings\u2026");
             if (!revalidated) return { kind: "stay" };
             stableCurrent = revalidated;
             current = revalidated.outcome;
@@ -5308,9 +5088,7 @@ function usageExtension(pi, dependencies = {}) {
                     "revalidating current Codex reset authentication"
                   );
                   if (modelIdentity(ctx.model) !== expectedModel || revalidated.fingerprint !== auth.fingerprint) {
-                    throw new Error(
-                      "The active Codex model or account changed while loading usage limit resets."
-                    );
+                    throw new Error("The active Codex model or account changed while loading usage limit resets.");
                   }
                   return { availability, auth, expectedModel };
                 }
@@ -5367,28 +5145,14 @@ function usageExtension(pi, dependencies = {}) {
                     "revalidating current Codex reset authentication"
                   );
                   if (modelIdentity(ctx.model) !== expectedModel || auth.fingerprint !== expectedFingerprint) {
-                    throw new Error(
-                      "The active Codex model or account changed; the reset was not used."
-                    );
+                    throw new Error("The active Codex model or account changed; the reset was not used.");
                   }
-                  const outcome = await consumeCodexResetCredit(
-                    auth,
-                    option,
-                    attemptId,
-                    signal,
-                    DEFAULT_TIMEOUT_MS
-                  );
+                  const outcome = await consumeCodexResetCredit(auth, option, attemptId, signal, DEFAULT_TIMEOUT_MS);
                   invalidateProviderState("openai-codex");
                   const model = ctx.model;
                   if (modelIdentity(model) !== expectedModel) return { outcome };
                   const refreshed = await queryCurrentState(ctx, model, true, signal);
-                  const stable = await outcomeStillCurrent(
-                    ctx,
-                    model,
-                    menuGeneration,
-                    refreshed,
-                    signal
-                  );
+                  const stable = await outcomeStillCurrent(ctx, model, menuGeneration, refreshed, signal);
                   return stable ? { outcome, refreshed, model } : { outcome };
                 },
                 false
@@ -5418,12 +5182,7 @@ function usageExtension(pi, dependencies = {}) {
             return { kind: "to", screen: "reset-picker" };
           },
           refresh: async () => {
-            const refreshed = await queryStableCurrent(
-              ctx,
-              true,
-              controller,
-              "Refreshing current usage\u2026"
-            );
+            const refreshed = await queryStableCurrent(ctx, true, controller, "Refreshing current usage\u2026");
             if (!refreshed) return { kind: "stay" };
             stableCurrent = refreshed;
             publishStableCurrent(ctx, refreshed);
@@ -5432,9 +5191,7 @@ function usageExtension(pi, dependencies = {}) {
             return { kind: "stay" };
           },
           another: async () => {
-            const others = configuredAdapters(ctx).filter(
-              (adapter) => adapter.id !== ctx.model?.provider
-            );
+            const others = configuredAdapters(ctx).filter((adapter) => adapter.id !== ctx.model?.provider);
             if (others.length === 0) {
               ctx.ui.notify("No other supported provider has configured runtime auth.", "info");
               return { kind: "stay" };
@@ -5465,12 +5222,7 @@ function usageExtension(pi, dependencies = {}) {
               );
               if (!outcome) return { kind: "back" };
             }
-            const revalidated = await queryStableCurrent(
-              ctx,
-              false,
-              controller,
-              "Revalidating current usage\u2026"
-            );
+            const revalidated = await queryStableCurrent(ctx, false, controller, "Revalidating current usage\u2026");
             if (!revalidated) return { kind: "back" };
             stableCurrent = revalidated;
             current = revalidated.outcome;
@@ -5513,12 +5265,7 @@ function usageExtension(pi, dependencies = {}) {
                 message: errorMessage(result.reason)
               };
             });
-            const revalidated = await queryStableCurrent(
-              ctx,
-              false,
-              controller,
-              "Revalidating current usage\u2026"
-            );
+            const revalidated = await queryStableCurrent(ctx, false, controller, "Revalidating current usage\u2026");
             if (!revalidated) return { kind: "stay" };
             stableCurrent = revalidated;
             current = revalidated.outcome;
@@ -5544,10 +5291,7 @@ function usageExtension(pi, dependencies = {}) {
     description: "Show usage for the current runtime account",
     handler: async (args, ctx) => {
       if (args.trim()) {
-        ctx.ui.notify(
-          "/usage does not accept arguments; choose an action from its menu.",
-          "warning"
-        );
+        ctx.ui.notify("/usage does not accept arguments; choose an action from its menu.", "warning");
         return;
       }
       try {
@@ -5597,12 +5341,9 @@ function usageExtension(pi, dependencies = {}) {
     activeCurrentIdentity = void 0;
     safeSetStatus(ctx, void 0);
   });
-  fastRuntime = registerCodexFastMode(
-    pi,
-    settingsRuntime,
-    (ctx) => startStatusRefresh(ctx, ctx.model, false),
-    { registerSessionStart: false }
-  );
+  fastRuntime = registerCodexFastMode(pi, settingsRuntime, (ctx) => startStatusRefresh(ctx, ctx.model, false), {
+    registerSessionStart: false
+  });
 }
 export {
   CODEX_FAST_MODEL_IDS,