From 737aed4032384700c94ad85a824f05f891f0fcc0 Mon Sep 17 00:00:00 2001 From: EvgeniyGospk Date: Mon, 20 Apr 2026 18:53:21 +0300 Subject: [PATCH] chore: prepare v1.3.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix "Usage API returned 403" across all accounts and recover rotation health. Root cause: OpenAI deprecated /backend-api/wham/usage for Codex OAuth tokens (returns 403 for every token, including active ChatGPT Pro). The plugin then marked every account as authInvalid and stopped routing ("No available accounts after filtering"). Changes: - usage-limits: switch to /backend-api/codex/usage (live endpoint) with the `originator: codex_cli_rs` header to bypass Cloudflare default gating. - usage-limits: retry up to 3 times with backoff on Cloudflare HTML 403 challenges (per-IP bursts trigger those; proper JSON errors are not retried). - usage-limits: split 401 vs 403 classification — 403 falls through to the probe path instead of marking the token as invalid. - limits-refresh: auto-clear authInvalid / authInvalidatedAt on any successful refresh so stale flags from earlier 403s recover automatically. - refresh-queue: default concurrency lowered 20 -> 5 to stay below Cloudflare's /codex/usage per-IP threshold. The OPENCODE_MULTI_AUTH_REFRESH_QUEUE_CONCURRENCY env override is unchanged. - probe-limits: honor CODEX_CLI_BIN env var so operators can point the spawn probe at a newer `codex` binary. - Rebuild dist/. Co-Authored-By: Claude Opus 4.7 (1M context) --- dist/limits-refresh.d.ts.map | 2 +- dist/limits-refresh.js | 11 ++++-- dist/limits-refresh.js.map | 2 +- dist/probe-limits.d.ts.map | 2 +- dist/probe-limits.js | 5 ++- dist/probe-limits.js.map | 2 +- dist/refresh-queue.d.ts.map | 2 +- dist/refresh-queue.js | 7 +++- dist/refresh-queue.js.map | 2 +- dist/usage-limits.d.ts.map | 2 +- dist/usage-limits.js | 67 ++++++++++++++++++++++++++++-------- dist/usage-limits.js.map | 2 +- package-lock.json | 4 +-- package.json | 2 +- src/limits-refresh.ts | 11 ++++-- src/probe-limits.ts | 5 ++- src/refresh-queue.ts | 7 +++- src/usage-limits.ts | 65 ++++++++++++++++++++++++++-------- 18 files changed, 152 insertions(+), 48 deletions(-) diff --git a/dist/limits-refresh.d.ts.map b/dist/limits-refresh.d.ts.map index 39701ad..138c2db 100644 --- a/dist/limits-refresh.d.ts.map +++ b/dist/limits-refresh.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"limits-refresh.d.ts","sourceRoot":"","sources":["../src/limits-refresh.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyG1G;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAkB/B"} \ No newline at end of file +{"version":3,"file":"limits-refresh.d.ts","sourceRoot":"","sources":["../src/limits-refresh.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgH1G;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAkB/B"} \ No newline at end of file diff --git a/dist/limits-refresh.js b/dist/limits-refresh.js index 75aaadc..46461e9 100644 --- a/dist/limits-refresh.js +++ b/dist/limits-refresh.js @@ -16,7 +16,11 @@ export async function refreshRateLimitsForAccount(account) { limitStatus: 'success', limitError: undefined, lastLimitProbeAt: now, - limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success') + limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success'), + // A successful usage-API refresh proves the token is valid. Clear any + // stale authInvalid flag so the account re-enters rotation. + authInvalid: false, + authInvalidatedAt: undefined }; if (usage.planType) { updates.planType = usage.planType; @@ -85,7 +89,10 @@ export async function refreshRateLimitsForAccount(account) { limitStatus: 'success', limitError: undefined, lastLimitProbeAt: now, - limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success') + limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success'), + // A successful probe proves the token is valid; clear authInvalid. + authInvalid: false, + authInvalidatedAt: undefined }); logInfo(`Limits refreshed for ${account.alias} using model ${probe.probeModel || 'unknown'}, effort ${probe.probeEffort || 'default'}`); return { alias: account.alias, updated: true }; diff --git a/dist/limits-refresh.js.map b/dist/limits-refresh.js.map index f7669de..5da3a7d 100644 --- a/dist/limits-refresh.js.map +++ b/dist/limits-refresh.js.map @@ -1 +1 @@ -{"version":3,"file":"limits-refresh.js","sourceRoot":"","sources":["../src/limits-refresh.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"limits-refresh.js","sourceRoot":"","sources":["../src/limits-refresh.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/probe-limits.d.ts.map b/dist/probe-limits.d.ts.map index 919cf18..9777215 100644 --- a/dist/probe-limits.d.ts.map +++ b/dist/probe-limits.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"probe-limits.d.ts","sourceRoot":"","sources":["../src/probe-limits.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAUvE,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAyLD,wBAAgB,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAa/D;AAGD,wBAAgB,cAAc,IAAI,MAAM,CAMvC;AAED,wBAAgB,cAAc,IAAI,MAAM,EAAE,CASzC;AAoED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CA0FjG;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC"} \ No newline at end of file +{"version":3,"file":"probe-limits.d.ts","sourceRoot":"","sources":["../src/probe-limits.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAUvE,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAyLD,wBAAgB,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAa/D;AAGD,wBAAgB,cAAc,IAAI,MAAM,CAMvC;AAED,wBAAgB,cAAc,IAAI,MAAM,EAAE,CASzC;AAuED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CA0FjG;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC"} \ No newline at end of file diff --git a/dist/probe-limits.js b/dist/probe-limits.js index 4a85424..6a9d2b6 100644 --- a/dist/probe-limits.js +++ b/dist/probe-limits.js @@ -224,7 +224,10 @@ async function runCodexExec(codexHome, model, effort) { let stderr = ''; let stdout = ''; const startTime = Date.now(); - const child = spawn('codex', args, { + // Allow overriding the codex binary (e.g. point at a newer + // `codex` build shipped with the VS Code extension) via env var. + const codexBin = process.env.CODEX_CLI_BIN?.trim() || 'codex'; + const child = spawn(codexBin, args, { env: { ...process.env, CODEX_HOME: codexHome }, stdio: ['ignore', 'pipe', 'pipe'] }); diff --git a/dist/probe-limits.js.map b/dist/probe-limits.js.map index 01cfe56..e9abd41 100644 --- a/dist/probe-limits.js.map +++ b/dist/probe-limits.js.map @@ -1 +1 @@ -{"version":3,"file":"probe-limits.js","sourceRoot":"","sources":["../src/probe-limits.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"probe-limits.js","sourceRoot":"","sources":["../src/probe-limits.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/refresh-queue.d.ts.map b/dist/refresh-queue.d.ts.map index 8ac7c9a..a4169a7 100644 --- a/dist/refresh-queue.d.ts.map +++ b/dist/refresh-queue.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"refresh-queue.d.ts","sourceRoot":"","sources":["../src/refresh-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAG1F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAMpD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,OAAO,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,kBAAkB,EAAE,CAAA;CAC9B;AAKD,wBAAgB,oBAAoB,IAAI,iBAAiB,GAAG,IAAI,CAE/D;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAKvC;AA4FD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAuCnG"} \ No newline at end of file +{"version":3,"file":"refresh-queue.d.ts","sourceRoot":"","sources":["../src/refresh-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAG1F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAWpD,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,OAAO,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,kBAAkB,EAAE,CAAA;CAC9B;AAKD,wBAAgB,oBAAoB,IAAI,iBAAiB,GAAG,IAAI,CAE/D;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAKvC;AA4FD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAuCnG"} \ No newline at end of file diff --git a/dist/refresh-queue.js b/dist/refresh-queue.js index 9ef00f8..35844c2 100644 --- a/dist/refresh-queue.js +++ b/dist/refresh-queue.js @@ -1,7 +1,12 @@ import { refreshRateLimitsForAccount } from './limits-refresh.js'; import { updateAccount } from './store.js'; import { logInfo, logWarn } from './logger.js'; -const DEFAULT_REFRESH_QUEUE_CONCURRENCY = 20; +// Keep the default well below Cloudflare's per-IP burst threshold for +// /backend-api/codex/usage. 20 reliably triggers HTML challenges once the +// window fills; 5 refreshes 20+ accounts in a few seconds without throttling. +// The env override (OPENCODE_MULTI_AUTH_REFRESH_QUEUE_CONCURRENCY) lets +// power users raise it on a shared/high-reputation egress. +const DEFAULT_REFRESH_QUEUE_CONCURRENCY = 5; const MAX_REFRESH_QUEUE_CONCURRENCY = 20; const REFRESH_QUEUE_CONCURRENCY_ENV = 'OPENCODE_MULTI_AUTH_REFRESH_QUEUE_CONCURRENCY'; let queueState = null; diff --git a/dist/refresh-queue.js.map b/dist/refresh-queue.js.map index beaedff..b53091c 100644 --- a/dist/refresh-queue.js.map +++ b/dist/refresh-queue.js.map @@ -1 +1 @@ -{"version":3,"file":"refresh-queue.js","sourceRoot":"","sources":["../src/refresh-queue.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"refresh-queue.js","sourceRoot":"","sources":["../src/refresh-queue.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/usage-limits.d.ts.map b/dist/usage-limits.d.ts.map index 5c2d1ed..598a048 100644 --- a/dist/usage-limits.d.ts.map +++ b/dist/usage-limits.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"usage-limits.d.ts","sourceRoot":"","sources":["../src/usage-limits.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAmB,MAAM,YAAY,CAAA;AAoCxF,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,0BAA0B,CAAC,EAAE,MAAM,CAAA;IACnC,MAAM,EAAE,WAAW,CAAA;CACpB;AAED,UAAU,6BAA6B;IACrC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,0BAA0B,CAAC,EAAE,MAAM,CAAA;CACpC;AAoED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,6BAA6B,CA6B/B;AAED,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,yBAAyB,CAAC,CAgFpC"} \ No newline at end of file +{"version":3,"file":"usage-limits.d.ts","sourceRoot":"","sources":["../src/usage-limits.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAmB,MAAM,YAAY,CAAA;AAoCxF,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,0BAA0B,CAAC,EAAE,MAAM,CAAA;IACnC,MAAM,EAAE,WAAW,CAAA;CACpB;AAED,UAAU,6BAA6B;IACrC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,0BAA0B,CAAC,EAAE,MAAM,CAAA;CACpC;AAoED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,6BAA6B,CAuC/B;AAED,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,yBAAyB,CAAC,CA2GpC"} \ No newline at end of file diff --git a/dist/usage-limits.js b/dist/usage-limits.js index e51aa05..278dd17 100644 --- a/dist/usage-limits.js +++ b/dist/usage-limits.js @@ -65,12 +65,21 @@ export function classifyUsageApiFailure(status, rawText) { .filter(Boolean) .join(' ') .toLowerCase(); - if (status === 401 || status === 403) { + if (status === 401) { return { shouldProbeFallback: false, authInvalid: true }; } + // 403 on the Codex usage endpoint is most often a Cloudflare per-IP gate + // rather than a truly invalid token (the same token still chats fine). + // Fall through to the probe path and do not mark auth as invalid. + if (status === 403) { + return { + shouldProbeFallback: true, + authInvalid: false + }; + } if (status === 402 && (normalized.includes('deactivated_workspace') || normalized.includes('deactivated workspace'))) { @@ -90,31 +99,59 @@ export async function fetchUsageRateLimitsForAccount(account) { error: 'Missing access token' }; } - const url = `${getUsageBaseUrl()}/wham/usage`; + // OpenAI deprecated /wham/usage for Codex OAuth tokens (returns 403 for all + // tokens including active Pro plans). The live Codex usage endpoint is + // /backend-api/codex/usage and requires the `originator` header to avoid + // Cloudflare challenges. + const url = `${getUsageBaseUrl()}/codex/usage`; const headers = { Authorization: `Bearer ${token}`, - 'User-Agent': 'codex-cli' + 'User-Agent': 'codex_cli_rs/0.122.0 (linux)', + originator: 'codex_cli_rs' }; if (account.accountId) { headers['ChatGPT-Account-Id'] = account.accountId; } + // Retry a small number of times on Cloudflare HTML challenges (403 with HTML + // body). These appear under per-IP bursts; proper JSON error responses are + // not retried. + const maxAttempts = 3; let res; - try { - res = await fetch(url, { method: 'GET', headers }); - } - catch (err) { + let rawText = ''; + let lastErr; + for (let attempt = 0; attempt < maxAttempts; attempt++) { + try { + res = await fetch(url, { method: 'GET', headers }); + } + catch (err) { + lastErr = err; + if (attempt === maxAttempts - 1) { + return { + source: 'usage-api', + error: `Usage API request failed: ${err}` + }; + } + await new Promise((r) => setTimeout(r, 500 + attempt * 1500)); + continue; + } + try { + rawText = await res.text(); + } + catch { + rawText = ''; + } + const isCloudflareChallenge = res.status === 403 && + rawText.trimStart().slice(0, 16).toLowerCase().includes(' setTimeout(r, 1000 + attempt * 2000)); + } + if (!res) { return { source: 'usage-api', - error: `Usage API request failed: ${err}` + error: `Usage API request failed: ${lastErr}` }; } - let rawText = ''; - try { - rawText = await res.text(); - } - catch { - rawText = ''; - } if (!res.ok) { const trimmed = rawText.trim(); const classification = classifyUsageApiFailure(res.status, rawText); diff --git a/dist/usage-limits.js.map b/dist/usage-limits.js.map index 8b4a74f..84009b2 100644 --- a/dist/usage-limits.js.map +++ b/dist/usage-limits.js.map @@ -1 +1 @@ -{"version":3,"file":"usage-limits.js","sourceRoot":"","sources":["../src/usage-limits.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"usage-limits.js","sourceRoot":"","sources":["../src/usage-limits.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b72ecda..993db19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@guard22/opencode-multi-auth-codex", - "version": "1.2.0", + "version": "1.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@guard22/opencode-multi-auth-codex", - "version": "1.2.0", + "version": "1.3.0", "license": "MIT", "dependencies": { "@openauthjs/openauth": "^0.4.3" diff --git a/package.json b/package.json index 931235b..45851e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@guard22/opencode-multi-auth-codex", - "version": "1.2.0", + "version": "1.3.0", "description": "Multi-account OAuth rotation for OpenAI Codex with auto model discovery", "type": "module", "main": "./dist/index.js", diff --git a/src/limits-refresh.ts b/src/limits-refresh.ts index e1ad8af..f1dfb2f 100644 --- a/src/limits-refresh.ts +++ b/src/limits-refresh.ts @@ -30,7 +30,11 @@ export async function refreshRateLimitsForAccount(account: AccountCredentials): limitStatus: 'success', limitError: undefined, lastLimitProbeAt: now, - limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success') + limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success'), + // A successful usage-API refresh proves the token is valid. Clear any + // stale authInvalid flag so the account re-enters rotation. + authInvalid: false, + authInvalidatedAt: undefined } if (usage.planType) { updates.planType = usage.planType @@ -118,7 +122,10 @@ export async function refreshRateLimitsForAccount(account: AccountCredentials): limitStatus: 'success', limitError: undefined, lastLimitProbeAt: now, - limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success') + limitsConfidence: calculateLimitsConfidence(now, account.lastLimitErrorAt, 'success'), + // A successful probe proves the token is valid; clear authInvalid. + authInvalid: false, + authInvalidatedAt: undefined }) logInfo(`Limits refreshed for ${account.alias} using model ${probe.probeModel || 'unknown'}, effort ${probe.probeEffort || 'default'}`) diff --git a/src/probe-limits.ts b/src/probe-limits.ts index 1c8cc72..8545f24 100644 --- a/src/probe-limits.ts +++ b/src/probe-limits.ts @@ -272,7 +272,10 @@ async function runCodexExec( let stdout = '' const startTime = Date.now() - const child = spawn('codex', args, { + // Allow overriding the codex binary (e.g. point at a newer + // `codex` build shipped with the VS Code extension) via env var. + const codexBin = process.env.CODEX_CLI_BIN?.trim() || 'codex' + const child = spawn(codexBin, args, { env: { ...process.env, CODEX_HOME: codexHome }, stdio: ['ignore', 'pipe', 'pipe'] }) diff --git a/src/refresh-queue.ts b/src/refresh-queue.ts index deb8f8a..3493000 100644 --- a/src/refresh-queue.ts +++ b/src/refresh-queue.ts @@ -3,7 +3,12 @@ import { updateAccount } from './store.js' import { logInfo, logWarn } from './logger.js' import type { AccountCredentials } from './types.js' -const DEFAULT_REFRESH_QUEUE_CONCURRENCY = 20 +// Keep the default well below Cloudflare's per-IP burst threshold for +// /backend-api/codex/usage. 20 reliably triggers HTML challenges once the +// window fills; 5 refreshes 20+ accounts in a few seconds without throttling. +// The env override (OPENCODE_MULTI_AUTH_REFRESH_QUEUE_CONCURRENCY) lets +// power users raise it on a shared/high-reputation egress. +const DEFAULT_REFRESH_QUEUE_CONCURRENCY = 5 const MAX_REFRESH_QUEUE_CONCURRENCY = 20 const REFRESH_QUEUE_CONCURRENCY_ENV = 'OPENCODE_MULTI_AUTH_REFRESH_QUEUE_CONCURRENCY' diff --git a/src/usage-limits.ts b/src/usage-limits.ts index 7035d32..17dfe6a 100644 --- a/src/usage-limits.ts +++ b/src/usage-limits.ts @@ -130,13 +130,23 @@ export function classifyUsageApiFailure( .join(' ') .toLowerCase() - if (status === 401 || status === 403) { + if (status === 401) { return { shouldProbeFallback: false, authInvalid: true } } + // 403 on the Codex usage endpoint is most often a Cloudflare per-IP gate + // rather than a truly invalid token (the same token still chats fine). + // Fall through to the probe path and do not mark auth as invalid. + if (status === 403) { + return { + shouldProbeFallback: true, + authInvalid: false + } + } + if ( status === 402 && ( @@ -165,32 +175,59 @@ export async function fetchUsageRateLimitsForAccount( } } - const url = `${getUsageBaseUrl()}/wham/usage` + // OpenAI deprecated /wham/usage for Codex OAuth tokens (returns 403 for all + // tokens including active Pro plans). The live Codex usage endpoint is + // /backend-api/codex/usage and requires the `originator` header to avoid + // Cloudflare challenges. + const url = `${getUsageBaseUrl()}/codex/usage` const headers: Record = { Authorization: `Bearer ${token}`, - 'User-Agent': 'codex-cli' + 'User-Agent': 'codex_cli_rs/0.122.0 (linux)', + originator: 'codex_cli_rs' } if (account.accountId) { headers['ChatGPT-Account-Id'] = account.accountId } + // Retry a small number of times on Cloudflare HTML challenges (403 with HTML + // body). These appear under per-IP bursts; proper JSON error responses are + // not retried. + const maxAttempts = 3 let res: Response - try { - res = await fetch(url, { method: 'GET', headers }) - } catch (err) { + let rawText = '' + let lastErr: unknown + for (let attempt = 0; attempt < maxAttempts; attempt++) { + try { + res = await fetch(url, { method: 'GET', headers }) + } catch (err) { + lastErr = err + if (attempt === maxAttempts - 1) { + return { + source: 'usage-api', + error: `Usage API request failed: ${err}` + } + } + await new Promise((r) => setTimeout(r, 500 + attempt * 1500)) + continue + } + try { + rawText = await res.text() + } catch { + rawText = '' + } + const isCloudflareChallenge = + res.status === 403 && + rawText.trimStart().slice(0, 16).toLowerCase().includes(' setTimeout(r, 1000 + attempt * 2000)) + } + if (!res!) { return { source: 'usage-api', - error: `Usage API request failed: ${err}` + error: `Usage API request failed: ${lastErr}` } } - let rawText = '' - try { - rawText = await res.text() - } catch { - rawText = '' - } - if (!res.ok) { const trimmed = rawText.trim() const classification = classifyUsageApiFailure(res.status, rawText)