@narumitw/pi-usage 0.62.0 → 0.63.1

package/dist/chunks/openai-companion-auth-6VLPFVHF.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/openai-companion-auth.ts"],
+  "sourcesContent": ["import type { ExtensionContext } from \"@earendil-works/pi-coding-agent\";\nimport { fingerprintResolvedAuth } from \"./core.js\";\nimport { fallbackOAuthCredentialCandidates, type OAuthCredentialCandidateReader } from \"./oauth-credential-source.js\";\nimport { openAIAuthAccessToken } from \"./providers/openai-chatgpt.js\";\nimport { adapterForProvider, resolveUsageAuth } from \"./query.js\";\nimport type { ResolvedUsageAuth } from \"./types.js\";\n\n// A native app registration is routing metadata, not cryptographic same-account proof.\n// Keep this read-only boundary separate from legacy Codex querying and reset mutation policy.\nexport async function resolveOpenAICompanionAuth(\n  ctx: ExtensionContext,\n  native: ResolvedUsageAuth,\n  salt: Uint8Array,\n  credentialReader: (providerId: string) => unknown,\n  candidateReader?: OAuthCredentialCandidateReader,\n): Promise<ResolvedUsageAuth> {\n  const unavailable = () => ({\n    ...native,\n    fingerprint: fingerprintResolvedAuth(\n      { apiKey: JSON.stringify([native.fingerprint, native.openaiClientId, null]) },\n      salt,\n    ),\n  });\n  if (candidateReader?.waitUntilReady && !(await candidateReader.waitUntilReady(ctx, \"openai-codex\"))) {\n    throw new Error(\"Companion Codex OAuth credential readiness failed closed.\");\n  }\n  const adapter = adapterForProvider(\"openai-codex\");\n  if (!adapter) throw new Error(\"Companion Codex usage support is unavailable.\");\n  const companion = await resolveUsageAuth(ctx, adapter, salt, credentialReader);\n  if (!companion) return unavailable();\n  if (companion.source !== \"OAuth\")\n    throw new Error(\"Companion usage requires /login openai-codex OAuth, not an API key.\");\n  // Legacy querying is more permissive. Enforce explicit Authorization removals and duplicates\n  // against preserved fresh provider auth before using its normalized request headers.\n  const access = openAIAuthAccessToken(companion.auth);\n  if (ctx.model?.provider === \"openai-codex\") {\n    const selected = await ctx.modelRegistry.getApiKeyAndHeaders(ctx.model);\n    if (\n      !selected.ok ||\n      (selected.baseUrl && new URL(selected.baseUrl).origin !== \"https://chatgpt.com\") ||\n      openAIAuthAccessToken(selected) !== access\n    ) {\n      throw new Error(\"Selected Codex model authorization does not match the companion OAuth credential.\");\n    }\n  }\n  if (!access || access !== openAIAuthAccessToken(companion)) {\n    throw new Error(\"Companion Codex runtime authorization did not match its OAuth credential.\");\n  }\n  const accountId = codexAccountId(access);\n  if (!accountId) throw new Error(\"Companion Codex token did not contain a valid account ID.\");\n  const offered = candidateReader\n    ? await candidateReader(ctx, \"openai-codex\")\n    : fallbackOAuthCredentialCandidates(\"openai-codex\", credentialReader);\n  if (!offered.ok) throw new Error(\"Companion Codex OAuth credential discovery failed closed.\");\n  const matches = new Set<string>();\n  for (const candidate of offered.candidates) {\n    const credential = object(candidate);\n    if (credential?.type !== \"oauth\" || credential.access !== access) continue;\n    if (\n      credential.accountId !== accountId ||\n      typeof credential.refresh !== \"string\" ||\n      !credential.refresh ||\n      typeof credential.expires !== \"number\" ||\n      !Number.isFinite(credential.expires)\n    ) {\n      throw new Error(\"The matching companion Codex OAuth credential was incomplete or had a different account ID.\");\n    }\n    matches.add(credential.refresh);\n  }\n  if (matches.size !== 1) throw new Error(\"Companion Codex OAuth must uniquely match the fresh runtime credential.\");\n  const headers = { Authorization: `Bearer ${access}`, \"ChatGPT-Account-Id\": accountId };\n  return {\n    ...native,\n    openaiCompanion: { headers },\n    fingerprint: fingerprintResolvedAuth(\n      { apiKey: JSON.stringify([native.fingerprint, native.openaiClientId, companion.fingerprint, headers]) },\n      salt,\n    ),\n    secrets: [\n      ...new Set([...native.secrets, ...companion.secrets, ...matches, access, accountId, headers.Authorization]),\n    ],\n  };\n}\n\nfunction codexAccountId(access: string): string | undefined {\n  try {\n    const parts = access.split(\".\");\n    if (parts.length !== 3 || !parts[1]) return undefined;\n    const payload = object(JSON.parse(Buffer.from(parts[1], \"base64url\").toString(\"utf8\")));\n    const account = object(payload?.[\"https://api.openai.com/auth\"])?.chatgpt_account_id;\n    return typeof account === \"string\" && account.length > 0 && account.length <= 512 && /^[\\x21-\\x7e]+$/u.test(account)\n      ? account\n      : undefined;\n  } catch {\n    return undefined;\n  }\n}\n\nfunction object(value: unknown): Record<string, unknown> | undefined {\n  return value && typeof value === \"object\" && !Array.isArray(value) ? (value as Record<string, unknown>) : undefined;\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/{openai-companion-usage-Y3WTMUB2.ts → openai-companion-usage-4NOBHGP7.ts}

@@ -3,7 +3,7 @@
 import {
   CHATGPT_USAGE_SETTINGS_URL,
   fetchProviderJson
-} from "./chunk-WEXCFYZX.ts";
+} from "./chunk-ENCC7IBP.ts";
 
 // src/providers/openai-companion-usage.ts
 var USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
