@narumitw/pi-usage 0.62.0 → 0.63.0

package/docs/providers.md

@@ -25,10 +25,10 @@ The README contains the capability overview and shared security requirements.
 ### OpenAI native ChatGPT OAuth
 
 - Provider ID: `openai`
-- Default semantics/source: verified native authentication through fresh Pi OAuth resolution and an exact complete credential match; no usage HTTP endpoint
-- Default display: **Connected (native OAuth)** and [ChatGPT usage settings](https://chatgpt.com/settings/usage)
-- Default statusline: `chatgpt usage: web only`
-- Opt-in source: experimental same-account Codex companion OAuth; distinct shared plan and app limits
+- Source: verified native OAuth plus automatic same-account Codex companion OAuth; distinct shared plan and app windows
+- Display: plan percentages and plan/app resets; app used/remaining percentages are hidden
+- Missing-companion fallback: **Connected (native OAuth)**, same-account login guidance, and [ChatGPT usage settings](https://chatgpt.com/settings/usage)
+- Fallback statusline: `chatgpt usage: web only`
 
 Use `/login openai` in a Pi runtime that supports native Sign in with ChatGPT, then select an official `https://api.openai.com` model.
 Authentication requires Pi's freshly resolved provider source to be `OAuth`, matching effective model and provider authorization, and a complete matching credential with `clientId` and the `chatgpt.tokens.use.direct` scope.
@@ -37,8 +37,8 @@ Stored OAuth alone and Pi's cached OAuth flag do not establish the active runtim
 Runtime/API-key overrides, model-level Authorization replacements or removals, and custom/proxy origins cannot inherit native subscription status.
 OpenAI API-key usage reporting remains unsupported.
 
-The default report verifies authentication, not the plan tier, allowance, remaining quota, or reset time.
-Default automatic refresh only revalidates auth; it does not poll a usage endpoint.
+Without companion credentials, the report verifies authentication, not the plan tier, allowance, remaining quota, or reset time.
+With valid companion credentials, queries and automatic refreshes read both companion endpoints; otherwise no usage request is made.
 The settings link is guidance, not an automatically opened browser or a promise that the browser is signed into Pi's account.
 Native tokens are never sent to `/backend-api/wham`, and opaque native metadata is not decoded as a legacy Codex account ID.
 Legacy Fast payload rewriting, pricing correction, and earned reset redemption do not apply to native `openai`.
@@ -46,11 +46,12 @@ Existing `openai-codex` behavior below is unchanged.
 
 The boundary is verified against Pi's [`openai-chatgpt.ts`](https://github.com/earendil-works/pi/blob/d86654abb8862e201933517d6f1fce9f88dd117f/packages/ai/src/auth/oauth/openai-chatgpt.ts) at `d86654abb8862e201933517d6f1fce9f88dd117f` and OpenAI's [models and inference](https://developers.openai.com/siwc/token-sharing-open-source/models-and-inference), [token reference](https://developers.openai.com/siwc/token-sharing-open-source/token-reference), and [UI/UX guidelines](https://developers.openai.com/siwc/ui-ux-guidelines).
 These contracts establish the public inference and authentication boundary, not a numerical usage API.
-Verification uses synthetic credentials with Pi's real auth resolver; live browser login and account-specific quota retrieval have not been verified.
+Deterministic verification uses synthetic credentials with Pi's real auth resolver. A user reported one plan weekly remaining percentage and reset time matching the web overview; browser login, app numerical agreement, and broader live coverage remain unverified.
 
-#### Experimental companion quotas
+#### Automatic companion quotas
 
-Follow the [opt-in setup](../README.md#experimental-chatgpt-companion-usage): `openaiCompanionUsage` defaults to `false` and requires a same-account/workspace `/login openai-codex`.
+Follow the [companion setup](../README.md#chatgpt-companion-usage): a same-account/workspace `/login openai-codex` is required.
+The former opt-in setting and confirmation are removed; stored `openaiCompanionUsage` values, including `false`, no longer disable requests and are preserved without rewriting on reads.
 Fresh companion OAuth must match a complete grant with its own account ID; custom origins, API-key overrides, conflicting grants, and effective Authorization overrides fail closed.
 Only the companion bearer and matching `ChatGPT-Account-Id` reach these fixed, redirect-rejecting GET routes:
 
@@ -63,11 +64,12 @@ Only plan primary/secondary windows are used; Codex model-specific limits are no
 Each window requires a finite 0–100 used percentage and positive whole-second duration; optional remaining percentages must agree within one percentage point, and reset timestamps must be valid nonnegative epoch seconds.
 `allowed_usage_percent` is **App allowance**, a cap on shared plan usage, not remaining quota.
 Plan/app windows and reset boundaries stay separate in reports and the statusline; Codex display preferences do not apply.
+App used/remaining values are validated internally but not displayed; app reset/window information and the separately labeled allowance cap remain visible.
 
-Disabled or missing-companion paths remain web-only without requests. Other enabled-mode failures invalidate numerical data and remain observable.
+Missing-companion paths remain web-only without requests. Other companion failures invalidate numerical data and remain observable.
 No native token, refresh token, app name, or account ID is rendered or persisted by this feature.
 An exact registration match is not independent identity proof; users must choose the same account/workspace for both logins.
-The endpoints are undocumented; live availability and numerical agreement remain unverified.
+The endpoints remain an experimental, undocumented source despite automatic querying. One user-reported plan weekly comparison matched the web; app numerical agreement and broader live availability remain unverified.
 Contract fixtures derive from [Specode's pinned implementation](https://github.com/specode/pi-subscription-usage/blob/1015f9f419dfef9ac27c9845ec2318394928fa38/src/providers/openai.ts) and [OpenAI's shared-plan/app-limit explanation](https://help.openai.com/en/articles/20001542-using-your-chatgpt-plan-in-other-apps-and-sites), not a public native quota API.
 
 ### OpenAI Codex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@narumitw/pi-usage",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "Pi extension that shows current-account usage and DeepSeek API balance for supported providers.",
   "type": "module",
   "license": "MIT",

package/src/format.ts

@@ -68,7 +68,9 @@ export function formatUsageStatusline(
           .filter((bucket) => bucket.groupId === group)
           .map((bucket) => {
             const reset = formatResetCountdown(bucket.resetsAt, now);
-            return `${bucket.remaining === undefined ? "unavailable" : `${bucket.remaining.toFixed(0)}%`} ${reset ? `↻ ${reset}` : formatWindowLabel(bucket.windowMinutes, "weekly", true)}`;
+            const window = reset ? `↻ ${reset}` : formatWindowLabel(bucket.windowMinutes, "weekly", true);
+            if (group === "chatgpt-app") return window;
+            return `${bucket.remaining === undefined ? "unavailable" : `${bucket.remaining.toFixed(0)}%`} ${window}`;
           });
         return `${group === "chatgpt-plan" ? "plan" : "app"} ${windows.join(" ")}`;
       })
@@ -540,9 +542,13 @@ function formatOpenAICompanionReport(lines: string[], report: UsageReport): void
   for (const group of ["chatgpt-plan", "chatgpt-app"]) {
     lines.push(group === "chatgpt-plan" ? "Plan limits:" : "App limits:");
     for (const bucket of report.buckets.filter((bucket) => bucket.groupId === group)) {
-      lines.push(
-        `${formatWindowLabel(bucket.windowMinutes, "weekly", false).padEnd(VALUE_COLUMN)}${formatPercentBucket(bucket)}`,
-      );
+      const value =
+        group === "chatgpt-app"
+          ? bucket.resetsAt === undefined
+            ? "Reset time unavailable"
+            : `resets ${formatReset(bucket.resetsAt)}`
+          : formatPercentBucket(bucket);
+      lines.push(`${formatWindowLabel(bucket.windowMinutes, "weekly", false).padEnd(VALUE_COLUMN)}${value}`);
     }
   }
   for (const metric of report.metrics)

package/src/openai-companion-auth.ts

@@ -6,7 +6,7 @@ import { adapterForProvider, resolveUsageAuth } from "./query.js";
 import type { ResolvedUsageAuth } from "./types.js";
 
 // A native app registration is routing metadata, not cryptographic same-account proof.
-// Keep this opt-in boundary separate from legacy Codex querying and reset mutation policy.
+// Keep this read-only boundary separate from legacy Codex querying and reset mutation policy.
 export async function resolveOpenAICompanionAuth(
   ctx: ExtensionContext,
   native: ResolvedUsageAuth,
@@ -16,9 +16,8 @@ export async function resolveOpenAICompanionAuth(
 ): Promise<ResolvedUsageAuth> {
   const unavailable = () => ({
     ...native,
-    openaiCompanionEnabled: true,
     fingerprint: fingerprintResolvedAuth(
-      { apiKey: JSON.stringify([native.fingerprint, native.openaiClientId, true, null]) },
+      { apiKey: JSON.stringify([native.fingerprint, native.openaiClientId, null]) },
       salt,
     ),
   });
@@ -72,10 +71,9 @@ export async function resolveOpenAICompanionAuth(
   const headers = { Authorization: `Bearer ${access}`, "ChatGPT-Account-Id": accountId };
   return {
     ...native,
-    openaiCompanionEnabled: true,
     openaiCompanion: { headers },
     fingerprint: fingerprintResolvedAuth(
-      { apiKey: JSON.stringify([native.fingerprint, native.openaiClientId, true, companion.fingerprint, headers]) },
+      { apiKey: JSON.stringify([native.fingerprint, native.openaiClientId, companion.fingerprint, headers]) },
       salt,
     ),
     secrets: [

package/src/providers/openai-chatgpt.ts

@@ -44,13 +44,9 @@ export const OPENAI_CHATGPT_ADAPTER: UsageProviderAdapter = {
       buckets: [],
       metrics: [{ id: "plan-auth", label: "ChatGPT plan authentication", value: "Connected (native OAuth)" }],
       notes: [
-        "Numerical usage and reset times are unavailable in pi-usage for native OpenAI OAuth.",
+        "Numerical usage requires a companion /login openai-codex with the same ChatGPT account/workspace; native inference stays on openai.",
         `Manage usage: ${CHATGPT_USAGE_SETTINGS_URL}`,
-        ...(auth.openaiCompanionEnabled
-          ? [
-              "Experimental companion usage requires /login openai-codex with the same ChatGPT account/workspace; native inference stays on openai.",
-            ]
-          : []),
+        "Companion usage uses undocumented ChatGPT endpoints; registration matching is not independent identity proof.",
         "Fast mode and earned reset redemption remain legacy openai-codex features.",
       ],
     };

package/src/query.ts

@@ -340,7 +340,8 @@ export async function resolveUsageAuth(
   salt: Uint8Array = AUTH_FINGERPRINT_SALT,
   credentialReader: StoredCredentialReader = readStoredCredential,
   candidateReader?: OAuthCredentialCandidateReader,
-  openaiCompanionUsage = false,
+  /** @deprecated Companion resolution is automatic; this argument is ignored. */
+  _openaiCompanionUsage?: boolean,
 ): Promise<ResolvedUsageAuth | undefined> {
   if (ctx.model?.provider === adapter.id && !hasOfficialOrigin(ctx.model, adapter.id)) {
     throw new Error(
@@ -441,7 +442,6 @@ export async function resolveUsageAuth(
     const native = finalize(
       resolveOpenAIChatGPTAuth(auth, providerResult.auth, providerResult.source, model, offered.candidates),
     );
-    if (!openaiCompanionUsage) return native;
     const { resolveOpenAICompanionAuth } = await import("./openai-companion-auth.js");
     return resolveOpenAICompanionAuth(ctx, native, salt, credentialReader, candidateReader);
   }

package/src/settings.ts

@@ -12,8 +12,6 @@ export const MAX_USAGE_SETTINGS_BYTES = 64 * 1024;
 export type CodexStatusPercentage = "remaining" | "used";
 
 export interface UsageSettings {
-  /** Omitted values preserve default-off compatibility for injected settings runtimes. */
-  openaiCompanionUsage?: boolean;
   codexFastMode: boolean;
   codexStatusResetCountdown: boolean;
   codexStatusPercentage: CodexStatusPercentage;
@@ -21,7 +19,6 @@ export interface UsageSettings {
 }
 
 export const DEFAULT_USAGE_SETTINGS: Readonly<UsageSettings> = Object.freeze({
-  openaiCompanionUsage: false,
   codexFastMode: false,
   codexStatusResetCountdown: true,
   codexStatusPercentage: "remaining",
@@ -67,7 +64,6 @@ export function usageSettingsPath(): string {
 
 export function normalizeUsageSettings(value: unknown): UsageSettings | undefined {
   if (!isRecord(value)) return undefined;
-  if (Object.hasOwn(value, "openaiCompanionUsage") && typeof value.openaiCompanionUsage !== "boolean") return undefined;
   if (Object.hasOwn(value, "codexFastMode") && typeof value.codexFastMode !== "boolean") {
     return undefined;
   }
@@ -91,7 +87,6 @@ export function normalizeUsageSettings(value: unknown): UsageSettings | undefine
     effectiveTargets.fireworks = value.fireworksAccountId;
   }
   return {
-    openaiCompanionUsage: value.openaiCompanionUsage === true,
     codexFastMode:
       typeof value.codexFastMode === "boolean" ? value.codexFastMode : DEFAULT_USAGE_SETTINGS.codexFastMode,
     codexStatusResetCountdown:

package/src/types.ts

@@ -50,7 +50,6 @@ export interface UsageReport {
 export interface ResolvedUsageAuth {
   /** Native registration metadata stays local; only companion headers reach ChatGPT. */
   openaiClientId?: string;
-  openaiCompanionEnabled?: boolean;
   openaiCompanion?: { headers: Record<string, string> };
   apiKey?: string;
   headers: Record<string, string>;

package/src/usage-settings-ui.ts

@@ -9,7 +9,7 @@ const ON = "On";
 const REMAINING = "Remaining";
 const USED = "Used";
 
-type UsageSettingId = "codexFastMode" | "codexStatusResetCountdown" | "codexStatusPercentage" | "openaiCompanionUsage";
+type UsageSettingId = "codexFastMode" | "codexStatusResetCountdown" | "codexStatusPercentage";
 
 function settingValueLabel(id: UsageSettingId, value: UsageSettings[UsageSettingId]): string {
   if (id === "codexStatusPercentage") return value === "used" ? USED : REMAINING;
@@ -30,165 +30,125 @@ export async function showUsageSettings(
   const { HorizontalRule, renderBoundedFrame } = await import("@narumitw/pi-tui-kit");
   if (parentSignal.aborted || !isCurrent()) return false;
   let changed = false;
-  let selectedId: UsageSettingId | undefined;
-  for (;;) {
-    const result = await ctx.ui.custom<boolean | "consent">((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],
-        },
-        {
-          id: "openaiCompanionUsage",
-          label: "Experimental ChatGPT companion usage",
-          description:
-            "Read undocumented plan/app usage using a same-account Codex login; matching registration does not prove identity.",
-          currentValue: state.settings.openaiCompanionUsage ? ON : OFF,
-          values: [OFF, ON],
-        },
-      ];
-      const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
+  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 close = (result: boolean | "consent") => {
-        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;
-          }
-          try {
-            if (id === "openaiCompanionUsage" && requested === true && previous !== true) {
-              // Pi's confirm dialog replaces a non-overlay custom screen and restores
-              // the editor, not that screen. Complete/dispose Settings first; after
-              // consent, mount a fresh instance with the initiating row selected.
-              selectedId = id;
-              close("consent");
-              return;
-            }
-            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;
-          }
-          // 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);
           }
+          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;
-          selectedId = id as UsageSettingId;
-          if (id === "codexStatusPercentage") {
-            queueUpdate(id, value === USED ? "used" : "remaining", value);
-          } else if (id === "codexFastMode" || id === "codexStatusResetCountdown" || id === "openaiCompanionUsage") {
-            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,
+    );
 
-      if (selectedId) settingsList.selectItem(selectedId);
-      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);
-        },
-      };
-    });
-    if (result !== "consent" || parentSignal.aborted || !isCurrent()) return changed;
-    try {
-      const accepted = await ctx.ui.confirm(
-        "Enable experimental ChatGPT companion usage?",
-        "Requires /login openai-codex with the same ChatGPT account/workspace as native OpenAI. Only the companion token and its matching account ID are sent to undocumented ChatGPT usage endpoints. Registration matching is not independent proof of the same user/workspace. No reset or allowance mutations are performed.",
-        { signal: parentSignal },
-      );
-      if (parentSignal.aborted || !isCurrent()) return changed;
-      if (accepted && !settingsRuntime.get().settings.openaiCompanionUsage) {
-        await settingsRuntime.update({ openaiCompanionUsage: true }, parentSignal);
-        changed = true;
-        // A durable rename may win cancellation; the owner guards lifecycle cleanup.
-        onApplied("openaiCompanionUsage");
-      }
-    } catch (error) {
-      if (parentSignal.aborted || !isCurrent()) return changed;
-      ctx.ui.notify(`Could not enable ChatGPT companion usage: ${errorMessage(error)}`, "error");
-    }
-    if (parentSignal.aborted || !isCurrent()) return changed;
-  }
+    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

@@ -89,15 +89,7 @@ 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: typeof resolveRuntimeUsageAuth = (ctx, adapter, salt, reader, candidates) =>
-    resolveRuntimeUsageAuth(
-      ctx,
-      adapter,
-      salt,
-      reader,
-      candidates,
-      settingsRuntime.get().settings.openaiCompanionUsage,
-    );
+  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>();
@@ -248,7 +240,6 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
     const expectedSessionId = ctx.sessionManager.getSessionId();
     const expectedModelIdentity = modelIdentity(ctx.model);
     const expectedTargetId = adapter.targets ? settingsRuntime.get().settings.selectedTargets[adapter.id] : undefined;
-    const expectedCompanionUsage = settingsRuntime.get().settings.openaiCompanionUsage;
     const providerName = providerDisplayName(ctx, adapter.id);
     let auth: ResolvedUsageAuth | undefined;
     try {
@@ -301,7 +292,6 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
       expectedSessionGeneration !== sessionGeneration ||
       ctx.sessionManager.getSessionId() !== expectedSessionId ||
       modelIdentity(ctx.model) !== expectedModelIdentity ||
-      (adapter.id === "openai" && settingsRuntime.get().settings.openaiCompanionUsage !== expectedCompanionUsage) ||
       (adapter.targets !== undefined &&
         settingsRuntime.get().settings.selectedTargets[adapter.id] !== expectedTargetId);
     if (requiresRequestBoundaryGuard && requestContextChanged()) throw abortError();
@@ -1090,20 +1080,6 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
               controller.signal,
               () => statusGeneration === menuGeneration && !controller.signal.aborted,
               (id) => {
-                if (
-                  id === "openaiCompanionUsage" &&
-                  statusGeneration === menuGeneration &&
-                  !controller.signal.aborted
-                ) {
-                  for (const active of nativeQueryControllers) active.abort();
-                  invalidateProviderState("openai");
-                  if (ctx.model?.provider === "openai") {
-                    statusController?.abort();
-                    statusController = undefined;
-                    clearStatusTimers();
-                    safeSetStatus(ctx, undefined);
-                  }
-                }
                 if (
                   (id === "codexStatusResetCountdown" || id === "codexStatusPercentage") &&
                   stableCurrent &&