codex-multi-auth 1.3.2 → 2.0.1

package/dist/index.js

@@ -40,6 +40,8 @@ import { PreemptiveQuotaScheduler, readQuotaSchedulerSnapshot, } from "./lib/pre
 import { getModelFamily, MODEL_FAMILIES, prewarmCodexInstructions, } from "./lib/prompts/codex.js";
 import { prewarmHostCodexPrompt } from "./lib/prompts/host-codex-prompt.js";
 import { fetchCodexQuotaSnapshot, formatQuotaSnapshotLine, } from "./lib/quota-probe.js";
+import { loadQuotaCache } from "./lib/quota-cache.js";
+import { findQuotaCacheEntryForAccount, isQuotaCacheEntryExhausted, } from "./lib/quota-readiness.js";
 import { detectErrorType, getRecoveryToastContent, isRecoverableError, } from "./lib/recovery.js";
 import { RefreshGuardian } from "./lib/refresh-guardian.js";
 import { queuedRefresh } from "./lib/refresh-queue.js";
@@ -67,16 +69,19 @@ import { resolveAccountSelection } from "./lib/runtime/account-selection.js";
 import { formatRateLimitEntry, getRateLimitResetTimeForFamily, resolveActiveIndex, } from "./lib/runtime/account-status.js";
 import { createPersistAccounts, runRuntimeOAuthFlow, } from "./lib/runtime/auth-facade.js";
 import { applyAccountStorageScopeEntry } from "./lib/runtime/account-storage-scope-entry.js";
+import { getAppBindStatus } from "./lib/runtime/app-bind.js";
 import { runBrowserOAuthFlow } from "./lib/runtime/browser-oauth-flow.js";
 import { handleRuntimeEvent } from "./lib/runtime/event-handler.js";
 import { hydrateRuntimeEmails } from "./lib/runtime/hydrate-emails.js";
 import { buildLoginMenuAccounts } from "./lib/runtime/login-menu-accounts.js";
+import { readAppRuntimeHelperAccountSignal, resolveAccountCurrentMarkers, resolveRuntimeCurrentAccount, } from "./lib/runtime/runtime-current-account.js";
+import { isRateLimitedMarker } from "./lib/codex-manager/rate-limit-markers.js";
 import { ensureLiveAccountSyncEntry } from "./lib/runtime/live-sync-entry.js";
 import { applyLoaderRuntimeSetup } from "./lib/runtime/loader-setup.js";
 import { buildManualOAuthFlow } from "./lib/runtime/manual-oauth-flow.js";
 import { applyPreemptiveQuotaSettingsFromConfig } from "./lib/runtime/quota-settings.js";
 import { ensureLiveAccountSyncState, ensureRefreshGuardianState, ensureSessionAffinityState, } from "./lib/runtime/runtime-services.js";
-import { mutateRuntimeObservabilitySnapshot } from "./lib/runtime/runtime-observability.js";
+import { getRuntimeObservabilitySnapshot, mutateRuntimeObservabilitySnapshot, } from "./lib/runtime/runtime-observability.js";
 import { applyAccountStorageScopeFromConfig } from "./lib/runtime/storage-scope.js";
 import { showRuntimeToast } from "./lib/runtime/toast.js";
 import { createRuntimeSessionRecoveryHook } from "./lib/runtime/session-recovery.js";
@@ -89,6 +94,33 @@ import { buildTableHeader, buildTableRow, } from "./lib/table-formatter.js";
 import { createHashlineEditTool, createHashlineReadTool, } from "./lib/tools/hashline-tools.js";
 import { formatUiBadge, formatUiHeader, formatUiItem, formatUiKeyValue, formatUiSection, paintUiText, } from "./lib/ui/format.js";
 import { setUiRuntimeOptions } from "./lib/ui/runtime.js";
+function currentMarkerLabel(marker) {
+    return marker === "in-use" ? "in use" : marker;
+}
+async function resolveRuntimeCurrentForStorage(storage, now) {
+    const [appBindStatus, appHelperStatus] = await Promise.all([
+        getAppBindStatus()
+            .then((status) => (status.running ? status.router : null))
+            .catch(() => null),
+        Promise.resolve()
+            .then(() => readAppRuntimeHelperAccountSignal())
+            .catch(() => null),
+    ]);
+    return resolveRuntimeCurrentAccount(storage, {
+        runtimeSnapshot: getRuntimeObservabilitySnapshot(),
+        appBindStatus,
+        appHelperStatus,
+    }, { now });
+}
+function appendQuotaStatusMarkers(statuses, quotaEntry, now = Date.now()) {
+    if (quotaEntry?.status === 429 &&
+        !statuses.some((status) => isRateLimitedMarker(status))) {
+        statuses.push("rate-limited");
+    }
+    if (isQuotaCacheEntryExhausted(quotaEntry, now)) {
+        statuses.push("quota-exhausted");
+    }
+}
 /**
  * OpenAI Codex OAuth authentication plugin for Codex CLI host runtime
  *
@@ -101,7 +133,7 @@ import { setUiRuntimeOptions } from "./lib/ui/runtime.js";
  * {
  *   "plugin": ["codex-multi-auth"],
 
- *   "model": "openai/gpt-5-codex"
+ *   "model": "openai/gpt-5.3-codex"
  * }
  * ```
  */
