@narumitw/pi-usage 0.61.1 → 0.61.2

package/README.md

@@ -4,11 +4,13 @@
 
 Inspect usage and DeepSeek API balance for Pi's active provider account, query other configured providers, and toggle Fast mode for supported OpenAI Codex models.
 The extension keeps each provider's native quota, allowance, and spending semantics instead of treating unlike values as equivalent.
+Native `openai` ChatGPT OAuth shows verified authentication status and a usage-settings link, not numerical quotas or reset times.
 xAI OAuth subscription reporting follows the reviewed Grok Build contract and runs only after an explicit `/usage` action.
 
 ## ✨ Features
 
 - Shows active-account usage and next actions through `/usage`.
+- Recognizes native `/login openai` ChatGPT OAuth separately from unsupported OpenAI API-key usage reporting.
 - Reports subscription allowances, API balances, and spending for the supported providers listed below without mixing their billing semantics.
 - Toggles persistent Codex Fast routing through `/fast` or the usage menu.
 - Redeems eligible Codex resets only after fresh account matching and explicit confirmation.
@@ -48,6 +50,8 @@ The package declares `dist/index.ts`, so an unbuilt local checkout must run the
 Run `/usage` in TUI or RPC mode to inspect the active provider, refresh its usage, or choose another configured provider.
 When a provider exposes several billing targets, `/usage` asks for one target before querying usage.
 Run `/fast` to toggle Fast mode for a supported active Codex model.
