oc-codex-multi-auth 6.11.3 → 6.12.0

package/README.md

@@ -307,6 +307,10 @@ reordering accounts does not silently change a model's routing.
     "gpt-5.6-terra": [
       "org-another-account-id"
     ]
+  },
+  "modelAccountPoolModes": {
+    "gpt-5.6-sol": "strict",
+    "gpt-5.6-terra": "preferred"
   }
 }
 ```
@@ -323,6 +327,7 @@ codex-pool
 codex-pool action="set" model="gpt-5.6-sol" accounts=[7,8]
 codex-pool action="add" model="gpt-5.6-sol" accounts=[9]
 codex-pool action="remove" model="gpt-5.6-sol" accounts=[7]
+codex-pool action="set-mode" model="gpt-5.6-sol" poolMode="strict"
 codex-pool action="clear" model="gpt-5.6-sol"
 ```
 
@@ -334,11 +339,12 @@ the current project is reported but never automatically deleted.
 
 Routing behavior:
 
-- A mapped model uses only healthy, selectable accounts in its preferred pool.
+- A mapped model defaults to `preferred` mode and uses healthy, selectable accounts in its pool.
 - Existing rotation strategy, quota, cooldown, and token-health rules still apply within the preferred pool.
-- If every preferred account is unavailable, disabled, unknown, cooling down, or rate-limited, routing automatically falls back to the healthy general account pool.
+- In `preferred` mode, an unavailable pool falls back to the healthy general account pool.
+- In `strict` mode, routing never leaves the configured pool and immediately returns `strict_pool_unavailable` when no pooled account is selectable.
 - An unmapped model or an empty account list uses the general account pool directly.
-- `codex-status`, `codex-dashboard`, and routing diagnostics report the account-pool mode as `preferred`, `general`, or `general-fallback`.
+- `codex-status`, `codex-dashboard`, and routing diagnostics also report `strict` and `strict-unavailable` modes.
 
 Account IDs are local account metadata but should still be treated as private
 configuration. Do not publish a populated configuration file.

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,qBAAqB,CAAC;AAqN/D;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAkjH/B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAoB,CAAC;AAElD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,qBAAqB,CAAC;AAwN/D;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MA8oH/B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAoB,CAAC;AAElD,eAAe,iBAAiB,CAAC"}

package/dist/index.js

@@ -32,7 +32,7 @@ import { queuedRefresh } from "./lib/refresh-queue.js";
 import { openBrowserUrl } from "./lib/auth/browser.js";
 import { startLocalOAuthServer } from "./lib/auth/server.js";
 import { promptAddAnotherAccount, promptLoginMode } from "./lib/cli.js";
-import { getCodexMode, getRequestTransformMode, getFastSession, getFastSessionStrategy, getFastSessionMaxInputItems, getRetryProfile, getRetryBudgetOverrides, getRateLimitToastDebounceMs, getRetryAllAccountsMaxRetries, getRetryAllAccountsMaxWaitMs, getRetryAllAccountsRateLimited, getFallbackToGpt52OnUnsupportedGpt53, getUnsupportedCodexPolicy, getUnsupportedCodexFallbackChain, getTokenRefreshSkewMs, getSessionRecovery, getAutoResume, getAutoUpdate, getToastDurationMs, getAccountToastsEnabled, getPerProjectAccounts, getEmptyResponseMaxRetries, getEmptyResponseRetryDelayMs, getPidOffsetEnabled, getRotationStrategy, getModelAccountPool, getFetchTimeoutMs, getStreamStallTimeoutMs, getCodexTuiV2, getCodexTuiColorProfile, getCodexTuiGlyphMode, getBeginnerSafeMode, getCodexTuiMaskEmail, loadPluginConfig, } from "./lib/config.js";
+import { getCodexMode, getRequestTransformMode, getFastSession, getFastSessionStrategy, getFastSessionMaxInputItems, getRetryProfile, getRetryBudgetOverrides, getRateLimitToastDebounceMs, getRetryAllAccountsMaxRetries, getRetryAllAccountsMaxWaitMs, getRetryAllAccountsRateLimited, getFallbackToGpt52OnUnsupportedGpt53, getUnsupportedCodexPolicy, getUnsupportedCodexFallbackChain, getTokenRefreshSkewMs, getSessionRecovery, getAutoResume, getAutoUpdate, getToastDurationMs, getAccountToastsEnabled, getPerProjectAccounts, getEmptyResponseMaxRetries, getEmptyResponseRetryDelayMs, getPidOffsetEnabled, getRotationStrategy, getModelAccountPool, getModelAccountPoolMode, getFetchTimeoutMs, getStreamStallTimeoutMs, getCodexTuiV2, getCodexTuiColorProfile, getCodexTuiGlyphMode, getBeginnerSafeMode, getCodexTuiMaskEmail, loadPluginConfig, } from "./lib/config.js";
 import { AUTH_LABELS, CODEX_BASE_URL, DUMMY_API_KEY, LOG_STAGES, PLUGIN_NAME, PROVIDER_ID, ACCOUNT_LIMITS, } from "./lib/constants.js";
 import { initLogger, logRequest, logDebug, logInfo, logWarn, logError, setCorrelationId, clearCorrelationId, } from "./lib/logger.js";
 import { checkAndNotify } from "./lib/auto-update-checker.js";
