Skip to content

Commit 61867e0

Browse files
zedong-pengclaude
andcommitted
fix(server): count a replayed wake result's gateway reset from when it arrived
A wake result that arrives while no turn is active is buffered and replayed when the continuation run starts. The wrapped gateway 503 reports a relative "(reset after …)" duration, which was added to the replay time, so any time the continuation spent queued was added to resetAt. Record when each wake result is buffered and use that as the base for the relative reset. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 3816296 commit 61867e0

2 files changed

Lines changed: 85 additions & 3 deletions

File tree

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8950,6 +8950,78 @@ describe("ClaudeAdapterV2 background wake turns", () => {
89508950
),
89518951
);
89528952

8953+
it.effect("anchors a replayed wake gateway limit to when its result arrived", () =>
8954+
Effect.scoped(
8955+
Effect.gen(function* () {
8956+
const harness = yield* makeWakeHarness;
8957+
const now = yield* DateTime.now;
8958+
8959+
yield* harness.runtime.startTurn(
8960+
makeClaudeTestTurnInput({
8961+
threadId: harness.threadId,
8962+
providerThread: harness.providerThread,
8963+
now,
8964+
attemptId: RunAttemptId.make("attempt-claude-wake-gateway-1"),
8965+
text: "Run the build in the background.",
8966+
attachments: [],
8967+
}),
8968+
);
8969+
yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
8970+
yield* Queue.offer(harness.sdkMessages, turnOneResult);
8971+
yield* Queue.take(harness.terminalReceipts);
8972+
8973+
yield* Queue.offer(harness.sdkMessages, wakeNotification);
8974+
yield* harness.offerAndWait(
8975+
makeAssistantErrorFrame({
8976+
uuid: "00000000-0000-4000-8000-000000000634",
8977+
error: "server_error",
8978+
}),
8979+
);
8980+
assert.lengthOf(harness.continuationRequests, 1);
8981+
yield* harness.offerAndWait(
8982+
makeResultFrame({
8983+
uuid: "00000000-0000-4000-8000-000000000635",
8984+
result:
8985+
'API Error: 503 [claude/claude-opus-5-5] [429]: {"type":"error","error":{"type":"rate_limit_error","message":"Please try again later."}} (reset after 2h).',
8986+
terminalReason: "api_error",
8987+
isError: true,
8988+
apiErrorStatus: 503,
8989+
origin: { kind: "task-notification" },
8990+
}),
8991+
);
8992+
const arrivedAt = yield* DateTime.now;
8993+
// The continuation run can queue behind other runs before it replays the buffer.
8994+
yield* TestClock.adjust("1 hour");
8995+
8996+
yield* harness.runtime.startTurn(
8997+
makeClaudeTestTurnInput({
8998+
threadId: harness.threadId,
8999+
providerThread: harness.providerThread,
9000+
now: yield* DateTime.now,
9001+
attemptId: RunAttemptId.make("attempt-claude-wake-gateway-2"),
9002+
text: "Background task completed.",
9003+
attachments: [],
9004+
providerTurnOrdinal: 2,
9005+
messageCreatedBy: "agent",
9006+
messageCreationSource: "provider",
9007+
}),
9008+
);
9009+
const terminal = yield* Queue.take(harness.terminalReceipts);
9010+
assert.equal(terminal.status, "failed");
9011+
if (terminal.status !== "failed") return;
9012+
assert.equal(terminal.failure.class, "usage_limit");
9013+
assert.equal(
9014+
terminal.failure.resetAt,
9015+
DateTime.formatIso(DateTime.add(arrivedAt, { hours: 2 })),
9016+
);
9017+
}).pipe(
9018+
Effect.provide(
9019+
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9020+
),
9021+
),
9022+
),
9023+
);
9024+
89539025
it.effect("leaves buffered wake messages for the continuation queued behind a user turn", () =>
89549026
Effect.scoped(
89559027
Effect.gen(function* () {

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3429,7 +3429,7 @@ function claudeUsageLimitResetAt(resetsAt: unknown): string | null {
34293429

34303430
function providerFailureFromResult(
34313431
message: SDKResultMessage,
3432-
completedAt: DateTime.Utc,
3432+
receivedAt: DateTime.Utc,
34333433
failureHint?: string,
34343434
usageLimited = false,
34353435
): OrchestrationV2ProviderFailure | null {
@@ -3448,7 +3448,7 @@ function providerFailureFromResult(
34483448
Number(gatewayLimit[1] ?? 0) * 3_600 +
34493449
Number(gatewayLimit[2] ?? 0) * 60 +
34503450
Number(gatewayLimit[3] ?? 0);
3451-
const resetMs = DateTime.toEpochMillis(completedAt) + seconds * 1_000;
3451+
const resetMs = DateTime.toEpochMillis(receivedAt) + seconds * 1_000;
34523452
if (seconds > 0 && resetMs < 8.64e15) {
34533453
return makeProviderFailure({
34543454
class: "usage_limit",
@@ -4464,6 +4464,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
44644464
>();
44654465
// Buffered idle outcomes must not settle a resumed child again.
44664466
const appliedSubagentOutcomes = new WeakSet<SDKMessage>();
4467+
// Wake results replay later; relative gateway resets count from arrival, not replay.
4468+
const wakeResultArrivals = new WeakMap<SDKMessage, DateTime.Utc>();
44674469
// Subagent frames can precede the task_started that registers their owner.
44684470
const pendingSubagentFramesByToolUseId = yield* Ref.make(
44694471
new Map<string, ReadonlyArray<SDKMessage>>(),
@@ -7520,6 +7522,9 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
75207522
childThreadId: registered?.childThreadId,
75217523
});
75227524
}
7525+
if (message.type === "result" && !wakeResultArrivals.has(message)) {
7526+
wakeResultArrivals.set(message, yield* DateTime.now);
7527+
}
75237528
yield* Ref.update(wakeBuffers, (current) => {
75247529
const existing = current.get(wakeInput.nativeThreadId);
75257530
const updated = new Map(current);
@@ -8950,7 +8955,12 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
89508955
message: limitedCompaction.message ?? failureHint,
89518956
code: "compaction_failed",
89528957
})
8953-
: providerFailureFromResult(message, completedAt, failureHint, usageLimited);
8958+
: providerFailureFromResult(
8959+
message,
8960+
wakeResultArrivals.get(message) ?? completedAt,
8961+
failureHint,
8962+
usageLimited,
8963+
);
89548964
const terminalFailure =
89558965
resultFailure?.class === "usage_limit"
89568966
? { ...resultFailure, resetAt: resetAt ?? resultFailure.resetAt ?? null }

0 commit comments

Comments
 (0)