Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
only21mil wants to merge 3 commits into
base: main
Choose a base branch
from
+30 −9
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d181dbd
fix(opencode): OpenCode 2 retry rows keep the usage-limit class
only21mil Oct 31, 2026
eeb54e2
chore: merge main into OpenCode retry classification fix
maria-rcks Nov 2, 2026
278a992
test(opencode): preserve Claude retry classification after merge
maria-rcks Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,11 +584,32 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
const { runtime, thread } = yield* resumed([
out("session.prompt", { sessionID: SESSION, text: "<any>" }),
promptAccepted,
event("session.retry.scheduled", {
sessionID: SESSION,
assistantMessageID: "msg_0eb735d5b001oAFVeY5jz3WD4Z",
attempt: 2,
at: 2_001,
error,
}),
event("session.execution.failed", { sessionID: SESSION, error }),
]);
const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
const collected = yield* runtime.events.pipe(
Stream.takeUntil((event) => event.type === "turn.terminal"),
Stream.runCollect,
Effect.forkScoped,
);
yield* runtime.startTurn(turnInput(thread));
const ended = yield* Fiber.join(terminal);
const seen = yield* Fiber.join(collected);
assert.deepInclude(errorRows(seen)[0], {
status: "running",
failure: {
class: error.type === "provider.unknown" ? "provider_error" : failureClass,
code: error.type,
message: error.message,
retryable: true,
},
});
const ended = seen.find((event) => event.type === "turn.terminal");
assert.equal(ended?.status, "failed");
assert.deepEqual(ended?.failure, {
class: failureClass,
Expand Down Expand Up @@ -3036,7 +3057,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
error: rateLimited,
});
const retrying = {
class: "provider_error",
class: "usage_limit",
message: rateLimited.message,
code: rateLimited.type,
retryable: true,
Expand Down Expand Up @@ -3218,7 +3239,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
],
gate,
);
const failed = { ...retrying, class: "usage_limit" as const, retryable: null };
const failed = { ...retrying, retryable: null };
const lastRetry = { attempt: 2, maxAttempts: null, retryDelayMs: 4_000 };
const rows = errorRows(seen);
assert.deepEqual(
Expand Down
10 changes: 5 additions & 5 deletions packages/provider-opencode/src/server/v2/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,9 @@ const reportOutcome = (state: string | undefined) =>
const subagentOutput = (text: string) =>
/^<subagent\b[^>]*>\n?([\s\S]*?)\n?<\/subagent>$/.exec(text.trim())?.[1] ?? text;

const isUsageLimit = (type: string, status: number | undefined) =>
(type === "provider.quota" && status !== 402) || type === "provider.rate-limit";

const isContinuation = (turnInput: ProviderAdapter.ProviderAdapterV2TurnInput) =>
turnInput.message.createdBy === "agent" && turnInput.message.creationSource === "provider";

Expand Down Expand Up @@ -1098,7 +1101,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
failure: makeProviderFailure({
message: readableProviderErrorMessage(error.message, error.status, error.response?.body),
code: error.type,
class: "provider_error",
class: isUsageLimit(error.type, error.status) ? "usage_limit" : "provider_error",
retryable: true,
}),
startedAt: turn.retry?.startedAt ?? (yield* DateTime.now),
Expand Down Expand Up @@ -2159,10 +2162,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
// OpenCode types an empty balance as provider.quota too, but it answers
// that with HTTP 402 and it never resets. Usage windows and budgets are 429.
const claudeLimit = claudeUsageLimit(message);
const usageLimit =
(type === "provider.quota" && status !== 402) ||
type === "provider.rate-limit" ||
claudeLimit !== undefined;
const usageLimit = isUsageLimit(type, status) || claudeLimit !== undefined;
return yield* endExecution(state, turn, {
status: "failed",
failure: makeProviderFailure({
Expand Down
Loading