From 570d9971fa0b3799ed7bcd19dd2f064c01f23aac Mon Sep 17 00:00:00 2001 From: Sarath Suresh Date: Wed, 18 Nov 2026 01:27:19 +0000 Subject: [PATCH] fix(provider): resend a model step after any mid-stream gateway failure With BCODE_STREAM_RETRY set by the Cloud V4 worker, mid-stream gateway errors in the Chat Completions (bare message), Anthropic (api_error, overloaded_error) and unprefixed Responses shapes now take the existing same-route transport recovery: at most two resends, never after a tool executed. Content policy refusals and request rejections stay terminal; without the variable nothing changes. Co-Authored-By: Claude Opus 5.5 --- packages/core/src/flag/flag.ts | 4 +++ packages/opencode/src/provider/error.ts | 41 ++++++++++++++++--------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/packages/core/src/flag/flag.ts b/packages/core/src/flag/flag.ts index a0eb78a13e..866310ff5a 100644 --- a/packages/core/src/flag/flag.ts +++ b/packages/core/src/flag/flag.ts @@ -63,6 +63,10 @@ export const Flag = { get OPENCODE_CONFIG_DIR() { return process.env["OPENCODE_CONFIG_DIR"] }, + // Set by the Cloud V4 worker: resend a model step after any mid-stream gateway failure, not only transport ones. + get BCODE_STREAM_RETRY() { + return truthy("BCODE_STREAM_RETRY") + }, get OPENCODE_PURE() { return truthy("OPENCODE_PURE") }, diff --git a/packages/opencode/src/provider/error.ts b/packages/opencode/src/provider/error.ts index 132315472a..d3697e95f1 100644 --- a/packages/opencode/src/provider/error.ts +++ b/packages/opencode/src/provider/error.ts @@ -3,6 +3,7 @@ import { STATUS_CODES } from "http" import { iife } from "@/util/iife" import type { ProviderV2 } from "@opencode-ai/core/provider" import { isContextOverflow } from "@opencode-ai/llm" +import { Flag } from "@opencode-ai/core/flag/flag" export class HeaderTimeoutError extends Error { public override readonly name = "ProviderHeaderTimeoutError" @@ -100,12 +101,36 @@ export type ParsedStreamError = metadata?: Record } +// Cloud V4 gateway failures after the reply started, which the same route may serve on a resend. +const TRANSPORT = /^(ReadError|ReadTimeout|RemoteProtocolError|APIConnectionError|ConnectError|ConnectTimeout)(?::|$)/ +// The gateway's own wording for a provider or stream failure; rejections and refusals carry other text or types. +const GATEWAY_FAILURES = new Set([ + "The model returned an error.", + "The model request timed out.", + "The model request is temporarily unavailable.", +]) + +function gatewayFailure(message: unknown): message is string { + return ( + typeof message === "string" && Flag.BCODE_STREAM_RETRY && (TRANSPORT.test(message) || GATEWAY_FAILURES.has(message)) + ) +} + +function streamFailed(message: string, responseBody: string): ParsedStreamError { + return { type: "api_error", message, isRetryable: true, responseBody, metadata: { code: "upstream_stream_failed" } } +} + export function parseStreamError(input: unknown): ParsedStreamError | undefined { const raw = json(input) + // Chat Completions SDKs pass on only the error message. + if (!raw && gatewayFailure(input)) return streamFailed(input, JSON.stringify(input)) const body = typeof raw?.message === "string" ? (json(raw.message) ?? raw) : raw if (!body) return const responseBody = JSON.stringify(body) + // Anthropic SDKs pass on the error object of a mid-stream error event; these two types are server failures. + if ((body.type === "api_error" || body.type === "overloaded_error") && gatewayFailure(body.message)) + return streamFailed(body.message, responseBody) const error = body.type === "error" ? body.error @@ -144,20 +169,8 @@ export function parseStreamError(input: unknown): ParsedStreamError | undefined responseBody, } case "upstream_stream_failed": - if ( - typeof error.message !== "string" || - !/^(ReadError|ReadTimeout|RemoteProtocolError|APIConnectionError|ConnectError|ConnectTimeout)(?::|$)/.test( - error.message, - ) - ) - return - return { - type: "api_error", - message: error.message, - isRetryable: true, - responseBody, - metadata: { code: "upstream_stream_failed" }, - } + if (typeof error.message !== "string" || !(TRANSPORT.test(error.message) || gatewayFailure(error.message))) return + return streamFailed(error.message, responseBody) case "server_is_overloaded": case "server_error": return {