Skip to content

Commit f929f8f

Browse files
authored
refactor(opencode): simplify retry error matching (anomalyco#40694)
1 parent 4a57013 commit f929f8f

2 files changed

Lines changed: 19 additions & 27 deletions

File tree

‎packages/opencode/src/session/retry.ts‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -122,32 +122,19 @@ export function retryable(error: Err, provider: string) {
122122
return { message: error.data.message.includes("Overloaded") ? "Provider is overloaded" : error.data.message }
123123
}
124124

125-
// Check for rate limit patterns in plain text error messages
126-
const msg = isRecord(error.data) ? error.data.message : undefined
127-
if (typeof msg === "string") {
128-
const lower = msg.toLowerCase()
129-
if (
130-
lower.includes("rate increased too quickly") ||
131-
lower.includes("rate limit") ||
132-
lower.includes("too many requests")
133-
) {
134-
return { message: msg }
135-
}
136-
}
137-
138-
const json = parseJSON(msg)
139-
if (!json || typeof json !== "object") return undefined
140-
const code = typeof json.code === "string" ? json.code : ""
141-
142-
if (json.type === "error" && json.error?.type === "too_many_requests") {
143-
return { message: "Too Many Requests" }
144-
}
145-
if (code.includes("exhausted") || code.includes("unavailable")) {
146-
return { message: "Provider is overloaded" }
147-
}
148-
if (json.type === "error" && typeof json.error?.code === "string" && json.error.code.includes("rate_limit")) {
149-
return { message: "Rate Limited" }
125+
const message = isRecord(error.data) ? error.data.message : undefined
126+
if (typeof message !== "string") return undefined
127+
const lower = message.toLowerCase()
128+
if (
129+
lower.includes("rate increased too quickly") ||
130+
lower.includes("rate limit") ||
131+
lower.includes("rate_limit") ||
132+
lower.includes("too many requests")
133+
) {
134+
return { message }
150135
}
136+
if (lower.includes("too_many_requests")) return { message: "Too Many Requests" }
137+
if (lower.includes("exhausted") || lower.includes("unavailable")) return { message: "Provider is overloaded" }
151138
return undefined
152139
}
153140

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,21 @@ describe("session.retry.delay", () => {
118118
})
119119

120120
describe("session.retry.retryable", () => {
121-
test("maps too_many_requests json messages", () => {
121+
test("retries serialized too_many_requests messages", () => {
122122
const error = wrap(JSON.stringify({ type: "error", error: { type: "too_many_requests" } }))
123123
expect(SessionRetry.retryable(error, retryProvider)).toEqual({ message: "Too Many Requests" })
124124
})
125125

126-
test("maps overloaded provider codes", () => {
126+
test("retries serialized overloaded provider codes", () => {
127127
const error = wrap(JSON.stringify({ code: "resource_exhausted" }))
128128
expect(SessionRetry.retryable(error, retryProvider)).toEqual({ message: "Provider is overloaded" })
129129
})
130130

131+
test("retries serialized rate_limit messages", () => {
132+
const message = JSON.stringify({ type: "error", error: { code: "rate_limit_exceeded" } })
133+
expect(SessionRetry.retryable(wrap(message), retryProvider)).toEqual({ message })
134+
})
135+
131136
test("does not retry unknown json messages", () => {
132137
const error = wrap(JSON.stringify({ error: { message: "no_kv_space" } }))
133138
expect(SessionRetry.retryable(error, retryProvider)).toBeUndefined()

0 commit comments

Comments
 (0)