@@ -117,4 +117,4 @@ export {
   matchingOpenAIAppBuckets,
   queryOpenAICompanionUsage
 };
-//# sourceMappingURL=openai-companion-usage-Y3WTMUB2.ts.map
+//# sourceMappingURL=openai-companion-usage-4NOBHGP7.ts.map

package/dist/index.ts

@@ -45,7 +45,7 @@ import {
   runWithConcurrency,
   sanitizeDisplayText,
   usageAdapters
-} from "./chunks/chunk-WEXCFYZX.ts";
+} from "./chunks/chunk-ENCC7IBP.ts";
 
 // src/codex-fast.ts
 import { calculateCost, hasApi } from "@earendil-works/pi-ai";
@@ -422,13 +422,12 @@ function formatUsageReport(report, displayState) {
 function formatUsageStatusline(report, model, now = Date.now(), showCodexResetCountdown = true, codexStatusPercentage = "remaining") {
   if (report.providerId === "openai" && report.source === "openai-chatgpt-auth") return "chatgpt usage: web only";
   if (report.source === "openai-chatgpt-companion") {
-    return `chatgpt ${["chatgpt-plan", "chatgpt-app"].map((group) => {
-      const windows = report.buckets.filter((bucket) => bucket.groupId === group).map((bucket) => {
-        const reset = formatResetCountdown(bucket.resetsAt, now);
-        return `${bucket.remaining === void 0 ? "unavailable" : `${bucket.remaining.toFixed(0)}%`} ${reset ? `\u21BB ${reset}` : formatWindowLabel(bucket.windowMinutes, "weekly", true)}`;
-      });
-      return `${group === "chatgpt-plan" ? "plan" : "app"} ${windows.join(" ")}`;
-    }).join(" \xB7 ")}`;
+    const windows = report.buckets.filter((bucket) => bucket.groupId === "chatgpt-plan").map((bucket) => {
+      const reset = formatResetCountdown(bucket.resetsAt, now);
+      const window = reset ? `\u21BB ${reset}` : formatWindowLabel(bucket.windowMinutes, "weekly", true);
+      return `${bucket.remaining === void 0 ? "unavailable" : `${bucket.remaining.toFixed(0)}%`} ${window}`;
+    });
+    return `chatgpt plan ${windows.join(" ")}`;
   }
   if (report.providerId === "baseten") return formatBasetenStatusline(report);
   if (report.providerId === "openai-codex") {
@@ -840,9 +839,8 @@ function formatOpenAICompanionReport(lines, report) {
   for (const group of ["chatgpt-plan", "chatgpt-app"]) {
     lines.push(group === "chatgpt-plan" ? "Plan limits:" : "App limits:");
     for (const bucket of report.buckets.filter((bucket2) => bucket2.groupId === group)) {
-      lines.push(
-        `${formatWindowLabel(bucket.windowMinutes, "weekly", false).padEnd(VALUE_COLUMN)}${formatPercentBucket(bucket)}`
-      );
+      const value = group === "chatgpt-app" ? bucket.resetsAt === void 0 ? "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)
@@ -1000,7 +998,6 @@ import { getAgentDir } from "@earendil-works/pi-coding-agent";
 var USAGE_SETTINGS_FILE = "pi-usage.json";
 var MAX_USAGE_SETTINGS_BYTES = 64 * 1024;
 var DEFAULT_USAGE_SETTINGS = Object.freeze({
-  openaiCompanionUsage: false,
   codexFastMode: false,
   codexStatusResetCountdown: true,
   codexStatusPercentage: "remaining",
@@ -1011,7 +1008,6 @@ function usageSettingsPath() {
 }
 function normalizeUsageSettings(value) {
   if (!isRecord2(value)) return void 0;
-  if (Object.hasOwn(value, "openaiCompanionUsage") && typeof value.openaiCompanionUsage !== "boolean") return void 0;
   if (Object.hasOwn(value, "codexFastMode") && typeof value.codexFastMode !== "boolean") {
     return void 0;
   }
@@ -1031,7 +1027,6 @@ function normalizeUsageSettings(value) {
     effectiveTargets.fireworks = value.fireworksAccountId;
   }
   return {
-    openaiCompanionUsage: value.openaiCompanionUsage === true,
     codexFastMode: typeof value.codexFastMode === "boolean" ? value.codexFastMode : DEFAULT_USAGE_SETTINGS.codexFastMode,
     codexStatusResetCountdown: typeof value.codexStatusResetCountdown === "boolean" ? value.codexStatusResetCountdown : DEFAULT_USAGE_SETTINGS.codexStatusResetCountdown,
     codexStatusPercentage: value.codexStatusPercentage === "used" ? "used" : DEFAULT_USAGE_SETTINGS.codexStatusPercentage,
@@ -1451,156 +1446,121 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
   const { HorizontalRule, renderBoundedFrame } = await import("@narumitw/pi-tui-kit");
   if (parentSignal.aborted || !isCurrent()) return false;
   let changed = false;
-  let selectedId;
-  for (; ; ) {
-    const result = await ctx.ui.custom((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 = [
-        {
-          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) });
-      let settingsList;
-      const close = (result2) => {
-        if (closing) return;
-        closing = true;
-        localController.abort();
-        done(result2);
-      };
-      const cancel = () => close(changed);
-      const queueUpdate = (id, requested, display) => {
-        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) {
-              selectedId = id;
-              close("consent");
-              return;
-            }
-            const patch = {};
-            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");
+  return ctx.ui.custom((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 = [
+      {
+        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;
+    const close = (result) => {
+      if (closing) return;
+      closing = true;
+      localController.abort();
+      done(result);
+    };
+    const cancel = () => close(changed);
+    const queueUpdate = (id, requested, display) => {
+      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 = {};
+          patch[id] = requested;
+          await settingsRuntime.update(patch, signal);
+        } catch (error) {
           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;
-          selectedId = id;
-          if (id === "codexStatusPercentage") {
-            queueUpdate(id, value === USED ? "used" : "remaining", value);
-          } else if (id === "codexFastMode" || id === "codexStatusResetCountdown" || id === "openaiCompanionUsage") {
-            queueUpdate(id, value === ON, value);
-          }
-        },
-        cancel
-      );
-      if (selectedId) settingsList.selectItem(selectedId);
-      parentSignal.addEventListener("abort", cancel, { once: true });
-      return {
-        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 [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) {
-          if (closing) return;
-          if (matchesKey(data, Key.ctrl("c"))) cancel();
-          else settingsList.handleInput(data);
+          settingsList.updateValue(id, settingValueLabel(id, previous));
+          ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
           tui.requestRender();
-        },
-        dispose() {
-          localController.abort();
-          parentSignal.removeEventListener("abort", cancel);
+          return;
         }
-      };
-    });
-    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;
-        onApplied("openaiCompanionUsage");
+        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) {
+        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) {
+        if (closing) return;
+        if (matchesKey(data, Key.ctrl("c"))) cancel();
+        else settingsList.handleInput(data);
+        tui.requestRender();
+      },
+      dispose() {
+        localController.abort();
+        parentSignal.removeEventListener("abort", cancel);
       }
-    } 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;
-  }
+    };
+  });
 }
 
 // src/usage.ts
@@ -1625,14 +1585,7 @@ function usageExtension(pi, dependencies = {}) {
   const credentialCandidates = createOAuthCredentialCandidateReader(pi, credentialReader);
   const createRedemptionId = dependencies.createRedemptionId ?? randomUUID2;
   const settingsRuntime = dependencies.settingsRuntime ?? createUsageSettingsRuntime();
-  const resolveUsageAuth2 = (ctx, adapter, salt, reader, candidates) => resolveUsageAuth(
-    ctx,
-    adapter,
-    salt,
-    reader,
-    candidates,
-    settingsRuntime.get().settings.openaiCompanionUsage
-  );
+  const resolveUsageAuth2 = resolveUsageAuth;
   const cache = new UsageCache(CACHE_TTL_MS);
   const failureBackoff = /* @__PURE__ */ new Map();
   const latestQueries = /* @__PURE__ */ new Map();
@@ -1754,7 +1707,6 @@ function usageExtension(pi, dependencies = {}) {
     const expectedSessionId = ctx.sessionManager.getSessionId();
     const expectedModelIdentity = modelIdentity(ctx.model);
     const expectedTargetId = adapter.targets ? settingsRuntime.get().settings.selectedTargets[adapter.id] : void 0;
-    const expectedCompanionUsage = settingsRuntime.get().settings.openaiCompanionUsage;
     const providerName = providerDisplayName(ctx, adapter.id);
     let auth;
     try {
@@ -1795,7 +1747,7 @@ function usageExtension(pi, dependencies = {}) {
       "zai",
       "zai-coding-cn"
     ].includes(adapter.id);
-    const requestContextChanged = () => expectedSessionGeneration !== sessionGeneration || ctx.sessionManager.getSessionId() !== expectedSessionId || modelIdentity(ctx.model) !== expectedModelIdentity || adapter.id === "openai" && settingsRuntime.get().settings.openaiCompanionUsage !== expectedCompanionUsage || adapter.targets !== void 0 && settingsRuntime.get().settings.selectedTargets[adapter.id] !== expectedTargetId;
+    const requestContextChanged = () => expectedSessionGeneration !== sessionGeneration || ctx.sessionManager.getSessionId() !== expectedSessionId || modelIdentity(ctx.model) !== expectedModelIdentity || adapter.targets !== void 0 && settingsRuntime.get().settings.selectedTargets[adapter.id] !== expectedTargetId;
     if (requiresRequestBoundaryGuard && requestContextChanged()) throw abortError();
     if (!auth) {
       if (adapter.id === "openai") invalidateProviderState(adapter.id);
@@ -2444,16 +2396,6 @@ function usageExtension(pi, dependencies = {}) {
               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 = void 0;
-                    clearStatusTimers();
-                    safeSetStatus(ctx, void 0);
-                  }
-                }
                 if ((id === "codexStatusResetCountdown" || id === "codexStatusPercentage") && stableCurrent && statusGeneration === menuGeneration && !controller.signal.aborted) {
                   publishStableCurrent(ctx, stableCurrent);
                 }