@@ -59,6 +59,7 @@ import { createSessionRecoveryHook, isRecoverableError, detectErrorType, getReco
 import { matchesWorkspaceIdentity, upsertFlaggedAccountRecord, createRetryBudgetUsage, serializeSelectionExplainability, formatRoutingValue, formatExplainabilitySummary, } from "./lib/runtime.js";
 import { createToolRegistry, } from "./lib/tools/index.js";
 import { createUsageAccountFingerprint, fetchCodexUsage, formatUsageLimitSummary, formatUsageLimitTitle, hasUsageWindow, parseCodexUsagePayload, } from "./lib/codex-usage.js";
+import { getQuotaExhaustedResetAtMs } from "./lib/quota-windows.js";
 import { clearTuiQuotaSnapshot, parseTuiQuotaSnapshotFromHeaders, writeTuiQuotaSnapshot, } from "./lib/tui-quota-cache.js";
 /**
  * OpenAI Codex OAuth authentication plugin for opencode
@@ -190,7 +191,10 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
         lines.push(formatUiKeyValue(ui, "Fallback from", formatRoutingValue(routing.fallbackFrom), "muted"));
         lines.push(formatUiKeyValue(ui, "Fallback to", formatRoutingValue(routing.fallbackTo), "muted"));
         lines.push(formatUiKeyValue(ui, "Fallback reason", formatRoutingValue(routing.fallbackReason), routing.fallbackReason ? "warning" : "muted"));
-        lines.push(formatUiKeyValue(ui, "Account pool", formatRoutingValue(routing.accountPoolMode), routing.accountPoolMode === "general-fallback" ? "warning" : "muted"));
+        lines.push(formatUiKeyValue(ui, "Account pool", formatRoutingValue(routing.accountPoolMode), routing.accountPoolMode === "general-fallback" ||
+            routing.accountPoolMode === "strict-unavailable"
+            ? "warning"
+            : "muted"));
         lines.push(formatUiKeyValue(ui, "Configured pool size", String(routing.configuredAccountPoolSize), "muted"));
         if (options.includeExplainability) {
             lines.push("");
@@ -326,6 +330,32 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
             logDebug(`[${PLUGIN_NAME}] Failed to record TUI quota headers: ${error instanceof Error ? error.message : String(error)}`);
         }
     };
+    /**
+     * Take an account out of rotation whenever the backend reports one of its
+     * quota windows as fully spent (issue #218).
+     *
+     * Every Codex response — success or 429 — carries `x-codex-*-used-percent`
+     * and the matching reset time, so the moment an account hits 0% left we
+     * can record it instead of rediscovering it with a failed request on every
+     * subsequent prompt. The block lands on the persisted `rateLimitResetTimes`
+     * map, so it is remembered across restarts and shared with other processes,
+     * and it clears itself once the window rolls over.
+     */
+    const applyQuotaExhaustion = (manager, headers, account, family, model) => {
+        try {
+            const resetAtMs = getQuotaExhaustedResetAtMs(headers);
+            if (resetAtMs === undefined)
+                return;
+            if (!manager.markQuotaExhausted(account, resetAtMs, family, model))
+                return;
+            account.lastSwitchReason = "rate-limit";
+            manager.saveToDiskDebounced();
+            logWarn(`Account ${account.index + 1} (${account.email ?? "unknown"}) has no ${family} quota left; skipping it for ${formatWaitTime(resetAtMs - Date.now())}.`);
+        }
+        catch (error) {
+            logDebug(`[${PLUGIN_NAME}] Failed to apply quota exhaustion: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    };
     const resolveActiveIndex = (storage, family = "codex") => {
         const total = storage.accounts.length;
         if (total === 0)
@@ -1407,6 +1437,8 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                     let restartAccountTraversalWithFallback = false;
                                     let restartAccountTraversalAfterWorkspaceDeactivation = false;
                                     const preferredAccountIds = getModelAccountPool(pluginConfig, model);
+                                    const accountPoolMode = getModelAccountPoolMode(pluginConfig, model);
+                                    const strictAccountPool = preferredAccountIds.length > 0 && accountPoolMode === "strict";
                                     while (attempted.size < Math.max(1, accountCount)) {
                                         const selectionExplainability = accountManager.getSelectionExplainability(modelFamily, model, Date.now());
                                         runtimeMetrics.lastSelectionSnapshot = {
@@ -1423,8 +1455,9 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                             fallbackTo,
                                             fallbackReason,
                                             configuredAccountPoolSize: preferredAccountIds.length,
+                                            accountPoolMode: strictAccountPool ? "strict" : undefined,
                                         };
-                                        const account = accountManager.getAccountForStrategy(rotationStrategy, modelFamily, model, { pidOffsetEnabled }, preferredAccountIds);
+                                        const account = accountManager.getAccountForStrategy(rotationStrategy, modelFamily, model, { pidOffsetEnabled }, preferredAccountIds, accountPoolMode, attempted);
                                         if (!account || attempted.has(account.index)) {
                                             break;
                                         }
@@ -1442,12 +1475,14 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                                 fallbackFrom,
                                                 fallbackTo,
                                                 fallbackReason,
-                                                accountPoolMode: preferredAccountIds.length === 0
-                                                    ? "general"
-                                                    : account.accountId !== undefined &&
-                                                        preferredAccountIds.includes(account.accountId)
-                                                        ? "preferred"
-                                                        : "general-fallback",
+                                                accountPoolMode: strictAccountPool
+                                                    ? "strict"
+                                                    : preferredAccountIds.length === 0
+                                                        ? "general"
+                                                        : account.accountId !== undefined &&
+                                                            preferredAccountIds.includes(account.accountId)
+                                                            ? "preferred"
+                                                            : "general-fallback",
                                                 configuredAccountPoolSize: preferredAccountIds.length,
                                             };
                                         }
@@ -1683,6 +1718,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                                 headers: Object.fromEntries(response.headers.entries()),
                                             });
                                             void recordPromptQuotaHeaders(response, account, accountCount);
+                                            applyQuotaExhaustion(accountManager, response.headers, account, modelFamily, model);
                                             if (!response.ok) {
                                                 const contextOverflowResult = await handleContextOverflow(response, model);
                                                 if (contextOverflowResult.handled) {
@@ -2104,6 +2140,36 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                     if (restartAccountTraversalAfterWorkspaceDeactivation) {
                                         continue;
                                     }
+                                    if (strictAccountPool) {
+                                        const poolWaitMs = accountManager.getMinWaitTimeForFamily(modelFamily, model, preferredAccountIds);
+                                        const effectiveModel = model ?? requestedModel ?? "requested model";
+                                        const waitDetail = poolWaitMs > 0
+                                            ? ` Try again in ${formatWaitTime(poolWaitMs)}.`
+                                            : " Check the pooled accounts with `codex-health`.";
+                                        const message = `Strict account pool unavailable for ${effectiveModel}. ` +
+                                            `None of its ${preferredAccountIds.length} configured account(s) is selectable.` +
+                                            waitDetail;
+                                        if (runtimeMetrics.lastSelectionSnapshot) {
+                                            runtimeMetrics.lastSelectionSnapshot = {
+                                                ...runtimeMetrics.lastSelectionSnapshot,
+                                                accountPoolMode: "strict-unavailable",
+                                            };
+                                        }
+                                        runtimeMetrics.failedRequests++;
+                                        runtimeMetrics.lastError = message;
+                                        runtimeMetrics.lastErrorCategory = "strict-pool-unavailable";
+                                        return new Response(JSON.stringify({
+                                            error: {
+                                                code: "strict_pool_unavailable",
+                                                message,
+                                            },
+                                        }), {
+                                            status: poolWaitMs > 0 ? 429 : 503,
+                                            headers: {
+                                                "content-type": "application/json; charset=utf-8",
+                                            },
+                                        });
+                                    }
                                     const waitMs = accountManager.getMinWaitTimeForFamily(modelFamily, model);
                                     const count = accountManager.getAccountCount();
                                     if (retryAllAccountsRateLimited &&