oc-codex-multi-auth 6.3.3 → 6.4.0

package/README.md

@@ -175,6 +175,7 @@ If browser launch is blocked, use the alternate login paths in [docs/getting-sta
 | --- | --- |
 | `codex-list` | Which accounts are saved and which one is active? |
 | `codex-switch` | How do I move to a different saved account? |
+| `codex-warm` | How do I start every account's usage window now (stagger quota cooldowns)? |
 | `codex-status` | Which account, model family, and routing state are active? |
 | `codex-limits` | What quota or rate-limit state is visible now? |
 | `codex-dashboard` | Can I manage accounts from one interactive surface? |

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;AAwM/D;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MAyqH/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;AA0M/D;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,iBAAiB,EAAE,MA8rH/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, getPerProjectAccounts, getEmptyResponseMaxRetries, getEmptyResponseRetryDelayMs, getPidOffsetEnabled, 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, getPerProjectAccounts, getEmptyResponseMaxRetries, getEmptyResponseRetryDelayMs, getPidOffsetEnabled, getRotationStrategy, 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";
@@ -41,7 +41,7 @@ import { AccountManager, extractAccountEmail, extractAccountId, formatAccountLab
 import { resolveDisplayEmail } from "./lib/account-display.js";
 import { CodexAuthError } from "./lib/errors.js";
 import { getStoragePath, loadAccounts, saveAccounts, withAccountStorageTransaction, clearAccounts, setStoragePath, loadFlaggedAccounts, saveFlaggedAccounts, withFlaggedAccountStorageTransaction, clearFlaggedAccounts, getWorkspaceIdentityKey, StorageError, formatStorageErrorHint, } from "./lib/storage.js";
-import { createCodexHeaders, extractRequestUrl, handleErrorResponse, handleSuccessResponse, isDeactivatedWorkspaceError, isInvalidatedAuthTokenError, getUnsupportedCodexModelInfo, resolveUnsupportedCodexFallbackModel, refreshAndUpdateToken, rewriteUrlForCodex, shouldRefreshToken, transformRequestForCodex, } from "./lib/request/fetch-helpers.js";
+import { createCodexHeaders, extractRequestUrl, handleErrorResponse, handleSuccessResponse, isDeactivatedWorkspaceError, isInvalidatedAuthTokenError, createAbortError, getUnsupportedCodexModelInfo, resolveUnsupportedCodexFallbackModel, refreshAndUpdateToken, rewriteUrlForCodex, shouldRefreshToken, transformRequestForCodex, } from "./lib/request/fetch-helpers.js";
 import { createDeactivatedWorkspaceError, DEACTIVATED_WORKSPACE_ERROR_CODE, isDeactivatedWorkspaceErrorMessage, isInvalidatedAuthTokenMessage, } from "./lib/error-sentinels.js";
 import { applyFastSessionDefaults, upsertBackendModelIdentityMessage, } from "./lib/request/request-transformer.js";
 import { getRateLimitBackoff, RATE_LIMIT_SHORT_RETRY_THRESHOLD_MS, resetRateLimitBackoff, } from "./lib/request/rate-limit-backoff.js";
@@ -1127,6 +1127,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                     const emptyResponseMaxRetries = getEmptyResponseMaxRetries(pluginConfig);
                     const emptyResponseRetryDelayMs = getEmptyResponseRetryDelayMs(pluginConfig);
                     const pidOffsetEnabled = getPidOffsetEnabled(pluginConfig);
+                    const rotationStrategy = getRotationStrategy(pluginConfig);
                     const effectiveUserConfig = fastSessionEnabled
                         ? applyFastSessionDefaults(userConfig)
                         : userConfig;
@@ -1299,9 +1300,14 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                     return false;
                                 };
                                 const abortSignal = requestInit?.signal ?? init?.signal ?? null;
+                                // Surface caller-cancellation during retry/backoff waits as a proper
+                                // AbortError (name set) carrying the caller abort reason, mirroring the
+                                // fetch path (Aborted by user) and lib/codex-usage.ts isAbortError. A bare
+                                // new Error("Aborted") was opaque and dropped abortSignal.reason (#176).
+                                const abortError = () => createAbortError(abortSignal);
                                 const sleep = (ms) => new Promise((resolve, reject) => {
                                     if (abortSignal?.aborted) {
-                                        reject(new Error("Aborted"));
+                                        reject(abortError());
                                         return;
                                     }
                                     const timeout = setTimeout(() => {
@@ -1310,7 +1316,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                     }, ms);
                                     const onAbort = () => {
                                         cleanup();
-                                        reject(new Error("Aborted"));
+                                        reject(abortError());
                                     };
                                     const cleanup = () => {
                                         clearTimeout(timeout);
@@ -1323,7 +1329,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                     const endTime = startTime + totalMs;
                                     while (Date.now() < endTime) {
                                         if (abortSignal?.aborted) {
-                                            throw new Error("Aborted");
+                                            throw abortError();
                                         }
                                         const remaining = Math.max(0, endTime - Date.now());
                                         const waitLabel = formatWaitTime(remaining);
@@ -1364,7 +1370,7 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                             fallbackTo,
                                             fallbackReason,
                                         };
-                                        const account = accountManager.getCurrentOrNextForFamilyHybrid(modelFamily, model, { pidOffsetEnabled });
+                                        const account = accountManager.getAccountForStrategy(rotationStrategy, modelFamily, model, { pidOffsetEnabled });
                                         if (!account || attempted.has(account.index)) {
                                             break;
                                         }
@@ -1492,6 +1498,15 @@ export const OpenAIOAuthPlugin = async ({ client }) => {
                                         const tokenConsumed = accountManager.consumeToken(account, modelFamily, model);
                                         if (!tokenConsumed) {
                                             accountManager.recordRateLimit(account, modelFamily, model);
+                                            // Mark a short, auto-expiring rate-limit window for this
+                                            // (family, model) so the depleted account becomes ineligible in
+                                            // `isRateLimitedForFamily`. Without this, drain-first `sticky`
+                                            // (and the `hybrid` fast-path) re-select the SAME depleted account
+                                            // on the next traversal iteration — `attempted` then trips the
+                                            // guard and the loop 503s while other accounts still have quota.
+                                            // The window also feeds `getMinWaitTimeForFamily`, so an all-
+                                            // depleted pool waits for refill instead of failing fast.
+                                            accountManager.markRateLimitedWithReason(account, ACCOUNT_LIMITS.LOCAL_TOKEN_DEPLETION_COOLDOWN_MS, modelFamily, "tokens", model);
                                             runtimeMetrics.accountRotations++;
                                             runtimeMetrics.lastError =
                                                 `Local token bucket depleted for account ${account.index + 1} (${modelFamily}${model ? `:${model}` : ""})`;