Skip to content

Commit 498d53a

Browse files
fix(server): keep a gateway's Claude reset time on a direct 429
1 parent 6ffde5b commit 498d53a

2 files changed

Lines changed: 90 additions & 19 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5526,6 +5526,59 @@ describe("ClaudeAdapterV2 background wake turns", () => {
55265526
),
55275527
);
55285528

5529+
it.effect.each([
5530+
{ cooldown: " (reset after 1h2m3s)", seconds: 3723 },
5531+
{ cooldown: " (reset after 4m 6s) (last error: rate limited)", seconds: 246 },
5532+
{ cooldown: "", seconds: 0 },
5533+
])("keeps a gateway's reset on a direct 429 with cooldown '$cooldown'", (input) =>
5534+
Effect.gen(function* () {
5535+
const harness = yield* makeWakeHarness;
5536+
const now = yield* DateTime.now;
5537+
yield* harness.runtime.startTurn(
5538+
makeClaudeTestTurnInput({
5539+
threadId: harness.threadId,
5540+
providerThread: harness.providerThread,
5541+
now,
5542+
attemptId: RunAttemptId.make("attempt-direct-gateway-limit"),
5543+
text: "Continue.",
5544+
attachments: [],
5545+
}),
5546+
);
5547+
// An API-key session reports a gateway 429 only as text, with no rate_limit_info.
5548+
const result = `API Error: Request rejected (429) · All credentials for model claude-opus-5-5 are cooling down${input.cooldown}`;
5549+
yield* Queue.offerAll(harness.sdkMessages, [
5550+
makeAssistantErrorFrame({
5551+
uuid: "00000000-0000-4000-8000-000000000654",
5552+
error: "rate_limit",
5553+
text: result,
5554+
}),
5555+
makeResultFrame({
5556+
uuid: "00000000-0000-4000-8000-000000000655",
5557+
result,
5558+
terminalReason: "api_error",
5559+
isError: true,
5560+
apiErrorStatus: 429,
5561+
}),
5562+
]);
5563+
const terminal = yield* Queue.take(harness.terminalReceipts);
5564+
assert.equal(terminal.status, "failed");
5565+
if (terminal.status !== "failed") return;
5566+
assert.equal(terminal.failure.class, "usage_limit");
5567+
assert.equal(
5568+
terminal.failure.resetAt,
5569+
input.seconds > 0
5570+
? DateTime.formatIso(
5571+
DateTime.makeUnsafe(DateTime.toEpochMillis(now) + input.seconds * 1_000),
5572+
)
5573+
: null,
5574+
);
5575+
}).pipe(
5576+
Effect.provide(
5577+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5578+
),
5579+
),
5580+
);
5581+
55295582
it.effect("keeps the measured context when a usage limit ends the turn", () =>
55305583
Effect.gen(function* () {
55315584
const harness = yield* makeWakeHarness;

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3503,37 +3503,46 @@ function claudeUsageLimitResetAt(resetsAt: unknown): string | null {
35033503
: null;
35043504
}
35053505

3506+
function gatewayCooldownResetAt(
3507+
cooldown: RegExpExecArray | null,
3508+
completedAt: DateTime.Utc,
3509+
): string | undefined {
3510+
if (cooldown === null) return undefined;
3511+
const seconds =
3512+
Number(cooldown[1] ?? 0) * 3_600 + Number(cooldown[2] ?? 0) * 60 + Number(cooldown[3] ?? 0);
3513+
const resetMs = DateTime.toEpochMillis(completedAt) + seconds * 1_000;
3514+
return seconds > 0 && resetMs < 8.64e15
3515+
? DateTime.formatIso(DateTime.makeUnsafe(resetMs))
3516+
: undefined;
3517+
}
3518+
35063519
function providerFailureFromResult(
35073520
message: SDKResultMessage,
35083521
completedAt: DateTime.Utc,
35093522
failureHint?: string,
35103523
usageLimited = false,
35113524
): OrchestrationV2ProviderFailure | null {
3512-
const gatewayLimit =
3525+
const gatewayResetAt =
35133526
failureHint === undefined &&
35143527
message.subtype === "success" &&
35153528
message.is_error &&
35163529
message.terminal_reason === "api_error" &&
35173530
message.api_error_status === 503
3518-
? /^API Error: 503 \[[^\]\r\n]+\] \[429\]: \{"type":"error","error":\{"type":"rate_limit_error",[^\r\n]*\} \(reset after (?:(\d+)h ?)?(?:(\d+)m ?)?(?:(\d+)s)?\)/.exec(
3519-
message.result,
3531+
? gatewayCooldownResetAt(
3532+
/^API Error: 503 \[[^\]\r\n]+\] \[429\]: \{"type":"error","error":\{"type":"rate_limit_error",[^\r\n]*\} \(reset after (?:(\d+)h ?)?(?:(\d+)m ?)?(?:(\d+)s)?\)/.exec(
3533+
message.result,
3534+
),
3535+
completedAt,
35203536
)
3521-
: null;
3522-
if (gatewayLimit) {
3523-
const seconds =
3524-
Number(gatewayLimit[1] ?? 0) * 3_600 +
3525-
Number(gatewayLimit[2] ?? 0) * 60 +
3526-
Number(gatewayLimit[3] ?? 0);
3527-
const resetMs = DateTime.toEpochMillis(completedAt) + seconds * 1_000;
3528-
if (seconds > 0 && resetMs < 8.64e15) {
3529-
return makeProviderFailure({
3530-
class: "usage_limit",
3531-
message: "Claude API rate limit reached. Try again later.",
3532-
code: "api_error_429",
3533-
retryable: true,
3534-
resetAt: DateTime.formatIso(DateTime.makeUnsafe(resetMs)),
3535-
});
3536-
}
3537+
: undefined;
3538+
if (gatewayResetAt !== undefined) {
3539+
return makeProviderFailure({
3540+
class: "usage_limit",
3541+
message: "Claude API rate limit reached. Try again later.",
3542+
code: "api_error_429",
3543+
retryable: true,
3544+
resetAt: gatewayResetAt,
3545+
});
35373546
}
35383547
const failureClass =
35393548
(message.subtype === "success" && message.api_error_status === 429) || usageLimited
@@ -3562,6 +3571,14 @@ function providerFailureFromResult(
35623571
return null;
35633572
}
35643573
const apiErrorStatus = message.api_error_status ?? null;
3574+
// API-key sessions get no rate_limit_info, so a gateway's 429 carries its reset only as text.
3575+
const resetAt =
3576+
apiErrorStatus === 429 && message.result.startsWith("API Error:")
3577+
? gatewayCooldownResetAt(
3578+
/\(reset after (?:(\d+)h ?)?(?:(\d+)m ?)?(?:(\d+)s)?\)/.exec(message.result),
3579+
completedAt,
3580+
)
3581+
: undefined;
35653582
return makeProviderFailure({
35663583
message: listedError ?? structuredError ?? failureHint ?? message.result,
35673584
code:
@@ -3570,6 +3587,7 @@ function providerFailureFromResult(
35703587
: `api_error_${apiErrorStatus}`,
35713588
class: failureClass,
35723589
retryable: apiErrorStatus === 429 || apiErrorStatus === 529 ? true : null,
3590+
resetAt: resetAt ?? null,
35733591
});
35743592
}
35753593

0 commit comments

Comments
 (0)