Skip to content

fix: add retry circuit breaker and backoff cap to prevent infinite retry loops #17790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dawidbednarczyk wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −1
Open

fix: add retry circuit breaker and backoff cap to prevent infinite retry loops #17790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions packages/opencode/src/session/processor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,16 @@ export namespace SessionProcessor {
const retry = SessionRetry.retryable(error)
if (retry !== undefined) {
attempt++
if (attempt > SessionRetry.RETRY_MAX_ATTEMPTS) {
log.error("max retries exceeded", { attempt, sessionID: input.sessionID })
input.assistantMessage.error = error
Bus.publish(Session.Event.Error, {
sessionID: input.sessionID,
error,
})
SessionStatus.set(input.sessionID, { type: "idle" })
break
}
const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined)
SessionStatus.set(input.sessionID, {
type: "retry",
Expand Down
4 changes: 3 additions & 1 deletion packages/opencode/src/session/retry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ export namespace SessionRetry {
export const RETRY_INITIAL_DELAY = 2000
export const RETRY_BACKOFF_FACTOR = 2
export const RETRY_MAX_DELAY_NO_HEADERS = 30_000 // 30 seconds
export const RETRY_MAX_DELAY_WITH_HEADERS = 60_000 // 60 seconds — cap for when response headers are present but missing retry-after
export const RETRY_MAX_DELAY = 2_147_483_647 // max 32-bit signed integer for setTimeout
export const RETRY_MAX_ATTEMPTS = 10 // maximum retry attempts before giving up

export async function sleep(ms: number, signal: AbortSignal): Promise<void> {
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -51,7 +53,7 @@ export namespace SessionRetry {
}
}

return RETRY_INITIAL_DELAY * Math.pow(RETRY_BACKOFF_FACTOR, attempt - 1)
return Math.min(RETRY_INITIAL_DELAY * Math.pow(RETRY_BACKOFF_FACTOR, attempt - 1), RETRY_MAX_DELAY_WITH_HEADERS)
}
}

Expand Down
Loading