@narumitw/pi-usage 0.64.3 → 0.65.1

package/src/format.ts

@@ -60,6 +60,36 @@ export function formatUsageStatusline(
   now = Date.now(),
   showCodexResetCountdown = true,
   codexStatusPercentage: CodexStatusPercentage = "remaining",
+): string | undefined {
+  return formatUsageStatuslineWithCountdown(report, model, now, showCodexResetCountdown, codexStatusPercentage).value;
+}
+
+interface StatusCountdown {
+  now: number;
+  active: boolean;
+}
+
+// Record new-provider eligibility while formatting the selected windows so repaint cannot drift from display policy.
+// Codex and ChatGPT companion keep their existing repaint policy in usage.ts.
+export function formatUsageStatuslineWithCountdown(
+  report: UsageReport,
+  model?: UsageModel,
+  now = Date.now(),
+  showCodexResetCountdown = true,
+  codexStatusPercentage: CodexStatusPercentage = "remaining",
+): { value: string | undefined; hasCountdown: boolean } {
+  const countdown: StatusCountdown = { now, active: false };
+  const value = formatStatusline(report, model, now, showCodexResetCountdown, codexStatusPercentage, countdown);
+  return { value, hasCountdown: countdown.active };
+}
+
+function formatStatusline(
+  report: UsageReport,
+  model: UsageModel | undefined,
+  now: number,
+  showCodexResetCountdown: boolean,
+  codexStatusPercentage: CodexStatusPercentage,
+  countdown: StatusCountdown,
 ): string | undefined {
   if (report.providerId === "openai" && report.source === "openai-chatgpt-auth") return "chatgpt usage: web only";
   if (report.source === "openai-chatgpt-companion") {
@@ -79,24 +109,24 @@ export function formatUsageStatusline(
   if (report.providerId === "deepseek") return formatDeepSeekStatusline(report);
   if (report.providerId === "fireworks") return formatFireworksStatusline(report);
   if (report.providerId === "vercel-ai-gateway") return formatVercelAIGatewayStatusline(report);
-  if (report.providerId === "github-copilot") return formatGitHubCopilotStatusline(report);
+  if (report.providerId === "github-copilot") return formatGitHubCopilotStatusline(report, countdown);
   if (report.providerId === "openrouter") {
     const limit = report.buckets.find((bucket) => bucket.id === "key-limit");
     if (limit?.remaining !== undefined) return `openrouter ${formatUsd(limit.remaining)} left`;
     const total = report.metrics.find((metric) => metric.id === "usage-total");
     if (typeof total?.value === "number") return `openrouter ${formatUsd(total.value)} used`;
   }
-  if (report.providerId === "opencode-go") return formatOpenCodeZenStatusline(report);
-  if (report.providerId === "command-code") return formatCommandCodeStatusline(report);
-  if (report.providerId === "kimi-coding") return formatKimiCodingStatusline(report);
+  if (report.providerId === "opencode-go") return formatOpenCodeZenStatusline(report, countdown);
+  if (report.providerId === "command-code") return formatCommandCodeStatusline(report, countdown);
+  if (report.providerId === "kimi-coding") return formatKimiCodingStatusline(report, countdown);
   if (report.providerId === "moonshotai" || report.providerId === "moonshotai-cn") {
     return formatMoonshotStatusline(report);
   }
   if (report.providerId === "minimax" || report.providerId === "minimax-cn") {
-    return formatMiniMaxStatusline(report, model);
+    return formatMiniMaxStatusline(report, countdown, model);
   }
   if (report.providerId === "zai" || report.providerId === "zai-coding-cn") {
-    return formatZaiStatusline(report);
+    return formatZaiStatusline(report, countdown);
   }
   return undefined;
 }
@@ -232,7 +262,7 @@ function formatGitHubCopilotReport(lines: string[], report: UsageReport): void {
   }
 }
 
-function formatGitHubCopilotStatusline(report: UsageReport): string {
+function formatGitHubCopilotStatusline(report: UsageReport, countdown: StatusCountdown): string {
   const quota = findGitHubCopilotQuota(report);
   const kind = compactGitHubCopilotQuotaKind(quota);
   if (!quota || quota.limit === undefined || quota.remaining === undefined) {
@@ -240,7 +270,8 @@ function formatGitHubCopilotStatusline(report: UsageReport): string {
   }
   const overage = report.metrics.find((metric) => metric.id === "overage-used");
   const overageSuffix = typeof overage?.value === "number" && overage.value > 0 ? ` +${overage.value} over` : "";
-  return `copilot ${kind === "premium" ? "" : `${kind} `}${quota.remaining}/${quota.limit} ${percentRemaining(quota)}%${overageSuffix}`;
+  const reset = formatQuotaCountdown(quota, countdown);
+  return `copilot ${kind === "premium" ? "" : `${kind} `}${quota.remaining}/${quota.limit} ${percentRemaining(quota)}%${overageSuffix}${reset ? ` ↻ ${reset}` : ""}`;
 }
 
 function findGitHubCopilotQuota(report: UsageReport): UsageBucket | undefined {
@@ -285,14 +316,14 @@ function formatOpenCodeZenReport(lines: string[], report: UsageReport): void {
   }
 }
 
-function formatOpenCodeZenStatusline(report: UsageReport): string | undefined {
-  const parts = ["zen"];
+function formatOpenCodeZenStatusline(report: UsageReport, countdown: StatusCountdown): string | undefined {
+  const parts: string[] = [];
   for (const bucket of report.buckets) {
     if (bucket.used === undefined) continue;
     const compact = bucket.id === "rolling" ? "r" : bucket.id === "weekly" ? "w" : "m";
-    parts.push(`${clampPercent(bucket.used).toFixed(0)}% ${compact}`);
+    parts.push(formatQuotaWindow(bucket, `${clampPercent(bucket.used).toFixed(0)}%`, compact, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : undefined;
+  return parts.length > 0 ? `zen ${parts.join(" · ")}` : undefined;
 }
 
 function formatCommandCodeReport(lines: string[], report: UsageReport): void {
@@ -311,8 +342,8 @@ function formatCommandCodeReport(lines: string[], report: UsageReport): void {
   }
 }
 
-function formatCommandCodeStatusline(report: UsageReport): string | undefined {
-  const parts = ["cmd"];
+function formatCommandCodeStatusline(report: UsageReport, countdown: StatusCountdown): string | undefined {
+  const parts: string[] = [];
   for (const [id, label] of [
     ["five-hour", "5h"],
     ["weekly", "wk"],
@@ -320,9 +351,9 @@ function formatCommandCodeStatusline(report: UsageReport): string | undefined {
   ] as const) {
     const bucket = report.buckets.find((candidate) => candidate.id === id);
     if (bucket?.unit !== "usd" || bucket.limit === undefined || bucket.remaining === undefined) continue;
-    parts.push(`${percentRemaining(bucket)}% ${label}`);
+    parts.push(formatQuotaWindow(bucket, `${percentRemaining(bucket)}%`, label, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : undefined;
+  return parts.length > 0 ? `cmd ${parts.join(" · ")}` : undefined;
 }
 
 function formatKimiCodingReport(lines: string[], report: UsageReport): void {
@@ -363,7 +394,7 @@ function formatKimiCodingReport(lines: string[], report: UsageReport): void {
   }
 }
 
-function formatKimiCodingStatusline(report: UsageReport): string | undefined {
+function formatKimiCodingStatusline(report: UsageReport, countdown: StatusCountdown): string | undefined {
   const fiveHour = report.buckets.find((bucket) => bucket.id === "five-hour");
   const weekly = report.buckets.find((bucket) => bucket.id === "weekly");
   const monthly = report.buckets.find((bucket) => bucket.id === "monthly");
@@ -371,15 +402,15 @@ function formatKimiCodingStatusline(report: UsageReport): string | undefined {
   const selected = [subWindow, weekly, monthly].filter(
     (bucket, index, buckets): bucket is UsageBucket => bucket !== undefined && buckets.indexOf(bucket) === index,
   );
-  const parts = ["kimi"];
+  const parts: string[] = [];
   for (const bucket of selected) {
     if (bucket.remaining === undefined || (bucket.unit !== "percent" && !bucket.limit)) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
     const window = bucket.id === "monthly" ? "mo" : formatWindowLabel(bucket.windowMinutes, fallback, true);
     const remaining = bucket.unit === "percent" ? Math.round(clampPercent(bucket.remaining)) : percentRemaining(bucket);
-    parts.push(`${remaining}% ${window}`);
+    parts.push(formatQuotaWindow(bucket, `${remaining}%`, window, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : undefined;
+  return parts.length > 0 ? `kimi ${parts.join(" · ")}` : undefined;
 }
 
 function formatMoonshotReport(lines: string[], report: UsageReport): void {
@@ -418,7 +449,11 @@ function formatMiniMaxReport(lines: string[], report: UsageReport): void {
   }
 }
 
-function formatMiniMaxStatusline(report: UsageReport, model?: UsageModel): string | undefined {
+function formatMiniMaxStatusline(
+  report: UsageReport,
+  countdown: StatusCountdown,
+  model?: UsageModel,
+): string | undefined {
   const prefix = report.providerId === "minimax-cn" ? "minimax cn" : "minimax";
   if (report.source === "minimax-account-balance") {
     const available = report.metrics.find((metric) => metric.id === "available-balance");
@@ -427,22 +462,22 @@ function formatMiniMaxStatusline(report: UsageReport, model?: UsageModel): strin
   const selectedGroup = selectMiniMaxGroup(report, model);
   if (!selectedGroup) return undefined;
   const selected = report.buckets.filter((bucket) => bucket.groupId === selectedGroup);
-  const parts = [prefix];
+  const parts: string[] = [];
   for (const bucket of selected) {
     const fallback = bucket.id.endsWith(":weekly") ? "weekly" : "5h";
     const window = formatWindowLabel(bucket.windowMinutes, fallback, true);
     if (bucket.period === "unlimited") {
-      parts.push(`unlimited ${window}`);
+      parts.push(`${window}:unlimited`);
       continue;
     }
     if (bucket.unit === "percent" && bucket.remaining !== undefined) {
-      parts.push(`${bucket.remaining}% ${window}`);
+      parts.push(formatQuotaWindow(bucket, `${bucket.remaining}%`, window, countdown));
       continue;
     }
     if (bucket.limit === undefined || bucket.remaining === undefined) continue;
-    parts.push(`${percentRemaining(bucket)}% ${window}`);
+    parts.push(formatQuotaWindow(bucket, `${percentRemaining(bucket)}%`, window, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : undefined;
+  return parts.length > 0 ? `${prefix} ${parts.join(" · ")}` : undefined;
 }
 
 function selectMiniMaxGroup(report: UsageReport, model?: UsageModel): string | undefined {
@@ -493,18 +528,25 @@ function wildcardKeyMatches(pattern: string, value: string): boolean {
   return pattern.endsWith("*") || (last !== undefined && value.endsWith(last));
 }
 
-function formatZaiStatusline(report: UsageReport): string | undefined {
+function formatZaiStatusline(report: UsageReport, countdown: StatusCountdown): string | undefined {
   const selected = [
     report.buckets.find((bucket) => bucket.id === "five-hour"),
     report.buckets.find((bucket) => bucket.id === "weekly"),
   ];
-  const parts = ["zai"];
+  const parts: string[] = [];
   for (const bucket of selected) {
     if (!bucket?.limit || bucket.remaining === undefined) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
-    parts.push(`${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`);
+    parts.push(
+      formatQuotaWindow(
+        bucket,
+        `${percentRemaining(bucket)}%`,
+        formatWindowLabel(bucket.windowMinutes, fallback, true),
+        countdown,
+      ),
+    );
   }
-  return parts.length > 1 ? parts.join(" ") : undefined;
+  return parts.length > 0 ? `zai ${parts.join(" · ")}` : undefined;
 }
 
 function formatCurrencyMetric(metric: UsageReport["metrics"][number]): string {
@@ -604,7 +646,8 @@ function formatCodexStatusline(
   if (!group) return formatCodexCreditsStatus(report);
   const buckets = report.buckets.filter((bucket) => (bucket.groupId ?? bucket.id) === group);
   const labelBucket = buckets[0];
-  const parts = [group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`];
+  const prefix = group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`;
+  const parts: string[] = [];
   for (const bucket of buckets) {
     if (bucket.remaining === undefined) continue;
     const displayedPercentage = percentage === "used" ? (bucket.used ?? 100 - bucket.remaining) : bucket.remaining;
@@ -612,13 +655,13 @@ function formatCodexStatusline(
     const fallback = bucket.id.endsWith(":secondary") ? "weekly" : "5h";
     const window = formatWindowLabel(bucket.windowMinutes, fallback, true);
     if (!showResetCountdown) {
-      parts.push(`${percent} ${window}`);
+      parts.push(`${window}:${percent}`);
       continue;
     }
     const reset = formatResetCountdown(bucket.resetsAt, now);
-    parts.push(`${percent} ${reset ? `↻ ${reset}` : window}`);
+    parts.push(reset ? `${percent} ↻ ${reset}` : `${window}:${percent}`);
   }
-  return parts.length > 1 ? parts.join(" ") : formatCodexCreditsStatus(report);
+  return parts.length > 0 ? `${prefix} ${parts.join(" · ")}` : formatCodexCreditsStatus(report);
 }
 
 function formatCodexCreditsStatus(report: UsageReport): string {
@@ -711,6 +754,25 @@ function formatWindowLabel(minutes: number | undefined, fallback: "5h" | "weekly
   return `${minutes}m`;
 }
 
+function formatQuotaWindow(bucket: UsageBucket, percent: string, window: string, countdown: StatusCountdown): string {
+  const reset = formatQuotaCountdown(bucket, countdown);
+  return reset ? `${percent} ↻ ${reset}` : `${window}:${percent}`;
+}
+
+function formatQuotaCountdown(bucket: UsageBucket, countdown: StatusCountdown): string | undefined {
+  if (
+    bucket.period === "unlimited" ||
+    bucket.resetsAt === undefined ||
+    !Number.isFinite(bucket.resetsAt * 1_000) ||
+    !Number.isFinite(countdown.now) ||
+    bucket.resetsAt * 1_000 <= countdown.now
+  )
+    return undefined;
+  const reset = formatResetCountdown(bucket.resetsAt, countdown.now);
+  if (reset !== undefined) countdown.active = true;
+  return reset;
+}
+
 function formatResetCountdown(resetsAt: number | undefined, now: number): string | undefined {
   if (resetsAt === undefined || !Number.isFinite(resetsAt) || !Number.isFinite(now)) return undefined;
   const totalMinutes = Math.max(0, Math.ceil((resetsAt * 1_000 - now) / 60_000));

package/src/index.ts

@@ -1,5 +1,5 @@
+export type { CodexFastAvailability, CodexFastCapability } from "./codex-fast.js";
 export {
-  CODEX_FAST_MODEL_IDS,
   CODEX_FAST_SERVICE_TIER,
   CODEX_STANDARD_SERVICE_TIER,
   codexFastAvailability,
@@ -7,7 +7,9 @@ export {
   codexFastRequestTier,
   codexFastStatusLabel,
   correctCodexFastMessageCost,
+  isOfficialCodexModel,
   rewriteCodexFastPayload,
+  UNKNOWN_CODEX_FAST_CAPABILITY,
 } from "./codex-fast.js";
 export type {
   CodexResetAvailability,

package/src/query.ts

@@ -679,6 +679,7 @@ export async function fetchProviderJson(
     body?: Record<string, unknown>;
     redirect?: RequestRedirect;
     userAgent?: boolean;
+    maxSuccessBodyBytes?: number;
     responseError?: (status: number, text: string) => string | undefined;
   } = {},
 ): Promise<Record<string, unknown>> {
@@ -710,7 +711,7 @@ export async function fetchProviderJson(
     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,
+      response.ok ? (request.maxSuccessBodyBytes ?? MAX_SUCCESS_BODY_BYTES) : MAX_ERROR_BODY_BYTES,
       !response.ok,
       description,
       controller.signal,

package/src/usage.ts

@@ -2,6 +2,7 @@
 // account cache, cancellation, and session lifecycle share one consistency boundary.
 import { randomUUID } from "node:crypto";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { isOfficialCodexModel } from "./codex-fast.js";
 import { FAST_USAGE_WARNING, registerCodexFastMode } from "./codex-fast-runtime.js";
 import {
   type CodexResetAvailability,
@@ -19,7 +20,7 @@ import {
   resolveCodexResetAuth,
 } from "./codex-resets.js";
 import { abortError, awaitWithDeadline, errorMessage, runWithConcurrency, UsageCache } from "./core.js";
-import { formatProviderStates, formatUsageStatusline } from "./format.js";
+import { formatProviderStates, formatUsageStatuslineWithCountdown } from "./format.js";
 import { createOAuthCredentialCandidateReader } from "./oauth-credential-source.js";
 import { UnsupportedOpenAIUsageAuthError } from "./providers/openai-chatgpt.js";
 import {
@@ -180,31 +181,33 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
       outcome.state.report.providerId === "openai-codex" && settings.codexStatusResetCountdown;
     const isCompanionReport = outcome.state.report.source === "openai-chatgpt-companion";
     const now = Date.now();
-    const rawValue = formatUsageStatusline(
+    const status = formatUsageStatuslineWithCountdown(
       outcome.state.report,
       model,
       now,
       showCodexResetCountdown,
       settings.codexStatusPercentage,
     );
-    const value = rawValue ? fastRuntime.decorateStatus(model, rawValue) : undefined;
+    const value = status.value ? fastRuntime.decorateStatus(model, status.value) : undefined;
     if (!safeSetStatus(ctx, value)) return;
     if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
     if (
       sessionActive &&
-      (showCodexResetCountdown || isCompanionReport) &&
-      outcome.state.report.buckets.some(
-        (bucket) =>
-          (!isCompanionReport || bucket.groupId === "chatgpt-plan") &&
-          bucket.resetsAt !== undefined &&
-          Number.isFinite(bucket.resetsAt) &&
-          bucket.resetsAt * 1_000 > now,
-      )
+      (status.hasCountdown ||
+        ((showCodexResetCountdown || isCompanionReport) &&
+          outcome.state.report.buckets.some(
+            (bucket) =>
+              (!isCompanionReport || bucket.groupId === "chatgpt-plan") &&
+              bucket.resetsAt !== undefined &&
+              Number.isFinite(bucket.resetsAt) &&
+              bucket.resetsAt * 1_000 > now,
+          )))
     ) {
       const generation = statusGeneration;
       statusCountdownTimer = setTimeout(() => {
-        statusCountdownTimer = undefined;
+        // A queued obsolete callback must not detach its successor's owned timer.
         if (!sessionActive || generation !== statusGeneration) return;
+        statusCountdownTimer = undefined;
         publishStatus(ctx, outcome, model, false);
       }, STATUS_COUNTDOWN_REFRESH_MS);
       statusCountdownTimer.unref?.();
@@ -765,14 +768,27 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
 
   const showMenu = async (ctx: ExtensionCommandContext): Promise<void> => {
     if (!ctx.hasUI) throw new Error("/usage requires TUI or RPC mode.");
-    statusGeneration += 1;
-    const menuGeneration = statusGeneration;
-    statusController?.abort();
-    statusController = undefined;
-    clearStatusTimers();
     const controller = new AbortController();
     activeControllers.add(controller);
     try {
+      if (isOfficialCodexModel(ctx.model)) {
+        const refreshed = await runMenuOperation(
+          ctx,
+          "Checking Codex Fast capability…",
+          controller.signal,
+          async (signal) => {
+            await fastRuntime.refreshCapabilities(ctx, signal);
+            return true;
+          },
+        );
+        if (!refreshed || controller.signal.aborted) return;
+      }
+      // Capability updates can refresh status; take menu ownership after discovery.
+      statusGeneration += 1;
+      const menuGeneration = statusGeneration;
+      statusController?.abort();
+      statusController = undefined;
+      clearStatusTimers();
       let stableCurrent = await queryStableCurrent(ctx, false, controller, "Checking current usage…");
       if (!stableCurrent) return;
       publishStableCurrent(ctx, stableCurrent);
@@ -919,7 +935,9 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
                 ? [`Fast mode: ${fastAvailability.enabled ? "On" : "Off"}`, FAST_USAGE_WARNING]
                 : fastAvailability.kind === "unavailable"
                   ? [`Fast mode: Unavailable · ${fastAvailability.reason}`]
-                  : [];
+                  : fastAvailability.kind === "unknown"
+                    ? [`Fast mode: Unknown · ${fastAvailability.reason}`]
+                    : [];
             return {
               kind: "actions",
               title: "Provider usage",
@@ -936,11 +954,12 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
                       },
                     ]
                   : []),
-                ...(fastAvailability.kind === "available"
+                ...(fastAvailability.kind === "available" ||
+                (fastState.settings.codexFastMode && isOfficialCodexModel(ctx.model))
                   ? [
                       {
                         id: "toggle-fast",
-                        label: fastAvailability.enabled ? "Turn Fast mode off" : "Turn Fast mode on",
+                        label: fastState.settings.codexFastMode ? "Turn Fast mode off" : "Turn Fast mode on",
                         description:
                           fastState.kind === "invalid"
                             ? "Repair pi-usage.json and reload before changing Fast mode."
@@ -1114,10 +1133,11 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
           },
           "toggle-fast": async () => {
             const availability = fastRuntime.availability(ctx.model);
-            if (availability.kind !== "available" || fastState.kind === "invalid") {
+            const enabled = settingsRuntime.get().settings.codexFastMode;
+            if ((availability.kind !== "available" && !enabled) || fastState.kind === "invalid") {
               return { kind: "rejected" };
             }
-            const changed = await fastRuntime.toggle(ctx, !availability.enabled, controller.signal);
+            const changed = await fastRuntime.toggle(ctx, !enabled, controller.signal);
             if (!changed) return { kind: "rejected" };
             fastState = settingsRuntime.get();
             return { kind: "stay" };
@@ -1449,5 +1469,8 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
 
   fastRuntime = registerCodexFastMode(pi, settingsRuntime, (ctx) => startStatusRefresh(ctx, ctx.model, false), {
     registerSessionStart: false,
+    credentialReader,
+    candidateReader: credentialCandidates,
+    timeoutMs: DEFAULT_TIMEOUT_MS,
   });
 }