@narumitw/pi-usage 0.61.2 → 0.63.0

package/src/usage-settings-ui.ts

@@ -29,124 +29,126 @@ export async function showUsageSettings(
   }
   const { HorizontalRule, renderBoundedFrame } = await import("@narumitw/pi-tui-kit");
   if (parentSignal.aborted || !isCurrent()) return false;
-  return (
-    (await ctx.ui.custom<boolean>((tui, theme, _keybindings, done) => {
-      const localController = new AbortController();
-      const signal = AbortSignal.any([parentSignal, localController.signal]);
-      let changed = false;
-      let closing = false;
-      let saveQueue = Promise.resolve();
-      const state = settingsRuntime.get();
-      const items: SettingItem[] = [
-        {
-          id: "codexFastMode",
-          label: "Codex Fast mode",
-          description: "Use faster Codex routing at increased plan allowance consumption.",
-          currentValue: state.settings.codexFastMode ? ON : OFF,
-          values: [OFF, ON],
-        },
-        {
-          id: "codexStatusResetCountdown",
-          label: "Codex reset countdown",
-          description: "Show time remaining until each Codex usage limit resets.",
-          currentValue: state.settings.codexStatusResetCountdown ? ON : OFF,
-          values: [OFF, ON],
-        },
-        {
-          id: "codexStatusPercentage",
-          label: "Codex percentage",
-          description: "Show remaining or used Codex quota in the statusline.",
-          currentValue: settingValueLabel("codexStatusPercentage", state.settings.codexStatusPercentage),
-          values: [REMAINING, USED],
-        },
-      ];
-      const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
+  let changed = false;
+  return ctx.ui.custom<boolean>((tui, theme, _keybindings, done) => {
+    const localController = new AbortController();
+    const signal = AbortSignal.any([parentSignal, localController.signal]);
+    let closing = false;
+    let saveQueue = Promise.resolve();
+    const state = settingsRuntime.get();
+    const items: SettingItem[] = [
+      {
+        id: "codexFastMode",
+        label: "Codex Fast mode",
+        description: "Use faster Codex routing at increased plan allowance consumption.",
+        currentValue: state.settings.codexFastMode ? ON : OFF,
+        values: [OFF, ON],
+      },
+      {
+        id: "codexStatusResetCountdown",
+        label: "Codex reset countdown",
+        description: "Show time remaining until each Codex usage limit resets.",
+        currentValue: state.settings.codexStatusResetCountdown ? ON : OFF,
+        values: [OFF, ON],
+      },
+      {
+        id: "codexStatusPercentage",
+        label: "Codex percentage",
+        description: "Show remaining or used Codex quota in the statusline.",
+        currentValue: settingValueLabel("codexStatusPercentage", state.settings.codexStatusPercentage),
+        values: [REMAINING, USED],
+      },
+    ];
+    const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
 
-      let settingsList: SettingsList;
-      const cancel = () => {
-        if (closing) return;
-        closing = true;
-        localController.abort();
-        done(changed);
-      };
-      const queueUpdate = <Id extends UsageSettingId>(id: Id, requested: UsageSettings[Id], display: string) => {
-        saveQueue = saveQueue.then(async () => {
-          const previous = settingsRuntime.get().settings[id];
-          if (settingsRuntime.get().kind === "invalid") {
-            settingsList.updateValue(id, settingValueLabel(id, previous));
-            if (!signal.aborted && isCurrent()) {
-              ctx.ui.notify("Repair pi-usage.json and reload before changing settings.", "error");
-              tui.requestRender();
-            }
-            return;
-          }
-          try {
-            const patch: Partial<UsageSettings> = {};
-            patch[id] = requested;
-            await settingsRuntime.update(patch, signal);
-          } catch (error) {
-            if (signal.aborted || !isCurrent()) return;
-            settingsList.updateValue(id, settingValueLabel(id, previous));
-            ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
+    let settingsList: SettingsList;
+    const close = (result: boolean) => {
+      if (closing) return;
+      closing = true;
+      localController.abort();
+      done(result);
+    };
+    const cancel = () => close(changed);
+    const queueUpdate = <Id extends UsageSettingId>(id: Id, requested: UsageSettings[Id], display: string) => {
+      saveQueue = saveQueue.then(async () => {
+        if (signal.aborted || !isCurrent()) return;
+        const previous = settingsRuntime.get().settings[id];
+        if (settingsRuntime.get().kind === "invalid") {
+          settingsList.updateValue(id, settingValueLabel(id, previous));
+          if (!signal.aborted && isCurrent()) {
+            ctx.ui.notify("Repair pi-usage.json and reload before changing settings.", "error");
             tui.requestRender();
-            return;
-          }
-          if (previous !== requested) {
-            changed = true;
-            onApplied(id);
           }
+          return;
+        }
+        try {
+          const patch: Partial<UsageSettings> = {};
+          patch[id] = requested;
+          await settingsRuntime.update(patch, signal);
+        } catch (error) {
           if (signal.aborted || !isCurrent()) return;
-          settingsList.updateValue(id, display);
+          settingsList.updateValue(id, settingValueLabel(id, previous));
+          ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
           tui.requestRender();
-        });
-      };
-      settingsList = new SettingsList(
-        items,
-        items.length + 2,
-        getSettingsListTheme(),
-        (id, value) => {
-          if (closing || signal.aborted || !isCurrent()) return;
-          if (id === "codexStatusPercentage") {
-            queueUpdate(id, value === USED ? "used" : "remaining", value);
-          } else if (id === "codexFastMode" || id === "codexStatusResetCountdown") {
-            queueUpdate(id, value === ON, value);
-          }
-        },
-        cancel,
-      );
+          return;
+        }
+        // A rename can win a cancellation race. Apply owned lifecycle cleanup after a
+        // durable save, but let the owner guard its session before touching UI.
+        if (previous !== requested) {
+          changed = true;
+          onApplied(id);
+        }
+        if (signal.aborted || !isCurrent()) return;
+        settingsList.updateValue(id, display);
+        tui.requestRender();
+      });
+    };
+    settingsList = new SettingsList(
+      items,
+      items.length + 2,
+      getSettingsListTheme(),
+      (id, value) => {
+        if (closing || signal.aborted || !isCurrent()) return;
+        if (id === "codexStatusPercentage") {
+          queueUpdate(id, value === USED ? "used" : "remaining", value);
+        } else if (id === "codexFastMode" || id === "codexStatusResetCountdown") {
+          queueUpdate(id, value === ON, value);
+        }
+      },
+      cancel,
+    );
 
-      parentSignal.addEventListener("abort", cancel, { once: true });
-      return {
-        render(width: number) {
-          // Compatibility: Kit puts the title directly below the top rule and keeps compact
-          // rules when at least five rows fit; both replace the legacy wrapper layout.
-          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 [ruleLine = ""] = rule.render(width);
-          return renderBoundedFrame({
-            width,
-            maxRows: Math.max(1, terminalRows - 3),
-            rule: ruleLine,
-            title,
-            content,
-            priorityRows: focusedRow < 0 ? [] : [focusedRow],
-            focusedRow,
-          });
-        },
-        invalidate: () => settingsList.invalidate(),
-        handleInput(data: string) {
-          if (closing) return;
-          if (matchesKey(data, Key.ctrl("c"))) cancel();
-          else settingsList.handleInput(data);
-          tui.requestRender();
-        },
-        dispose() {
-          localController.abort();
-          parentSignal.removeEventListener("abort", cancel);
-        },
-      };
-    })) ?? false
-  );
+    parentSignal.addEventListener("abort", cancel, { once: true });
+    return {
+      render(width: number) {
+        // Compatibility: Kit puts the title directly below the top rule and keeps compact
+        // rules when at least five rows fit; both replace the legacy wrapper layout.
+        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 [ruleLine = ""] = rule.render(width);
+        return renderBoundedFrame({
+          width,
+          maxRows: Math.max(1, terminalRows - 3),
+          rule: ruleLine,
+          title,
+          content,
+          priorityRows: focusedRow < 0 ? [] : [focusedRow],
+          focusedRow,
+        });
+      },
+      invalidate: () => settingsList.invalidate(),
+      handleInput(data: string) {
+        if (closing) return;
+        if (matchesKey(data, Key.ctrl("c"))) cancel();
+        else settingsList.handleInput(data);
+        tui.requestRender();
+      },
+      dispose() {
+        localController.abort();
+        parentSignal.removeEventListener("abort", cancel);
+      },
+    };
+  });
 }