@@ -1001,6 +1033,9 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                                 const shouldForceGpt55Fallback = unsupportedModelInfo.isUnsupported &&
                                                     (blockedModelNormalized === "gpt-5.5" ||
                                                         blockedModelNormalized === "gpt-5.5-pro" ||
+                                                        blockedModelNormalized === "gpt-5.5-2026-04-23" ||
+                                                        blockedModelNormalized ===
+                                                            "gpt-5.5-pro-2026-04-23" ||
                                                         blockedModelNormalized === "gpt-5.5-20260423" ||
                                                         blockedModelNormalized ===
                                                             "gpt-5.5-pro-20260423");
@@ -1041,7 +1076,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                                     customChain: unsupportedCodexFallbackChain,
                                                 });
                                                 if (fallbackModel) {
-                                                    const previousModel = model ?? "gpt-5-codex";
+                                                    const previousModel = model ?? "gpt-5.3-codex";
                                                     const previousModelFamily = modelFamily;
                                                     attemptedUnsupportedFallbackModels.add(previousModel);
                                                     attemptedUnsupportedFallbackModels.add(fallbackModel);
@@ -1699,9 +1734,11 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                 }
                                 const now = Date.now();
                                 const activeIndex = resolveActiveIndex(workingStorage, "codex");
+                                const runtimeCurrent = await resolveRuntimeCurrentForStorage(workingStorage, now);
                                 const existingAccounts = buildLoginMenuAccounts(workingStorage.accounts, {
                                     now,
                                     activeIndex,
+                                    runtimeCurrent,
                                     formatRateLimitEntry: (account, currentNow) => formatRateLimitEntry(account, currentNow, formatWaitTime),
                                 });
                                 const menuResult = await promptLoginMode(existingAccounts, {
@@ -2098,6 +2135,8 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                     }
                     const now = Date.now();
                     const activeIndex = resolveActiveIndex(storage, "codex");
+                    const runtimeCurrent = await resolveRuntimeCurrentForStorage(storage, now);
+                    const quotaCache = await loadQuotaCache().catch(() => null);
                     if (ui.v2Enabled) {
                         const lines = [
                             ...formatUiHeader(ui, "Codex accounts"),
@@ -2109,13 +2148,21 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         storage.accounts.forEach((account, index) => {
                             const label = formatAccountLabel(account, index);
                             const badges = [];
-                            if (index === activeIndex)
-                                badges.push(formatUiBadge(ui, "current", "accent"));
+                            for (const marker of resolveAccountCurrentMarkers(index, activeIndex, runtimeCurrent)) {
+                                badges.push(formatUiBadge(ui, currentMarkerLabel(marker), marker === "current" ? "accent" : "muted"));
+                            }
                             if (account.enabled === false)
                                 badges.push(formatUiBadge(ui, "disabled", "danger"));
                             const rateLimit = formatRateLimitEntry(account, now, formatWaitTime);
                             if (rateLimit)
                                 badges.push(formatUiBadge(ui, "rate-limited", "warning"));
+                            const quotaEntry = findQuotaCacheEntryForAccount(quotaCache, account, storage.accounts);
+                            if (quotaEntry?.status === 429 && !rateLimit) {
+                                badges.push(formatUiBadge(ui, "rate-limited", "warning"));
+                            }
+                            if (isQuotaCacheEntryExhausted(quotaEntry, now)) {
+                                badges.push(formatUiBadge(ui, "quota-exhausted", "warning"));
+                            }
                             if (typeof account.coolingDownUntil === "number" &&
                                 account.coolingDownUntil > now) {
                                 badges.push(formatUiBadge(ui, "cooldown", "warning"));
@@ -2140,7 +2187,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         columns: [
                             { header: "#", width: 3 },
                             { header: "Label", width: 42 },
-                            { header: "Status", width: 20 },
+                            { header: "Status", width: 44 },
                         ],
                     };
                     const lines = [
@@ -2152,10 +2199,11 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         const label = formatAccountLabel(account, index);
                         const statuses = [];
                         const rateLimit = formatRateLimitEntry(account, now, formatWaitTime);
-                        if (index === activeIndex)
-                            statuses.push("active");
+                        const quotaEntry = findQuotaCacheEntryForAccount(quotaCache, account, storage.accounts);
+                        statuses.push(...resolveAccountCurrentMarkers(index, activeIndex, runtimeCurrent).map(currentMarkerLabel));
                         if (rateLimit)
                             statuses.push("rate-limited");
+                        appendQuotaStatusMarkers(statuses, quotaEntry, now);
                         if (typeof account.coolingDownUntil === "number" &&
                             account.coolingDownUntil > now) {
                             statuses.push("cooldown");
@@ -2270,6 +2318,8 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                     }
                     const now = Date.now();
                     const activeIndex = resolveActiveIndex(storage, "codex");
+                    const runtimeCurrent = await resolveRuntimeCurrentForStorage(storage, now);
+                    const quotaCache = await loadQuotaCache().catch(() => null);
                     if (ui.v2Enabled) {
                         const lines = [
                             ...formatUiHeader(ui, "Account status"),
@@ -2280,14 +2330,20 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         storage.accounts.forEach((account, index) => {
                             const label = formatAccountLabel(account, index);
                             const badges = [];
-                            if (index === activeIndex)
-                                badges.push(formatUiBadge(ui, "active", "accent"));
+                            for (const marker of resolveAccountCurrentMarkers(index, activeIndex, runtimeCurrent)) {
+                                badges.push(formatUiBadge(ui, currentMarkerLabel(marker), marker === "current" ? "accent" : "muted"));
+                            }
                             if (account.enabled === false)
                                 badges.push(formatUiBadge(ui, "disabled", "danger"));
                             const rateLimit = formatRateLimitEntry(account, now, formatWaitTime) ?? "none";
                             const cooldown = formatCooldown(account, now) ?? "none";
+                            const quotaEntry = findQuotaCacheEntryForAccount(quotaCache, account, storage.accounts);
                             if (rateLimit !== "none")
                                 badges.push(formatUiBadge(ui, "rate-limited", "warning"));
+                            if (quotaEntry?.status === 429 && rateLimit === "none")
+                                badges.push(formatUiBadge(ui, "rate-limited", "warning"));
+                            if (isQuotaCacheEntryExhausted(quotaEntry, now))
+                                badges.push(formatUiBadge(ui, "quota-exhausted", "warning"));
                             if (cooldown !== "none")
                                 badges.push(formatUiBadge(ui, "cooldown", "warning"));
                             if (badges.length === 0)
@@ -2322,8 +2378,8 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                         columns: [
                             { header: "#", width: 3 },
                             { header: "Label", width: 42 },
-                            { header: "Active", width: 6 },
-                            { header: "Rate Limit", width: 16 },
+                            { header: "Current", width: 18 },
+                            { header: "Rate Limit", width: 48 },
                             { header: "Cooldown", width: 16 },
                             { header: "Last Used", width: 16 },
                         ],
@@ -2335,8 +2391,23 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                     ];
                     storage.accounts.forEach((account, index) => {
                         const label = formatAccountLabel(account, index);
-                        const active = index === activeIndex ? "Yes" : "No";
+                        const active = resolveAccountCurrentMarkers(index, activeIndex, runtimeCurrent)
+                            .map(currentMarkerLabel)
+                            .join(", ") || "No";
                         const rateLimit = formatRateLimitEntry(account, now, formatWaitTime) ?? "None";
+                        const quotaEntry = findQuotaCacheEntryForAccount(quotaCache, account, storage.accounts);
+                        const quotaStatuses = [];
+                        if (rateLimit === "None" && quotaEntry?.status === 429) {
+                            quotaStatuses.push("rate-limited");
+                        }
+                        if (isQuotaCacheEntryExhausted(quotaEntry, now)) {
+                            quotaStatuses.push("quota-exhausted");
+                        }
+                        const rateLimitDisplay = rateLimit !== "None"
+                            ? [rateLimit, ...quotaStatuses].join(", ")
+                            : quotaStatuses.length > 0
+                                ? quotaStatuses.join(", ")
+                                : "None";
                         const cooldown = formatCooldown(account, now) ?? "No";
                         const lastUsed = typeof account.lastUsed === "number" && account.lastUsed > 0
                             ? `${formatWaitTime(now - account.lastUsed)} ago`
@@ -2345,7 +2416,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                             String(index + 1),
                             label,
                             active,
-                            rateLimit,
+                            rateLimitDisplay,
                             cooldown,
                             lastUsed,
                         ], statusTableOptions));