fix(errorClassifier): classify ChatGPT Web SENTINEL_BLOCKED 403 as FORBIDDEN, enabling combo fallback (#8813)

This commit is contained in:
diegosouzapw
2026-08-07 10:47:57 -03:00
parent 1e15583f29
commit 790a17ac33
3 changed files with 42 additions and 0 deletions

View File

@@ -0,0 +1 @@
- fix(errorClassifier): classify ChatGPT Web SENTINEL_BLOCKED 403 as terminal FORBIDDEN, enabling proper combo fallback (#8813)

View File

@@ -245,6 +245,20 @@ export function classifyProviderError(
if (recoverableProject403) {
return PROVIDER_ERROR_TYPES.PROJECT_ROUTE_ERROR;
}
// #8813 — ChatGPT Web's Cloudflare Sentinel/Turnstile 403 is a TERMINAL
// block: the user's IP/session needs a browser Turnstile challenge, and
// retrying the same connection will keep 403ing. Classify as FORBIDDEN so
// the connection gets banned and combo routing falls back to other providers.
// Must be checked BEFORE the generic apikey-403→null return below, which
// is designed for normal API-key auth 403s that ARE recoverable.
if (
bodyStr.includes("SENTINEL_BLOCKED") ||
/\bSentinel\b[^\n]{0,80}\bblocked\b/i.test(bodyStr) ||
/\bTurnstile required\b/i.test(bodyStr)
) {
return PROVIDER_ERROR_TYPES.FORBIDDEN;
}
if (provider && getProviderCategory(provider) === "apikey") {
return null;
}

View File

@@ -26,6 +26,33 @@ test("control: apikey-provider bare 403 still recoverable (null) — no regressi
assert.equal(classifyProviderError(403, "forbidden", "openai"), null);
});
test("#8813: chatgpt-web SENTINEL_BLOCKED 403 with 'Sentinel/Turnstile required' → FORBIDDEN (terminal)", () => {
// The executor returns error code "SENTINEL_BLOCKED" in the JSON body.
// This is a TERMINAL state — retrying the same blocked session will keep 403ing.
// Must be classified as FORBIDDEN so the circuit breaker marks the connection
// as banned and combo routing falls back to other providers.
const body = JSON.stringify({
error: {
message:
"ChatGPT blocked the request (Sentinel/Turnstile required). Try again later or open chatgpt.com in a browser to refresh state.",
type: "upstream_error",
code: "SENTINEL_BLOCKED",
},
});
assert.equal(
classifyProviderError(403, body, "chatgpt-web"),
PROVIDER_ERROR_TYPES.FORBIDDEN
);
});
test("#8813: chatgpt-web SENTINEL_BLOCKED 403 with raw 'Sentinel blocked' text → FORBIDDEN (terminal)", () => {
// Edge case: when the raw text includes "Sentinel" and 403, classify as terminal.
assert.equal(
classifyProviderError(403, "Sentinel blocked the request", "chatgpt-web"),
PROVIDER_ERROR_TYPES.FORBIDDEN
);
});
test("control: recognized ban phrase on a no-credential provider still terminal (ACCOUNT_DEACTIVATED)", () => {
const body = "This service has been disabled in this account for violation of policy.";
assert.equal(classifyProviderError(403, body, "mimocode"), PROVIDER_ERROR_TYPES.ACCOUNT_DEACTIVATED);