+For native `/login openai`, select an `openai` model and run `/usage` to verify ChatGPT authentication and find [ChatGPT usage settings](https://chatgpt.com/settings/usage).
+Native OpenAI Fast mode and earned reset redemption are not implemented; those actions remain specific to legacy `openai-codex`.
 
 ## 💬 Commands
 
@@ -127,7 +131,8 @@ Currencies and billing targets remain separate.
 
 | Provider | Reported data |
 | --- | --- |
-| OpenAI Codex | Subscription windows, credits, resets, and model buckets |
+| OpenAI (native ChatGPT OAuth) | Verified authentication status and usage-settings link; no numerical quota or reset data |
+| OpenAI Codex (legacy) | Subscription windows, credits, resets, and model buckets |
 | Kimi For Coding | Plan request windows and a separate booster wallet |
 | Moonshot AI Global/China | Current API balance in USD/CNY |
 | MiniMax Global/China | Token Plan windows or pay-as-you-go API balance |
@@ -169,6 +174,8 @@ MiniMax publishes Token Plan window percentages or the regional pay-as-you-go av
 Baseten publishes the exact trailing 30-day Model APIs net subtotal after credits.
 xAI is always menu-only and never starts a scheduled status refresh.
 Z.AI statusline usage refreshes every five minutes while the selected model remains on Z.AI.
+Verified native OpenAI OAuth publishes `chatgpt usage: web only`; its five-minute refresh revalidates authentication locally without calling a usage endpoint.
+OpenAI API-key auth clears this status.
 
 Queries for another provider or all providers never publish their results to the statusline.
 `@narumitw/pi-statusline` supplies the default `📊` icon; `pi-usage` publishes text-only values.
@@ -197,6 +204,9 @@ Behavior changes:
 Credential candidates are collected synchronously in memory after any compatible readiness promises settle, and are not cached, persisted, logged, formatted, or appended to the Pi session.
 The protocols carry no account name or extension identity.
 Only the selected provider's exact runtime match is used, and secrets are sent only to its validated official origin.
+Native OpenAI status requires fresh Pi OAuth resolution and a matching complete ChatGPT grant, including the direct-token scope and client ID.
+Model-level Authorization overrides cannot inherit subscription status from a stored login.
+The native status adapter sends no usage request and never forwards native tokens to legacy ChatGPT backend endpoints.
 DeepSeek balance requests require Bearer authentication, send only that resolved credential from Pi's runtime auth to `https://api.deepseek.com/user/balance`, and refuse redirects.
 Fireworks spend requests send only that resolved credential to the official `https://api.fireworks.ai` account-listing and billing-summary endpoints and refuse redirects.
 Moonshot balance requests send only the resolved Bearer credential to the matching official Global or China balance origin and refuse redirects.
@@ -210,7 +220,8 @@ An absent or incompatible peer preserves standalone fallback and fail-closed mis
 
 ## 🚧 Limitations
 
-- Only providers with a meaningful usage source and verifiable Pi runtime auth are supported.
+- Numerical usage requires a meaningful provider usage source and verifiable Pi runtime auth.
+- Native `openai` reports authentication only: numerical usage, reset times, Fast mode, and earned reset redemption are not supported, and OpenAI API-key usage reporting remains unsupported.
 - GitHub Copilot quota, Kimi managed usage, Z.AI quota, and OpenAI Codex reset redemption rely on provider-owned endpoints that may change without notice.
 - Codex reset redemption requires a current ChatGPT OAuth credential from Pi's login or a compatible credential source; Codex API keys cannot redeem earned subscription resets.
 - xAI usage supports only a uniquely matched Pi OAuth subscription credential; xAI API keys and Management API credentials are unsupported.

package/dist/index.ts

@@ -1429,6 +1429,80 @@ function amount(value, label, allowNegative) {
   return String(value);
 }
 
+// src/providers/openai-chatgpt.ts
+var CHATGPT_USAGE_SETTINGS_URL = "https://chatgpt.com/settings/usage";
+var DIRECT_TOKEN_SCOPE = "chatgpt.tokens.use.direct";
+var UnsupportedOpenAIUsageAuthError = class extends Error {
+  name = "UnsupportedOpenAIUsageAuthError";
+  constructor() {
+    super("OpenAI API-key usage reporting is not supported; ChatGPT plan status requires native /login openai OAuth.");
+  }
+};
+var OPENAI_CHATGPT_ADAPTER = {
+  id: "openai",
+  displayName: "OpenAI",
+  semantics: { kind: "consumer-subscription", label: "ChatGPT plan authentication status" },
+  async query(_auth, signal, _timeoutMs, guard) {
+    if (!guard) throw new Error("ChatGPT plan status requires runtime-auth revalidation.");
+    signal.throwIfAborted();
+    await guard();
+    signal.throwIfAborted();
+    return {
+      providerId: "openai",
+      providerName: "OpenAI",
+      capturedAt: Date.now(),
+      source: "openai-chatgpt-auth",
+      semantics: { kind: "consumer-subscription", label: "ChatGPT plan authentication status" },
+      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.",
+        `Manage usage: ${CHATGPT_USAGE_SETTINGS_URL}`,
+        "Fast mode and earned reset redemption remain legacy openai-codex features."
+      ]
+    };
+  }
+};
+function resolveOpenAIChatGPTAuth(auth, providerAuth, source, model, candidates) {
+  if (source !== "OAuth") throw new UnsupportedOpenAIUsageAuthError();
+  const access = accessToken(auth);
+  if (!access || access !== accessToken(providerAuth)) {
+    throw new Error("The active OpenAI model authorization does not match its resolved OAuth credential.");
+  }
+  const matches = /* @__PURE__ */ new Map();
+  for (const candidate of candidates) {
+    if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) continue;
+    const credential = candidate;
+    if (credential.type !== "oauth" || credential.access !== access) continue;
+    if (typeof credential.refresh !== "string" || !credential.refresh || typeof credential.expires !== "number" || !Number.isFinite(credential.expires) || typeof credential.clientId !== "string" || !credential.clientId.trim() || !Array.isArray(credential.scopes) || !credential.scopes.every((scope) => typeof scope === "string") || !credential.scopes.includes(DIRECT_TOKEN_SCOPE)) {
+      throw new Error(
+        "The matching OpenAI OAuth credential is not a complete native ChatGPT grant; reconnect with /login openai."
+      );
+    }
+    matches.set(JSON.stringify([credential.clientId, credential.refresh]), credential.refresh);
+  }
+  if (matches.size > 1)
+    throw new Error("Conflicting native ChatGPT credentials match the active OpenAI runtime account.");
+  const refresh = matches.values().next().value;
+  if (!refresh)
+    throw new Error("The active OpenAI runtime account does not match an available native ChatGPT OAuth credential.");
+  const authorization = `Bearer ${access}`;
+  return {
+    apiKey: access,
+    headers: { Authorization: authorization },
+    fingerprint: "",
+    secrets: [access, refresh, authorization],
+    model
+  };
+}
+function accessToken(auth) {
+  if (!auth) return void 0;
+  const authorization = Object.entries(auth.headers ?? {}).filter(([name]) => name.toLowerCase() === "authorization");
+  if (authorization.length > 1) throw new Error("OpenAI runtime authorization headers are ambiguous.");
+  if (authorization.length === 1) return /^Bearer\s+(.+)$/iu.exec(authorization[0]?.[1] ?? "")?.[1];
+  return auth.apiKey;
+}
+
 // src/providers/opencode-zen.ts
 var ZEN_WINDOWS = [
   { key: "rolling", label: "Rolling" },
@@ -2144,6 +2218,7 @@ var SUPPORTED_ADAPTERS = [
       return normalizeBasetenBillingUsagePayload(payload, Date.now());
     }
   },