package/src/usage.ts

@@ -22,7 +22,12 @@ import { abortError, awaitWithDeadline, errorMessage, runWithConcurrency, UsageC
 import { formatProviderStates, formatUsageStatusline } from "./format.js";
 import { createOAuthCredentialCandidateReader } from "./oauth-credential-source.js";
 import { UnsupportedOpenAIUsageAuthError } from "./providers/openai-chatgpt.js";
-import { adapterForProvider, isStaleExtensionContextError, queryProviderUsage, resolveUsageAuth } from "./query.js";
+import {
+  adapterForProvider,
+  isStaleExtensionContextError,
+  queryProviderUsage,
+  resolveUsageAuth as resolveRuntimeUsageAuth,
+} from "./query.js";
 import { createUsageSettingsRuntime, type UsageSettingsRuntime, type UsageSettingsState } from "./settings.js";
 import type {
   PiModel,
@@ -84,10 +89,12 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
   const credentialCandidates = createOAuthCredentialCandidateReader(pi, credentialReader);
   const createRedemptionId = dependencies.createRedemptionId ?? randomUUID;
   const settingsRuntime = dependencies.settingsRuntime ?? createUsageSettingsRuntime();
+  const resolveUsageAuth = resolveRuntimeUsageAuth;
   const cache = new UsageCache(CACHE_TTL_MS);
   const failureBackoff = new Map<string, { until: number; message: string }>();
   const latestQueries = new Map<string, number>();
   const activeControllers = new Set<AbortController>();
+  const nativeQueryControllers = new Set<AbortController>();
   let querySequence = 0;
   let activeCurrentIdentity: string | undefined;
   let sessionActive = false;
@@ -183,7 +190,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
     if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
     if (
       sessionActive &&
-      showCodexResetCountdown &&
+      (showCodexResetCountdown || outcome.state.report.source === "openai-chatgpt-companion") &&
       outcome.state.report.buckets.some(
         (bucket) => bucket.resetsAt !== undefined && Number.isFinite(bucket.resetsAt) && bucket.resetsAt * 1_000 > now,
       )
@@ -220,7 +227,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
     activeCurrentIdentity = nextIdentity;
   };
 
-  const queryAdapterState = async (
+  const queryAdapterStateInternal = async (
     ctx: ExtensionContext,
     adapter: UsageProviderAdapter,
     displayState: UsageDisplayState,
@@ -244,6 +251,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
       );
     } catch (error) {
       if (isStaleExtensionContextError(error) || isAbortError(error)) throw error;
+      if (adapter.id === "openai") invalidateProviderState(adapter.id);
       const authState =
         error instanceof UnsupportedOpenAIUsageAuthError
           ? "unsupported"
@@ -288,6 +296,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
         settingsRuntime.get().settings.selectedTargets[adapter.id] !== expectedTargetId);
     if (requiresRequestBoundaryGuard && requestContextChanged()) throw abortError();
     if (!auth) {
+      if (adapter.id === "openai") invalidateProviderState(adapter.id);
       if (displayState === "current") {
         transitionCurrentIdentity(`${adapter.id}:unavailable`, adapter.id);
       }
@@ -302,6 +311,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
         authState: "unavailable",
       };
     }
+    if (adapter.id === "openai" && !auth.openaiCompanion) invalidateProviderState(adapter.id);
     let retryableAuthChanged = false;
     const guard = async () => {
       if (signal.aborted || requestContextChanged()) throw abortError();
@@ -466,6 +476,25 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
     }
   };
 
