Skip to content

fix: make ACP cancellation work #5583

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

Closed
alexhancock wants to merge 1 commit into from
Closed

fix: make ACP cancellation work #5583

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
7 changes: 7 additions & 0 deletions crates/goose-cli/src/commands/acp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,13 @@ impl acp::Agent for GooseAcpAgent {

// Create and store cancellation token for this prompt
let cancel_token = CancellationToken::new();
{
let mut sessions = self.sessions.lock().await;
let session = sessions
.get_mut(&session_id)
.ok_or_else(acp::Error::invalid_params)?;
Comment on lines +547 to +549
Copy link

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error acp::Error::invalid_params doesn't clearly indicate that the session was not found. Consider using a more specific error that indicates the session ID is invalid or the session doesn't exist, such as acp::Error::session_not_found or providing a custom error message.

Copilot uses AI. Check for mistakes.
session.cancel_token = Some(cancel_token.clone());
}

let user_message = self.convert_acp_prompt_to_message(args.prompt);

Expand Down