Skip to content

Commit c75d167

Browse files
fix(opencode): treat a spent Claude plan as a usage limit with its reset time
OpenCode 2's claude-agent ends a run whose Claude subscription limit is spent with a provider.unknown failure carrying Claude's "You've hit your … limit" text, so T3 showed it as a provider error and could not snooze or resume at reset. Recognise that wording as a usage limit and take the reset only from the explicit "Resets at <ISO>" tail. Fixes #29289 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent d00e8cd commit c75d167

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,22 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
563563
status: 429,
564564
},
565565
},
566+
{
567+
name: "a Claude limit without a reset timestamp",
568+
failureClass: "usage_limit",
569+
error: {
570+
type: "provider.unknown",
571+
message: "You've hit your session limit · resets 5:20pm (Europe/Berlin)",
572+
},
573+
},
574+
{
575+
name: "an unrelated provider.unknown failure",
576+
failureClass: "provider_error",
577+
error: {
578+
type: "provider.unknown",
579+
message: "Request failed. Resets at 2026-11-02T20:00:00Z.",
580+
},
581+
},
566582
] as const)("classifies $name as $failureClass", ({ error, failureClass }) =>
567583
Effect.gen(function* () {
568584
const { runtime, thread } = yield* resumed([

‎packages/provider-opencode/src/server/v2/adapter.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,12 @@ const wakeTurnId = (sessionId: string, attemptId: string) => `${sessionId}:wake:
524524
const isWakeTurn = (turn: OrchestrationV2ProviderTurn) =>
525525
turn.nativeTurnRef?.nativeId?.includes(":wake:") === true;
526526

527+
// OpenCode's claude-agent reports a spent Claude plan as provider.unknown with Claude's own text.
528+
const claudeUsageLimit = (message: string | undefined) =>
529+
message !== undefined && /^You've hit your [^\n·]*\blimit\b/.test(message)
530+
? { resetAt: /\bResets at (\d{4}-\d\d-\d\dT[\d:.]+Z)\.?\s*$/.exec(message)?.[1] ?? null }
531+
: undefined;
532+
527533
const INTERRUPT_TIMEOUT = "10 seconds";
528534
const INSTRUCTIONS_KEY = "t3-code";
529535
const RECONNECT_ATTEMPTS = 5;
@@ -2152,14 +2158,18 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
21522158
const { type, message, status, response } = event.data.error;
21532159
// OpenCode types an empty balance as provider.quota too, but it answers
21542160
// that with HTTP 402 and it never resets. Usage windows and budgets are 429.
2161+
const claudeLimit = claudeUsageLimit(message);
21552162
const usageLimit =
2156-
(type === "provider.quota" && status !== 402) || type === "provider.rate-limit";
2163+
(type === "provider.quota" && status !== 402) ||
2164+
type === "provider.rate-limit" ||
2165+
claudeLimit !== undefined;
21572166
return yield* endExecution(state, turn, {
21582167
status: "failed",
21592168
failure: makeProviderFailure({
21602169
message: readableProviderErrorMessage(message, status, response?.body),
21612170
code: type,
21622171
class: usageLimit ? "usage_limit" : "provider_error",
2172+
resetAt: claudeLimit?.resetAt ?? null,
21632173
}),
21642174
});
21652175
}

0 commit comments

Comments
 (0)