+  const queryAdapterState = async (...args: Parameters<typeof queryAdapterStateInternal>): Promise<QueryOutcome> => {
+    const [ctx, adapter, displayState, force, signal, ...rest] = args;
+    if (adapter.id !== "openai") return queryAdapterStateInternal(...args);
+    const controller = new AbortController();
+    nativeQueryControllers.add(controller);
+    try {
+      return await queryAdapterStateInternal(
+        ctx,
+        adapter,
+        displayState,
+        force,
+        AbortSignal.any([signal, controller.signal]),
+        ...rest,
+      );
+    } finally {
+      nativeQueryControllers.delete(controller);
+    }
+  };
+
   const loadTargetChoices = async (ctx: ExtensionContext, adapter: UsageProviderAdapter, signal: AbortSignal) => {
     if (!adapter.targets) throw new Error("Provider does not support usage targets.");
     const expectedSessionGeneration = sessionGeneration;
@@ -686,7 +715,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
       const generation = statusGeneration;
       const outcome = await queryAdapterState(ctx, adapter, displayState, force, signal);
       if (signal.aborted) throw abortError();
-      if (!outcome.authState || (await outcomeStillCurrent(ctx, model, generation, outcome, signal))) return outcome;
+      if (await outcomeStillCurrent(ctx, model, generation, outcome, signal)) return outcome;
       force = false;
     }
     throw new Error("OpenAI runtime authentication kept changing; reopen /usage to retry.");
