Skip to content

Commit 8895791

Browse files
committed
fix(opencode): out-of-funds failures show OpenCode's message instead of a usage limit
OpenCode reports an empty balance ("Upstream request failed: Insufficient account funds") as provider.quota, so every provider.quota failure became a usage limit. The thread then showed "Reset time unavailable; retry manually" and hid OpenCode's message, for a balance that never resets. OpenCode answers an empty balance with HTTP 402, while usage windows, budgets and rate limits arrive as 429. A provider.quota failure with status 402 is now a normal provider error that keeps OpenCode's message. Everything else keeps its class. Fixes #22574
1 parent 08dbf83 commit 8895791

2 files changed

Lines changed: 75 additions & 8 deletions

File tree

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,71 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
513513
}).pipe(Effect.scoped),
514514
);
515515

516+
// OpenCode types an empty balance as provider.quota too, but answers it with
517+
// HTTP 402 and it never resets. Usage windows and budgets arrive as 429.
518+
it.effect.each([
519+
{
520+
name: "an out-of-funds provider.quota (402)",
521+
failureClass: "provider_error",
522+
error: {
523+
type: "provider.quota",
524+
message: "Upstream request failed: Insufficient account funds",
525+
status: 402,
526+
},
527+
},
528+
{
529+
name: "a provider.quota usage window (429)",
530+
failureClass: "usage_limit",
531+
error: {
532+
type: "provider.quota",
533+
message: "Subscription quota exceeded.",
534+
status: 429,
535+
response: {
536+
body: JSON.stringify({
537+
type: "error",
538+
error: { type: "GoUsageLimitError", message: "Subscription quota exceeded." },
539+
}),
540+
},
541+
},
542+
},
543+
{
544+
name: "a provider.quota account budget (429)",
545+
failureClass: "usage_limit",
546+
error: {
547+
type: "provider.quota",
548+
message: "Upstream request failed: Account budget exceeded",
549+
status: 429,
550+
},
551+
},
552+
{
553+
name: "a provider.rate-limit failure (429)",
554+
failureClass: "usage_limit",
555+
error: {
556+
type: "provider.rate-limit",
557+
message: "Rate limit exceeded: free-models-per-min.",
558+
status: 429,
559+
},
560+
},
561+
] as const)("classifies $name as $failureClass", ({ error, failureClass }) =>
562+
Effect.gen(function* () {
563+
const { runtime, thread } = yield* resumed([
564+
out("session.prompt", { sessionID: SESSION, text: "<any>" }),
565+
promptAccepted,
566+
event("session.execution.failed", { sessionID: SESSION, error }),
567+
]);
568+
const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
569+
yield* runtime.startTurn(turnInput(thread));
570+
const ended = yield* Fiber.join(terminal);
571+
assert.equal(ended?.status, "failed");
572+
assert.deepEqual(ended?.failure, {
573+
class: failureClass,
574+
code: error.type,
575+
message: error.message,
576+
retryable: null,
577+
});
578+
}).pipe(Effect.scoped),
579+
);
580+
516581
it.effect("ends the turn when its terminal event is one this build cannot decode", () =>
517582
Effect.gen(function* () {
518583
const { runtime, thread } = yield* resumed([

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,19 +2182,21 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
21822182
});
21832183
case "session.execution.interrupted":
21842184
return yield* endExecution(state, turn, { status: "interrupted" });
2185-
case "session.execution.failed":
2185+
case "session.execution.failed": {
2186+
const { type, message, status } = event.data.error;
2187+
// OpenCode types an empty balance as provider.quota too, but it answers
2188+
// that with HTTP 402 and it never resets. Usage windows and budgets are 429.
2189+
const usageLimit =
2190+
(type === "provider.quota" && status !== 402) || type === "provider.rate-limit";
21862191
return yield* endExecution(state, turn, {
21872192
status: "failed",
21882193
failure: makeProviderFailure({
2189-
message: event.data.error.message,
2190-
code: event.data.error.type,
2191-
class:
2192-
event.data.error.type === "provider.quota" ||
2193-
event.data.error.type === "provider.rate-limit"
2194-
? "usage_limit"
2195-
: "provider_error",
2194+
message,
2195+
code: type,
2196+
class: usageLimit ? "usage_limit" : "provider_error",
21962197
}),
21972198
});
2199+
}
21982200
default:
21992201
return;
22002202
}

0 commit comments

Comments
 (0)