Repository navigation
[WRONG BRANCH] fix(pool): rotate Anthropic pool accounts on out-of-extra-usage 400 - #25
Conversation
Anthropic answers an account whose plan and extra usage are spent with
HTTP 400 ("You're out of extra usage", "Third-party apps now draw from
your extra usage"), not 429. Since #8/#11 src/lib/errors.ts classifies
both as insufficient_quota, so a combo hops on them, but the Anthropic
account pool still rotated on status 429 only (adapter-dispatch,
adapter-continuation, and the web-search/image sidecar loops). One spent
pool account therefore failed the request while the other pool accounts
sat idle; on a hosted gateway, which has no combo, the caller got the
error.
Add src/oauth/anthropic-pool-rotation.ts: isPoolRotatableStatus() and
peekAnthropicPoolRotation() decide the trigger ("429" or "quota-400").
A 400 counts only when the existing classifyError() says
insufficient_quota, so no message wording is duplicated, and any other
400 (a malformed request) is passed through untouched. The 400 body is
read with the bounded peek the key-pool 429 path already uses
(readQuotaResetAt, which now also returns the peeked text), and the
returned response replays it.
All three rotation sites use the helper. The sidecar hook moves only the
Anthropic pool on a quota-400; key pools and the generic OAuth roster
still rotate on 429 alone.
rotateAnthropicAccountOn429() takes the trigger. On a quota-400 it always
cools the account (the 400 is quota evidence even if the unified status
header still reads "allowed"), using the same Retry-After, then
rejected-window reset, as a quota 429. With neither, it falls back to 10
minutes, the cooldown the combo layer gives the same insufficient_quota
code, not the 60s rate-limit default that would send the next request
back to the spent account a minute later.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
✅ Deterministic PR hygiene checks passed. |
⏳ DRAFT
What to do
Its title has been prefixed with |
|
qa-sec (Mars) at head The direction is right: rotating a spent pool account on Anthropic's out-of-extra-usage 400, a 10 min fallback cooldown, and pass-through of other 400s. The peek and replay are bounded, an abort returns 499, and the sidecar keeps key pools and generic OAuth on 429 only. Two items before merge: R1: any 400 that merely contains quota wording benches pool accounts, including text the client controls. R2: the test payloads are hand-written (REAL-PAYLOAD-RATCHET, Vadym 20263). LOW (not blocking):
A new push voids this. Re-review takes about 15 min after the fix. |
…ct phrases Security review (Mars, RED R1): isQuotaExhaustedBadRequest ran the whole 400 message through classifyError, which matches quota words anywhere in the text. Anthropic's validation 400s echo client values back (tool ids, model names, prompt text), so one crafted request such as a tool_use id "toolu_insufficient_quota" could cool every pool account for 10 minutes. The 400 now counts only when the body is Anthropic's JSON error envelope (type "error", error.type "invalid_request_error") and error.message, after leading whitespace, starts (case-insensitive) with "You're out of extra usage" (straight or curly apostrophe) or "Third-party apps now draw from your extra usage". A non-JSON body, another error type, a missing envelope, or the wording anywhere but the start never rotates. classifyError is no longer used here; combo classification is unchanged. R2 (REAL-PAYLOAD-RATCHET): the third-party test payload is now the real recorded Anthropic 400 (staging gateway log line, 2026-11-11), copied byte-identical from AgentRadarLabs/agentradar-paperclip fixtures/external/anthropic-extra-usage-thirdparty-400.txt @ 615ec8db69 into fixtures/external/anthropic/ with a README saying where it came from. No real "You're out of extra usage" body has been recorded anywhere (paperclip marks its sample "derived"), so that wording stays a typed test string. New must-fail tests (5 fail on the previous commit): a 400 echoing toolu_insufficient_quota neither rotates nor changes on its way to the caller; the wording mid-message does not rotate; the right wording in a wrong envelope (rate_limit_error, api_error, missing type "error", non-string message, array body) does not rotate; raw non-JSON text does not rotate. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
qa-sec (Mars) re-review at head I read the change from 0220374 to 0f57c1e (one commit):
Merge only when Liza reopens release/* merges after the 1115a cut, at this exact head. A new push voids this GREEN. |
The fix commits on this branch inherited 2.65.0-vadymhimself.21, which names an already-published tag, so release-version-line failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
qa-sec (Mars) re-stamp at head
|
4577636
into
release/2.65.0-vadymhimself.15
Why (AGE-167)
Anthropic answers an account whose plan and extra usage are spent with HTTP 400 ("You're out of extra usage" / "Third-party apps now draw from your extra usage"), not 429. Since #8/#11
classifyErrormaps both toinsufficient_quota, so combos hop, but the Anthropic account pool only rotated on 429. One spent pool account failed the request while the other pool accounts sat idle; a hosted gateway (no combo) returned the error to the agent.What
src/oauth/anthropic-pool-rotation.ts:isPoolRotatableStatus()/peekAnthropicPoolRotation()→ trigger"429"or"quota-400". A 400 counts only when the existingclassifyErrorsaysinsufficient_quota; every other 400 (malformed request) passes through untouched. Body read with the existing bounded peek (readQuotaResetAt, now also returns the text) and replayed.adapter-dispatch,adapter-continuation, sidecar hook (sidecar-execution,images/loop,web-search/loop). On a quota-400 only the Anthropic pool rotates; key pools and generic OAuth still rotate on 429 alone.rotateAnthropicAccountOn429(..., trigger): a quota-400 always cools the account (Retry-After → rejected-window reset → 10 min fallback, matching the combo layer'sinsufficient_quotacooldown instead of the 60 s rate-limit default).Tests
tests/adapters/anthropic/anthropic-pool-extra-usage-400.test.ts(9): out-of-extra-usage A→B succeeds; third-party-apps 400 rotates; role-order 400 does not rotate and reaches the caller; helper + cooldown units. 2 of them fail without the dispatch change.tscleft to CI (the 2 GB workspace cannot hold it); scoped type checks over every changed file are clean.Eval added/updated: N/A gateway-internal pool rotation, no agent-visible behaviour scenario; covered by the unit tests above.
Known red: enforce-target "wrong base (release/…)" (as on every release-line PR).
🤖 Generated with Claude Code