Skip to content

Commit 2f021ee

Browse files
authored
fix(opencode): out-of-funds failures show OpenCode's message instead of a usage limit (pingdotgg#22596)
1 parent b260a7c commit 2f021ee

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
@@ -514,6 +514,71 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
514514
}).pipe(Effect.scoped),
515515
);
516516

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