@devries-cameron20 / t3code-1 / commits / 35483c198a
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(opencode): show usage-limit warnings while OpenCode 2 retries (#28375)

Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Victor committed Nov 14, 2026 at 06:54 UTC 35483c198a720394bffed1a9dbc16b43b794b983
2 files changed +34 -14
apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
+20 -4
@@ -677,11 +677,27 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
677 const { runtime, thread } = yield* resumed([
678 out("session.prompt", { sessionID: SESSION, text: "<any>" }),
679 promptAccepted,
680 + event("session.retry.scheduled", {
681 + sessionID: SESSION,
682 + assistantMessageID: "msg_0eb735d5b001oAFVeY5jz3WD4Z",
683 + attempt: 2,
684 + at: 2_001,
685 + error,
686 + }),
687 event("session.execution.failed", { sessionID: SESSION, error }),
688 ]);
682 - const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
689 + const collected = yield* runtime.events.pipe(
690 + Stream.takeUntil((event) => event.type === "turn.terminal"),
691 + Stream.runCollect,
692 + Effect.forkScoped,
693 + );
694 yield* runtime.startTurn(turnInput(thread));
684 - const ended = yield* Fiber.join(terminal);
695 + const seen = yield* Fiber.join(collected);
696 + assert.deepInclude(errorRows(seen)[0], {
697 + status: "running",
698 + failure: { class: failureClass, code: error.type, message: error.message, retryable: true },
699 + });
700 + const ended = seen.find((event) => event.type === "turn.terminal");
701 assert.equal(ended?.status, "failed");
702 assert.deepEqual(ended?.failure, {
703 class: failureClass,
@@ -5479,7 +5495,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
5495 error: rateLimited,
5496 });
5497 const retrying = {
5482 - class: "provider_error",
5498 + class: "usage_limit",
5499 message: rateLimited.message,
5500 code: rateLimited.type,
5501 retryable: true,
@@ -5661,7 +5677,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
5677 ],
5678 gate,
5679 );
5664 - const failed = { ...retrying, class: "usage_limit" as const, retryable: null };
5680 + const failed = { ...retrying, retryable: null };
5681 const lastRetry = { attempt: 2, maxAttempts: null, retryDelayMs: 4_000 };
5682 const rows = errorRows(seen);
5683 assert.deepEqual(
packages/provider-opencode/src/server/v2/adapter.ts
+14 -10
@@ -590,6 +590,17 @@ const claudeUsageLimit = (message: string | undefined) =>
590 ? { resetAt: /\bResets at (\d{4}-\d\d-\d\dT[\d:.]+Z)\.?\s*$/.exec(message)?.[1] ?? null }
591 : undefined;
592
593 +// OpenCode types an empty balance as provider.quota too, but it answers
594 +// that with HTTP 402 and it never resets. Usage windows and budgets are 429.
595 +const isUsageLimit = (error: {
596 + readonly type: string;
597 + readonly status?: number | undefined;
598 + readonly message: string;
599 +}) =>
600 + (error.type === "provider.quota" && error.status !== 402) ||
601 + error.type === "provider.rate-limit" ||
602 + claudeUsageLimit(error.message) !== undefined;
603 +
604 const INTERRUPT_TIMEOUT = 10_000;
605 const INSTRUCTIONS_KEY = "t3-code";
606 const RECONNECT_ATTEMPTS = 5;
@@ -1465,7 +1476,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
1476 failure: makeProviderFailure({
1477 message: readableProviderErrorMessage(error.message, error.status, error.response?.body),
1478 code: error.type,
1468 - class: "provider_error",
1479 + class: isUsageLimit(error) ? "usage_limit" : "provider_error",
1480 retryable: true,
1481 }),
1482 startedAt: turn.retry?.startedAt ?? (yield* DateTime.now),
@@ -2839,20 +2850,13 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
2850 return yield* endExecution(state, turn, { status: "interrupted" });
2851 case "session.execution.failed": {
2852 const { type, message, status, response } = event.data.error;
2842 - // OpenCode types an empty balance as provider.quota too, but it answers
2843 - // that with HTTP 402 and it never resets. Usage windows and budgets are 429.
2844 - const claudeLimit = claudeUsageLimit(message);
2845 - const usageLimit =
2846 - (type === "provider.quota" && status !== 402) ||
2847 - type === "provider.rate-limit" ||
2848 - claudeLimit !== undefined;
2853 return yield* endExecution(state, turn, {
2854 status: "failed",
2855 failure: makeProviderFailure({
2856 message: readableProviderErrorMessage(message, status, response?.body),
2857 code: type,
2854 - class: usageLimit ? "usage_limit" : "provider_error",
2855 - resetAt: claudeLimit?.resetAt ?? null,
2858 + class: isUsageLimit(event.data.error) ? "usage_limit" : "provider_error",
2859 + resetAt: claudeUsageLimit(message)?.resetAt ?? null,
2860 }),
2861 });
2862 }