Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions packages/opencode/src/provider/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,16 @@ export function parseStreamError(input: unknown): ParsedStreamError | undefined
if (!body) return

const responseBody = JSON.stringify(body)
if (body.type !== "error") return

switch (body?.error?.code) {
const error =
body.type === "error"
? body.error
: body.type === "response.failed" &&
(body.response?.error?.code === "server_is_overloaded" || body.response?.error?.code === "server_error")
? body.response.error
: undefined
if (!error) return

switch (error.code) {
case "context_length_exceeded":
return {
type: "context_overflow",
Expand All @@ -131,15 +138,15 @@ export function parseStreamError(input: unknown): ParsedStreamError | undefined
case "invalid_prompt":
return {
type: "api_error",
message: typeof body?.error?.message === "string" ? body?.error?.message : "Invalid prompt.",
message: typeof error.message === "string" ? error.message : "Invalid prompt.",
isRetryable: false,
responseBody,
}
case "server_is_overloaded":
case "server_error":
return {
type: "api_error",
message: typeof body?.error?.message === "string" ? body?.error?.message : "Server error.",
message: typeof error.message === "string" ? error.message : "Server error.",
isRetryable: true,
responseBody,
}
Expand Down
49 changes: 49 additions & 0 deletions packages/opencode/test/session/retry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,53 @@ describe("session.message-v2.fromError", () => {
message: "An error occurred while processing your request.",
})
})

test("converts nested OpenAI response.failed server errors to retryable APIError", () => {
const cases = ["server_error", "server_is_overloaded"]

cases.forEach((code) => {
const body = {
type: "response.failed",
sequence_number: 2,
response: {
status: "failed",
error: {
code,
message: `OpenAI ${code}`,
},
},
}
const result = MessageV2.fromError(
{ message: JSON.stringify(body) },
{ providerID: ProviderV2.ID.make("openai") },
)

expect(SessionV1.APIError.isInstance(result)).toBe(true)
if (!SessionV1.APIError.isInstance(result)) throw new Error("expected APIError")
expect(result.data.isRetryable).toBe(true)
expect(result.data.responseBody).toBe(JSON.stringify(body))
expect(SessionRetry.retryable(result, retryProvider)).toEqual({ message: `OpenAI ${code}` })
})
})

test("leaves other nested OpenAI response.failed errors terminal", () => {
const result = MessageV2.fromError(
{
message: JSON.stringify({
type: "response.failed",
response: {
status: "failed",
error: {
code: "invalid_prompt",
message: "Invalid prompt from test",
},
},
}),
},
{ providerID: ProviderV2.ID.make("openai") },
)

expect(SessionV1.APIError.isInstance(result)).toBe(false)
expect(SessionRetry.retryable(result, retryProvider)).toBeUndefined()
})
})
Loading