@narumitw/pi-usage 0.64.3 → 0.65.0

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,
@@ -765,14 +766,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 +933,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 +952,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 +1131,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 +1467,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,
   });
 }