Skip to content

fix: prevent infinite loop when canceling during auto-retry #8902

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

Merged
merged 2 commits into from
Oct 30, 2025
Merged

fix: prevent infinite loop when canceling during auto-retry #8902

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f4d085
fix: prevent infinite loop when canceling during auto-retry
roomote Oct 29, 2025
2e17fe3
docs: add critical comments explaining abort checks
roomote Oct 29, 2025
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
20 changes: 20 additions & 0 deletions src/core/task/Task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2240,6 +2240,17 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
error,
streamingFailedMessage,
)

// Check if task was aborted during the backoff
if (this.abort) {
console.log(
`[Task#${this.taskId}.${this.instanceId}] Task aborted during mid-stream retry backoff`,
)
// Abort the entire task
this.abortReason = "user_cancelled"
await this.abortTask()
break
}
}

// Push the same content back onto the stack to retry, incrementing the retry attempt counter
Expand Down Expand Up @@ -2790,6 +2801,15 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
// Apply shared exponential backoff and countdown UX
await this.backoffAndAnnounce(retryAttempt, error, errorMsg)

// CRITICAL: Check if task was aborted during the backoff countdown
// This prevents infinite loops when users cancel during auto-retry
// Without this check, the recursive call below would continue even after abort
if (this.abort) {
throw new Error(
`[Task#attemptApiRequest] task ${this.taskId}.${this.instanceId} aborted during retry`,
)
}

// Delegate generator output from the recursive call with
// incremented retry count.
yield* this.attemptApiRequest(retryAttempt + 1)
Expand Down