The best way to control Claude Code, Codex and more from any computer or phone
fix(server): Claude gateway cooldown survives an untyped SDK rejection (#39695)
Julius Marminge committed
Nov 20, 2026 at 04:42 UTC
e3294d7663a2df5ee6525b8d655bc9ddec4dab04
2 files changed
+23
-4
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+13
-1
@@ -9738,6 +9738,16 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9738
result:
9739
"API Error: Request rejected (429) · All credentials for model claude-opus-5-5 are cooling down (reset after 1m) (last error: All credentials for model upstream are cooling down (reset after 1h))",
9740
},
9741
+ {
9742
+ status: 429,
9743
+ cooldown: "untyped rejection",
9744
+ seconds: 8777,
9745
+ proxy: true,
9746
+ sdkResetSeconds: null,
9747
+ sdkLimitType: null,
9748
+ result:
9749
+ "API Error: Server is temporarily limiting requests (not your usage limit) · All credentials for model claude-opus-5-5 are cooling down (last error: rate_limit_error: This request would exceed your account's rate limit. Please try again later.) (reset after 2h26m17s)",
9750
+ },
9751
])("recovers wrapped gateway limits with status $status and cooldown $cooldown", (input) =>
9752
Effect.gen(function* () {
9753
const harness = yield* makeWakeHarness;
@@ -9759,7 +9769,9 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9769
type: "rate_limit_event",
9770
rate_limit_info: {
9771
status: "rejected",
9762
- rateLimitType: "five_hour",
9772
+ ...(input.sdkLimitType === null
9773
+ ? { isUsingOverage: false }
9774
+ : { rateLimitType: "five_hour" }),
9775
...(input.sdkResetSeconds === null
9776
? {}
9777
: {
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+10
-3
@@ -12125,7 +12125,14 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
12125
failureHint,
12126
usageLimited,
12127
);
12128
- const resetTimes = Array.from(context.rateLimitResetTimes.values());
12128
+ const resultResetAt =
12129
+ resultFailure?.class === "usage_limit" ? resultFailure.resetAt : null;
12130
+ // An untyped rejection without a reset is the gateway's own 429; its text names the reset.
12131
+ const resetTimes = Array.from(context.rateLimitResetTimes)
12132
+ .filter(
12133
+ ([type, time]) => !(type === "unknown" && time === null && resultResetAt != null),
12134
+ )
12135
+ .map(([, time]) => time);
12136
const assistantLimit = context.latestAssistantRateLimit;
12137
if (
12138
assistantLimit?.type != null &&
@@ -12133,8 +12140,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
12140
) {
12141
resetTimes.push(assistantLimit.resetAt);
12142
}
12136
- if (resultFailure?.class === "usage_limit" && resultFailure.resetAt != null) {
12137
- resetTimes.push(resultFailure.resetAt);
12143
+ if (resultResetAt != null) {
12144
+ resetTimes.push(resultResetAt);
12145
}
12146
const resetAt =
12147
resetTimes.length > 0 && resetTimes.every((time) => time !== null)