Skip to content

fix(a2a): Fix task cancellation race condition #198

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(a2a): Fix task cancellation race condition #198

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0028383
Fix(a2a): Fix task cancellation race condition
claude[bot] Oct 22, 2025
798c09e
chore: Remove redundant comments
edenreich Oct 22, 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: 8 additions & 12 deletions internal/services/background_task_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,12 @@ func (s *BackgroundTaskService) CancelBackgroundTask(taskID string) error {

logger.Info("Canceling background task", "task_id", taskID)

backgroundTasks := s.GetBackgroundTasks()

var targetTask *domain.TaskPollingState
for i := range backgroundTasks {
if backgroundTasks[i].TaskID == taskID {
targetTask = &backgroundTasks[i]
break
}
if s.taskTracker == nil {
return fmt.Errorf("task tracker not available")
}

// Get the live polling state directly from the tracker instead of using a copy
targetTask := s.taskTracker.GetPollingState(taskID)
if targetTask == nil {
return fmt.Errorf("task %s not found in background tasks", taskID)
}
Expand All @@ -75,14 +71,14 @@ func (s *BackgroundTaskService) CancelBackgroundTask(taskID string) error {
logger.Info("Successfully sent cancel request to agent", "task_id", taskID)
}

// Call the cancel function from the live polling state to actually stop the goroutine
if targetTask.CancelFunc != nil {
targetTask.CancelFunc()
}

if s.taskTracker != nil {
s.taskTracker.StopPolling(taskID)
s.taskTracker.RemoveTask(taskID)
}
// Clean up the task from the tracker
s.taskTracker.StopPolling(taskID)
s.taskTracker.RemoveTask(taskID)

logger.Info("Task cancelled successfully", "task_id", taskID)
return nil
Expand Down
Loading