Skip to content

Commit 4a5f39d

Browse files
vitalyiegorovclaude
andcommitted
fix(claude): name the usage limit on retried turns too
The CLI re-sends the assistant rate_limit error on every limited turn but the rate_limit_event only when the state changes, so a retry while still limited fell back to the generic API error. Latch the assistant error like the sign-out case. Co-Authored-By: Claude Fable 5.1 <[email protected]>
1 parent 1d1bf50 commit 4a5f39d

2 files changed

Lines changed: 160 additions & 1 deletion

File tree

‎apps/server/src/provider/Layers/ClaudeAdapter.test.ts‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2367,6 +2367,156 @@ describe("ClaudeAdapterLive", () => {
23672367
);
23682368
});
23692369

2370+
const USAGE_LIMIT_MESSAGE =
2371+
"Claude usage limit reached. Send the message again once the limit resets.";
2372+
2373+
const limitedAssistant = (uuid: string, error: string) =>
2374+
({
2375+
type: "assistant",
2376+
session_id: "sdk-session-limit-retry",
2377+
uuid,
2378+
parent_tool_use_id: null,
2379+
error,
2380+
is_api_error_message: true,
2381+
message: {
2382+
id: `assistant-message-${uuid}`,
2383+
model: "<synthetic>",
2384+
content: [
2385+
{
2386+
type: "text",
2387+
text: "You've hit your session limit · resets 9:20pm (Europe/Vienna)",
2388+
},
2389+
],
2390+
},
2391+
}) as unknown as SDKMessage;
2392+
2393+
const apiErrorResult = (uuid: string) =>
2394+
({
2395+
type: "result",
2396+
subtype: "success",
2397+
is_error: false,
2398+
terminal_reason: "api_error",
2399+
errors: [],
2400+
session_id: "sdk-session-limit-retry",
2401+
uuid,
2402+
}) as unknown as SDKMessage;
2403+
2404+
it.effect("names the usage limit when only the assistant error reports it", () => {
2405+
const harness = makeHarness();
2406+
return Effect.gen(function* () {
2407+
const adapter = yield* ClaudeAdapter;
2408+
const eventsFiber = yield* adapter.streamEvents.pipe(
2409+
Stream.takeUntil((event) => event.type === "turn.completed"),
2410+
Stream.runCollect,
2411+
Effect.forkChild,
2412+
);
2413+
const session = yield* adapter.startSession({
2414+
threadId: THREAD_ID,
2415+
provider: ProviderDriverKind.make("claudeAgent"),
2416+
runtimeMode: "full-access",
2417+
});
2418+
yield* adapter.sendTurn({ threadId: session.threadId, input: "hello", attachments: [] });
2419+
2420+
// No rate_limit_event: the CLI already reported this window last turn.
2421+
harness.query.emit(limitedAssistant("assistant-limit", "rate_limit"));
2422+
harness.query.emit(apiErrorResult("result-limit-retry"));
2423+
2424+
const events = Array.from(yield* Fiber.join(eventsFiber));
2425+
const errors = events.filter((event) => event.type === "runtime.error");
2426+
assert.equal(errors.length, 1);
2427+
assert.equal(
2428+
errors[0]?.type === "runtime.error" ? errors[0].payload.message : undefined,
2429+
USAGE_LIMIT_MESSAGE,
2430+
);
2431+
const payload = completedTurn(events);
2432+
assert.equal(payload.state, "failed");
2433+
assert.equal(payload.errorMessage, USAGE_LIMIT_MESSAGE);
2434+
}).pipe(
2435+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
2436+
Effect.provide(harness.layer),
2437+
);
2438+
});
2439+
2440+
it.effect("names the usage limit on a retry that repeats no rate_limit_event", () => {
2441+
const harness = makeHarness();
2442+
return Effect.gen(function* () {
2443+
const adapter = yield* ClaudeAdapter;
2444+
const session = yield* adapter.startSession({
2445+
threadId: THREAD_ID,
2446+
provider: ProviderDriverKind.make("claudeAgent"),
2447+
runtimeMode: "full-access",
2448+
});
2449+
2450+
const firstTurnFiber = yield* adapter.streamEvents.pipe(
2451+
Stream.takeUntil((event) => event.type === "turn.completed"),
2452+
Stream.runCollect,
2453+
Effect.forkChild,
2454+
);
2455+
yield* adapter.sendTurn({ threadId: session.threadId, input: "hello", attachments: [] });
2456+
const nowMs = yield* Clock.currentTimeMillis;
2457+
harness.query.emit({
2458+
type: "rate_limit_event",
2459+
rate_limit_info: {
2460+
status: "rejected",
2461+
rateLimitType: "five_hour",
2462+
resetsAt: Math.floor(nowMs / 1000) + 7200,
2463+
},
2464+
session_id: "sdk-session-limit-retry",
2465+
uuid: "rate-limit-rejected",
2466+
} as unknown as SDKMessage);
2467+
harness.query.emit(limitedAssistant("assistant-limit-1", "rate_limit"));
2468+
harness.query.emit(apiErrorResult("result-limit-1"));
2469+
assert.equal(
2470+
completedTurn(Array.from(yield* Fiber.join(firstTurnFiber))).errorMessage,
2471+
USAGE_LIMIT_MESSAGE,
2472+
);
2473+
2474+
// The retry carries only the assistant error; the window did not change
2475+
// state, so the CLI stays silent about it.
2476+
const secondTurnFiber = yield* adapter.streamEvents.pipe(
2477+
Stream.takeUntil((event) => event.type === "turn.completed"),
2478+
Stream.runCollect,
2479+
Effect.forkChild,
2480+
);
2481+
yield* adapter.sendTurn({ threadId: session.threadId, input: "again", attachments: [] });
2482+
harness.query.emit(limitedAssistant("assistant-limit-2", "rate_limit"));
2483+
harness.query.emit(apiErrorResult("result-limit-2"));
2484+
const payload = completedTurn(Array.from(yield* Fiber.join(secondTurnFiber)));
2485+
assert.equal(payload.state, "failed");
2486+
assert.equal(payload.errorMessage, USAGE_LIMIT_MESSAGE);
2487+
}).pipe(
2488+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
2489+
Effect.provide(harness.layer),
2490+
);
2491+
});
2492+
2493+
it.effect("keeps the generic API error for a non-limit assistant error", () => {
2494+
const harness = makeHarness();
2495+
return Effect.gen(function* () {
2496+
const adapter = yield* ClaudeAdapter;
2497+
const eventsFiber = yield* adapter.streamEvents.pipe(
2498+
Stream.takeUntil((event) => event.type === "turn.completed"),
2499+
Stream.runCollect,
2500+
Effect.forkChild,
2501+
);
2502+
const session = yield* adapter.startSession({
2503+
threadId: THREAD_ID,
2504+
provider: ProviderDriverKind.make("claudeAgent"),
2505+
runtimeMode: "full-access",
2506+
});
2507+
yield* adapter.sendTurn({ threadId: session.threadId, input: "hello", attachments: [] });
2508+
harness.query.emit(limitedAssistant("assistant-server-error", "server_error"));
2509+
harness.query.emit(apiErrorResult("result-server-error"));
2510+
2511+
const payload = completedTurn(Array.from(yield* Fiber.join(eventsFiber)));
2512+
assert.equal(payload.state, "failed");
2513+
assert.equal(payload.errorMessage, "Claude gave up after repeated API errors.");
2514+
}).pipe(
2515+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
2516+
Effect.provide(harness.layer),
2517+
);
2518+
});
2519+
23702520
it.effect.each([
23712521
{
23722522
name: "listed error with api_error",

‎apps/server/src/provider/Layers/ClaudeAdapter.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ interface ClaudeTurnState {
161161
nextSyntheticAssistantBlockIndex: number;
162162
authenticationFailureMessage: string | undefined;
163163
rejectedRateLimitTypes: Set<string>;
164+
rateLimitedAssistantMessage: boolean;
164165
}
165166

166167
interface AssistantTextBlockState {
@@ -3168,6 +3169,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
31683169
nextSyntheticAssistantBlockIndex: -1,
31693170
authenticationFailureMessage: undefined,
31703171
rejectedRateLimitTypes: new Set(),
3172+
rateLimitedAssistantMessage: false,
31713173
};
31723174
context.session = {
31733175
...context.session,
@@ -3234,6 +3236,12 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
32343236
cwd: path.resolve(context.session.cwd ?? "."),
32353237
});
32363238
}
3239+
// Retries while still limited carry this assistant error but no
3240+
// rate_limit_event, which the CLI only emits when the window changes
3241+
// state, so the rejected set alone misses every turn after the first.
3242+
if (message.error === "rate_limit") {
3243+
context.turnState.rateLimitedAssistantMessage = true;
3244+
}
32373245
context.turnState.items.push(message.message);
32383246
if (
32393247
normalizeClaudeActiveTokenUsage(
@@ -3263,7 +3271,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
32633271
const turn = context.turnState;
32643272
const failureHint =
32653273
turn?.authenticationFailureMessage ??
3266-
(turn && turn.rejectedRateLimitTypes.size > 0
3274+
(turn && (turn.rejectedRateLimitTypes.size > 0 || turn.rateLimitedAssistantMessage)
32673275
? "Claude usage limit reached. Send the message again once the limit resets."
32683276
: undefined);
32693277
const { status, errorMessage } = resultOutcome(message, failureHint);
@@ -4949,6 +4957,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
49494957
nextSyntheticAssistantBlockIndex: -1,
49504958
authenticationFailureMessage: undefined,
49514959
rejectedRateLimitTypes: new Set(),
4960+
rateLimitedAssistantMessage: false,
49524961
};
49534962

49544963
const updatedAt = yield* nowIso;

0 commit comments

Comments
 (0)