+  OPENAI_CHATGPT_ADAPTER,
   {
     id: "openai-codex",
     displayName: "OpenAI Codex",
@@ -2368,7 +2443,7 @@ async function resolveUsageAuth(ctx, adapter, salt = AUTH_FINGERPRINT_SALT, cred
   }
   const model = candidateModels(ctx, adapter.id).find((candidate) => hasOfficialOrigin(candidate, adapter.id));
   if (!model) return void 0;
-  if (["github-copilot", "xai"].includes(adapter.id) && candidateReader?.waitUntilReady && !await candidateReader.waitUntilReady(ctx, adapter.id)) {
+  if (["github-copilot", "openai", "xai"].includes(adapter.id) && candidateReader?.waitUntilReady && !await candidateReader.waitUntilReady(ctx, adapter.id)) {
     throw new Error(`${adapter.displayName} OAuth credential readiness failed closed.`);
   }
   const registry = ctx.modelRegistry;
@@ -2384,9 +2459,9 @@ async function resolveUsageAuth(ctx, adapter, salt = AUTH_FINGERPRINT_SALT, cred
     if (!currentModel || typeof registry.getApiKeyAndHeaders !== "function") return void 0;
     const result = await registry.getApiKeyAndHeaders(currentModel);
     if (!result.ok) throw new Error(redactUsageError(result.error));
-    return authorizationFrom(result) ? result : void 0;
+    return adapter.id === "openai" || authorizationFrom(result) ? result : void 0;
   };
-  const resolveSelectedAuthLast = ["deepseek", "minimax", "minimax-cn"].includes(adapter.id);
+  const resolveSelectedAuthLast = ["deepseek", "minimax", "minimax-cn", "openai"].includes(adapter.id);
   if (!resolveSelectedAuthLast) modelAuth = await resolveCurrentModelAuth();
   if (typeof registry.getProviderAuth !== "function") {
     throw new Error("pi-usage requires Pi 0.81.0 or newer to validate resolved provider auth.");
@@ -2439,6 +2514,15 @@ async function resolveUsageAuth(ctx, adapter, salt = AUTH_FINGERPRINT_SALT, cred
       )
     };
   };
+  if (adapter.id === "openai") {
+    if (!providerResult) return void 0;
+    if (providerResult.source !== "OAuth") throw new UnsupportedOpenAIUsageAuthError();
+    const offered = candidateReader ? await candidateReader(ctx, adapter.id) : fallbackOAuthCredentialCandidates(adapter.id, credentialReader);
+    if (!offered.ok) throw new Error("OpenAI OAuth credential discovery failed closed.");
+    return finalize(
+      resolveOpenAIChatGPTAuth(auth, providerResult.auth, providerResult.source, model, offered.candidates)
+    );
+  }
   if (adapter.id === "github-copilot") {
     const offered = candidateReader ? await candidateReader(ctx, adapter.id) : fallbackOAuthCredentialCandidates(adapter.id, credentialReader);
     if (!offered.ok) {
@@ -2805,6 +2889,7 @@ function hasOfficialUrlOrigin(value, providerId) {
     if (providerId === "baseten") {
       return ["https://inference.baseten.co", "https://api.baseten.co"].includes(url.origin);
     }
+    if (providerId === "openai") return url.origin === "https://api.openai.com";
     if (providerId === "openai-codex") return url.origin === "https://chatgpt.com";
     if (providerId === "deepseek") return url.origin === "https://api.deepseek.com";
     if (providerId === "fireworks") return url.origin === "https://api.fireworks.ai";
@@ -3202,7 +3287,7 @@ var BAR_SEGMENTS = 20;
 var VALUE_COLUMN = 29;
 function formatUsageReport(report2, displayState) {
   const stateLabel = displayState === "current" ? "Current" : "Configured";
-  const title = report2.providerId === "baseten" ? "Baseten Model APIs Spend" : report2.providerId === "deepseek" ? "DeepSeek API Balance" : report2.providerId === "fireworks" ? "Fireworks API Spend" : report2.providerId === "vercel-ai-gateway" ? "Vercel AI Gateway Credits" : report2.providerId === "moonshotai" || report2.providerId === "moonshotai-cn" ? `${report2.providerName} Balance` : report2.providerId === "minimax" || report2.providerId === "minimax-cn" ? report2.source === "minimax-account-balance" ? `${report2.providerName} API Balance` : `${report2.providerName} Token Plan` : `${report2.providerName} Usage`;
+  const title = report2.providerId === "baseten" ? "Baseten Model APIs Spend" : report2.providerId === "deepseek" ? "DeepSeek API Balance" : report2.providerId === "fireworks" ? "Fireworks API Spend" : report2.providerId === "vercel-ai-gateway" ? "Vercel AI Gateway Credits" : report2.providerId === "moonshotai" || report2.providerId === "moonshotai-cn" ? `${report2.providerName} Balance` : report2.providerId === "minimax" || report2.providerId === "minimax-cn" ? report2.source === "minimax-account-balance" ? `${report2.providerName} API Balance` : `${report2.providerName} Token Plan` : report2.source === "openai-chatgpt-auth" ? `${report2.providerName} ChatGPT Plan Status` : `${report2.providerName} Usage`;
   const lines = [`${title} \xB7 ${stateLabel}`];
   if (report2.accountLabel) lines.push(`Account: ${report2.accountLabel}`);
   lines.push(`Semantics: ${report2.semantics.label}`, "");
@@ -3229,6 +3314,7 @@ function formatUsageReport(report2, displayState) {
   return lines.join("\n").trimEnd();
 }
 function formatUsageStatusline(report2, model, now = Date.now(), showCodexResetCountdown = true, codexStatusPercentage = "remaining") {
+  if (report2.providerId === "openai" && report2.source === "openai-chatgpt-auth") return "chatgpt usage: web only";
   if (report2.providerId === "baseten") return formatBasetenStatusline(report2);
   if (report2.providerId === "openai-codex") {
     return formatCodexStatusline(report2, model, now, showCodexResetCountdown, codexStatusPercentage);
@@ -4502,6 +4588,7 @@ function usageExtension(pi, dependencies = {}) {
       );
     } catch (error) {
       if (isStaleExtensionContextError(error) || isAbortError3(error)) throw error;
+      const authState = error instanceof UnsupportedOpenAIUsageAuthError ? "unsupported" : adapter.id === "openai" && !isTimeoutError(error) ? "failed" : void 0;
       if (displayState === "current") {
         transitionCurrentIdentity(`${adapter.id}:auth-error`, adapter.id);
       }
@@ -4510,9 +4597,10 @@ function usageExtension(pi, dependencies = {}) {
           providerId: adapter.id,
           providerName,
           displayState,
-          status: isTimeoutError(error) ? "query-failed" : "auth-unavailable",
+          status: authState === "unsupported" ? "unsupported" : isTimeoutError(error) ? "query-failed" : "auth-unavailable",
           message: errorMessage(error)
-        }
+        },
+        ...authState ? { authState } : {}
       };
     }
     const requiresRequestBoundaryGuard = adapter.targets !== void 0 || [
@@ -4522,6 +4610,7 @@ function usageExtension(pi, dependencies = {}) {
       "minimax-cn",
       "moonshotai",
       "moonshotai-cn",
+      "openai",
       "vercel-ai-gateway",
       "xai",
       "zai",
@@ -4813,10 +4902,10 @@ function usageExtension(pi, dependencies = {}) {
     if (generation !== statusGeneration || modelIdentity(ctx.model) !== modelIdentity(model)) {
       return false;
     }
-    const adapter = adapterForProvider(model?.provider);
+    const adapter = adapterForProvider(outcome.state.providerId);
     const selectionStillCurrent = !adapter?.targets || settingsRuntime.get().settings.selectedTargets[adapter.id] === outcome.rememberedTargetId;
     if (!selectionStillCurrent) return false;
-    if (outcome.authState === "unavailable") {
+    if (outcome.authState) {
       if (!adapter) return false;
       try {
         const auth = await awaitWithDeadline(
@@ -4825,10 +4914,11 @@ function usageExtension(pi, dependencies = {}) {
           DEFAULT_TIMEOUT_MS,
           `revalidating ${adapter.displayName} runtime auth`
         );
-        return generation === statusGeneration && modelIdentity(ctx.model) === modelIdentity(model) && (!adapter.targets || settingsRuntime.get().settings.selectedTargets[adapter.id] === outcome.rememberedTargetId) && auth === void 0;
+        return generation === statusGeneration && modelIdentity(ctx.model) === modelIdentity(model) && (!adapter.targets || settingsRuntime.get().settings.selectedTargets[adapter.id] === outcome.rememberedTargetId) && outcome.authState === "unavailable" && auth === void 0;
       } catch (error) {
         if (isAbortError3(error) || isStaleExtensionContextError(error)) throw error;
-        return false;
+        const unchangedFailure = outcome.authState === "unsupported" && error instanceof UnsupportedOpenAIUsageAuthError || outcome.authState === "failed" && outcome.state.status === "auth-unavailable" && !(error instanceof UnsupportedOpenAIUsageAuthError) && !isTimeoutError(error) && errorMessage(error) === outcome.state.message;
+        return unchangedFailure && generation === statusGeneration && modelIdentity(ctx.model) === modelIdentity(model) && (!adapter.targets || settingsRuntime.get().settings.selectedTargets[adapter.id] === outcome.rememberedTargetId);
       }
     }
     if (!outcome.fingerprint) return true;
@@ -4846,6 +4936,18 @@ function usageExtension(pi, dependencies = {}) {
       return false;
     }
   };
+  const queryStableAdapterState = async (ctx, adapter, displayState, force, signal) => {
+    if (adapter.id !== "openai") return queryAdapterState(ctx, adapter, displayState, force, signal);
+    for (let attempt = 0; attempt < 3; attempt += 1) {
+      const model = ctx.model;
+      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;
+      force = false;
+    }
+    throw new Error("OpenAI runtime authentication kept changing; reopen /usage to retry.");
+  };
   const queryStableCurrent = async (ctx, force, controller, label) => {
     for (let attempt = 0; attempt < 3; attempt += 1) {
       const model = ctx.model;
@@ -5117,7 +5219,7 @@ function usageExtension(pi, dependencies = {}) {
                 ctx,
                 `Checking ${providerDisplayName(ctx, adapter.id)} usage\u2026`,
                 controller.signal,
-                (signal) => queryAdapterState(ctx, adapter, "configured", true, signal)
+                (signal) => queryStableAdapterState(ctx, adapter, "configured", true, signal)
               );
               if (!outcome) return { kind: "stay" };
               const revalidated = await queryStableCurrent(ctx, false, controller, "Revalidating current usage\u2026");
@@ -5320,7 +5422,7 @@ function usageExtension(pi, dependencies = {}) {
               ctx,
               `Checking ${providerDisplayName(ctx, adapter.id)} usage\u2026`,
               controller.signal,
-              (signal) => queryAdapterState(ctx, adapter, "configured", false, signal)
+              (signal) => queryStableAdapterState(ctx, adapter, "configured", false, signal)
             );
             if (!outcome) return { kind: "back" };
             if (outcome.state.status === "selection-required") {
@@ -5331,7 +5433,7 @@ function usageExtension(pi, dependencies = {}) {
                 ctx,
                 `Checking ${providerDisplayName(ctx, adapter.id)} usage\u2026`,
                 controller.signal,
-                (signal) => queryAdapterState(ctx, adapter, "configured", true, signal)
+                (signal) => queryStableAdapterState(ctx, adapter, "configured", true, signal)
               );
               if (!outcome) return { kind: "back" };
             }
@@ -5354,7 +5456,7 @@ function usageExtension(pi, dependencies = {}) {
               (signal) => runWithConcurrency(
                 adapters,
                 ALL_PROVIDER_CONCURRENCY,
-                (adapter, _index, workerSignal) => queryAdapterState(
+                (adapter, _index, workerSignal) => queryStableAdapterState(
                   ctx,
                   adapter,
                   adapter.id === currentProviderId ? "current" : "configured",