@@ -1253,6 +1282,17 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
             }
             const revalidated = await queryStableCurrent(ctx, false, controller, "Revalidating current usage…");
             if (!revalidated) return { kind: "back" };
+            // Current-provider revalidation can await unrelated work after the configured
+            // native report was checked. Refresh its identity at the publication boundary.
+            if (adapter.id === "openai") {
+              outcome = await runMenuOperation(
+                ctx,
+                "Revalidating ChatGPT companion usage…",
+                controller.signal,
+                (signal) => queryStableAdapterState(ctx, adapter, "configured", false, signal),
+              );
+              if (!outcome) return { kind: "back" };
+            }
             stableCurrent = revalidated;
             current = revalidated.outcome;
             visibleStates = [
@@ -1300,6 +1340,22 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
             });
             const revalidated = await queryStableCurrent(ctx, false, controller, "Revalidating current usage…");
             if (!revalidated) return { kind: "stay" };
+            const nativeIndex = adapters.findIndex(
+              (adapter) => adapter.id === "openai" && adapter.id !== currentProviderId,
+            );
+            if (nativeIndex >= 0) {
+              const nativeAdapter = adapters[nativeIndex];
+              if (nativeAdapter) {
+                const native = await runMenuOperation(
+                  ctx,
+                  "Revalidating ChatGPT companion usage…",
+                  controller.signal,
+                  (signal) => queryStableAdapterState(ctx, nativeAdapter, "configured", false, signal),
+                );
+                if (!native) return { kind: "stay" };
+                queriedStates[nativeIndex] = native.state;
+              }
+            }
             stableCurrent = revalidated;
             current = revalidated.outcome;
             visibleStates = [
@@ -1356,6 +1412,8 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
     startStatusRefresh(ctx, ctx.model, false);
   });
   pi.on("model_select", (event, ctx) => {
+    // Cancel read-only native queries, not confirmed legacy reset mutations.
+    for (const controller of nativeQueryControllers) controller.abort();
     startStatusRefresh(ctx, event.model, false);
   });
   pi.on("turn_start", (_event, ctx) => {