fix(opencode): expand retryable error patterns

packages/opencode/src/session/retry.ts

@@ -29,9 +29,10 @@ export const RETRY_MAX_DELAY_NO_HEADERS = 30_000 // 30 seconds
 export const RETRY_MAX_DELAY = 2_147_483_647 // max 32-bit signed integer for setTimeout
 
 const RETRYABLE_MESSAGE = [
-  /\b(?:server[_\s-]?error|internal[_\s-]?error|service[_\s-]?unavailable|overloaded|too many requests|rate increased too quickly|rate[_\s-]?limit)\b|\bprovider returned error\b/i,
-  /\b(?:fetch failed|network error|upstream connect|connection (?:error|refused|lost)|socket connection was closed|socket hang up|reset before headers|getaddrinfo|ENOTFOUND|EAI_AGAIN)\b|^timeout$|\b(?:request|response|connection|network|stream|read) (?:timeout|timed? out)\b/i,
+  /\b(?:server[_\s-]?error|internal[_\s-]?error|service[_\s-]?unavailable|overloaded|too many requests|rate increased too quickly|provider[_\s-]?returned[_\s-]?error)\b|\brate[_\s-]?limit/i,
+  /\b(?:fetch failed|network error|upstream connect|connection (?:error|refused|lost)|socket connection was closed|socket hang up|reset before headers|getaddrinfo|enotfound|eai_again)\b|^timeout$|\b(?:request|response|connection|network|stream|read) (?:timeout|timed? out)\b/i,
   /\b(?:resource[_\s-]?exhausted|please retry your request|you can retry your request|try your request again)\b/i,
+  /\b(?:429|500|502|503|504|524)\b/,
 ]
 
 function cap(ms: number) {
@@ -74,13 +75,11 @@ export function delay(attempt: number, error?: SessionV1.APIError) {
 export function retryable(error: Err, provider: string) {
   // context overflow errors should not be retried
   if (SessionV1.ContextOverflowError.isInstance(error)) return undefined
-  const msg = isRecord(error.data) ? error.data.message : undefined
-  const retryableMessage = isRetryableMessage(msg)
   if (SessionV1.APIError.isInstance(error)) {
     const status = error.data.statusCode
     // 5xx errors are transient server failures and should always be retried,
     // even when the provider SDK doesn't explicitly mark them as retryable.
-    if (!error.data.isRetryable && !(status !== undefined && status >= 500) && !retryableMessage) return undefined
+    if (!error.data.isRetryable && !(status !== undefined && status >= 500)) return undefined
     if (error.data.responseBody?.includes("FreeUsageLimitError")) {
       return {
         message: GO_UPSELL_MESSAGE,
@@ -130,28 +129,15 @@ export function retryable(error: Err, provider: string) {
     return { message: error.data.message.includes("Overloaded") ? "Provider is overloaded" : error.data.message }
   }
 
-  const json = parseJSON(msg)
-  if (json && typeof json === "object") {
-    const code = typeof json.code === "string" ? json.code : ""
-    if (json.type === "error" && json.error?.type === "too_many_requests") {
-      return { message: "Too Many Requests" }
-    }
-    if (code.includes("exhausted") || code.includes("unavailable")) {
-      return { message: "Provider is overloaded" }
-    }
-    if (json.type === "error" && typeof json.error?.code === "string" && json.error.code.includes("rate_limit")) {
-      return { message: "Rate Limited" }
-    }
-  }
-  if (retryableMessage && typeof msg === "string") return { message: msg }
+  const message = isRecord(error.data) ? error.data.message : undefined
+  if (typeof message !== "string") return undefined
+  const lower = message.toLowerCase()
+  if (lower.includes("too_many_requests")) return { message: "Too Many Requests" }
+  if (lower.includes("exhausted") || lower.includes("unavailable")) return { message: "Provider is overloaded" }
+  if (RETRYABLE_MESSAGE.some((pattern) => pattern.test(message))) return { message }
   return undefined
 }
 
-function isRetryableMessage(input: unknown) {
-  if (typeof input !== "string") return false
-  return RETRYABLE_MESSAGE.some((pattern) => pattern.test(input))
-}
-
 function str(value: unknown) {
   if (value === undefined || value === null) return ""
   return String(value)

packages/opencode/test/session/retry.test.ts

@@ -118,16 +118,21 @@ describe("session.retry.delay", () => {
 })
 
 describe("session.retry.retryable", () => {
-  test("maps too_many_requests json messages", () => {
+  test("retries serialized too_many_requests messages", () => {
     const error = wrap(JSON.stringify({ type: "error", error: { type: "too_many_requests" } }))
     expect(SessionRetry.retryable(error, retryProvider)).toEqual({ message: "Too Many Requests" })
   })
 
-  test("maps overloaded provider codes", () => {
+  test("retries serialized overloaded provider codes", () => {
     const error = wrap(JSON.stringify({ code: "resource_exhausted" }))
     expect(SessionRetry.retryable(error, retryProvider)).toEqual({ message: "Provider is overloaded" })
   })
 
+  test("retries serialized rate_limit messages", () => {
+    const message = JSON.stringify({ type: "error", error: { code: "rate_limit_exceeded" } })
+    expect(SessionRetry.retryable(wrap(message), retryProvider)).toEqual({ message })
+  })
+
   test("does not retry unknown json messages", () => {
     const error = wrap(JSON.stringify({ error: { message: "no_kv_space" } }))
     expect(SessionRetry.retryable(error, retryProvider)).toBeUndefined()
@@ -164,41 +169,16 @@ describe("session.retry.retryable", () => {
   })
 
   test.each([
-    "server_error",
     "Internal server error",
-    "Service Unavailable",
-    "Provider is overloaded",
     "Provider returned error",
     "fetch failed",
-    "connection timed out",
-    "socket hang up",
-    "getaddrinfo ENOTFOUND api.example.com",
-    "ResourceExhausted",
-    "You can retry your request",
-  ])("retries transient plain text errors: %s", (msg) => {
-    expect(SessionRetry.retryable(wrap(msg), retryProvider)).toEqual({ message: msg })
-  })
-
-  test("retries transient messages nested in json", () => {
-    const msg = JSON.stringify({ type: "error", error: { code: "server_error", message: "xxx" } })
-    expect(SessionRetry.retryable(wrap(msg), retryProvider)).toEqual({ message: msg })
-  })
-
-  test("retries transient API errors even when the SDK does not", () => {
-    const error = new SessionV1.APIError({ message: "server_error", isRetryable: false }).toObject()
-    expect(SessionRetry.retryable(error, retryProvider)).toEqual({ message: "server_error" })
-  })
-
-  test.each(["Observer error", "Unterminated string in JSON", "Invalid timeout option"])(
-    "does not retry near-miss errors: %s",
-    (msg) => {
-      expect(SessionRetry.retryable(wrap(msg), retryProvider)).toBeUndefined()
-    },
-  )
-
-  test("retries transient messages in arbitrary json fields", () => {
-    const msg = JSON.stringify({ detail: "rate limit exceeded" })
-    expect(SessionRetry.retryable(wrap(msg), retryProvider)).toEqual({ message: msg })
+    "connection refused",
+    "EAI_AGAIN",
+    "response timed out",
+    "Please retry your request",
+    "upstream returned status 524",
+  ])("retries matching API error text: %s", (message) => {
+    expect(SessionRetry.retryable(wrap(message), retryProvider)).toEqual({ message })
   })
 
   test("retries transport timeout errors", () => {