acp: ToolCallLocations and working cancellation by alexhancock · Pull Request #5588 · block/goose

alexhancock · 2025-11-05T21:16:38Z

Add more information to ToolCallLocations such as line numbers etc. This makes it possible to follow work goose is doing in an ACP client.

Also, make cancellation work by attaching a cancel token to the session. Right now hitting the stop button in ACP clients does nothing.

Replaces #5583

Demo

Screenshare.-.2025-11-05.4_58_14.PM.mp4

Copilot

Pull Request Overview

This PR enhances the ACP (Agent Client Protocol) implementation by adding file location tracking for tool calls. Instead of always pointing to line 1, the code now extracts precise line numbers from tool responses based on the command type (view, str_replace, insert, write).

Key changes:

Stores tool requests in session state for later location extraction from responses
Adds regex-based parsing functions to extract line numbers from tool output
Defers location population from tool call notification to tool response update

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-05T21:19:07Z

crates/goose-cli/src/commands/acp.rs

+/// Extract line range from view command output (e.g., "### path/to/file.rs (lines 10-20)")
+fn extract_view_line_range(text: &str) -> Option<(usize, usize)> {
+    // Look for pattern like "(lines X-Y)" or "(lines X-end)"
+    let re = regex::Regex::new(r"\(lines (\d+)-(\d+|end)\)").ok()?;


Creating a Regex on every function call is inefficient. Consider using lazy_static! or once_cell::sync::Lazy to compile the regex once and reuse it across calls.

Copilot · 2025-11-05T21:19:07Z

crates/goose-cli/src/commands/acp.rs

+/// Extract the first line number from code snippet (e.g., "123: some code")
+fn extract_first_line_number(text: &str) -> Option<usize> {
+    // Look for pattern like "123: " at the start of a line within a code block
+    let re = regex::Regex::new(r"```[^\n]*\n(\d+):").ok()?;


Creating a Regex on every function call is inefficient. Consider using lazy_static! or once_cell::sync::Lazy to compile the regex once and reuse it across calls.

michaelneale · 2025-11-05T21:19:14Z

crates/goose-cli/src/commands/acp.rs

+
+/// Extract the first line number from code snippet (e.g., "123: some code")
+fn extract_first_line_number(text: &str) -> Option<usize> {
+    // Look for pattern like "123: " at the start of a line within a code block


can probably tell goose to drop the commentary, as it is just saying what is in the code (annoys me so much it does this, but I always have to tell it tp rip it out0

michaelneale

can probably rip out the un-necessary LLM comments they like to put in, but lets go!

* main: (41 commits) Add pending extension indicator to extension panel (#5493) Add environment subsition for auth blocks (#5439) acp: ToolCallLocations and working cancellation (#5588) feat(providers): add Mistral AI provider (#5009) Listen for ctrl-c during provider request (#5585) Also accept null as description, not just missing (#5589) Document missing recipe param types (#5584) docs: description required for "Add Extension" in cli (#5573) fix: Add schema-aware numeric coercion for MCP tool arguments (#5478) Add uv for uvx in Justfile (#5581) Keep llm logs in place (#5577) bump to 1.12.0 (#5580) automate more of the release process (#5409) add clippy warning for string_slice (#5422) improve linux tray icon support (#5425) feat: log rotation (#5561) use app.isPackaged instead of checking for node env development (#5465) disable RPM build-ID generation to prevent package conflicts (#5563) Add Diagnostics Info to Q&A and Bug Report Templates (#5565) fix: improve server error messages to include HTTP status code (#5532) ...

* main: (53 commits) acp: ToolCallLocations and working cancellation (#5588) feat(providers): add Mistral AI provider (#5009) Listen for ctrl-c during provider request (#5585) Also accept null as description, not just missing (#5589) Document missing recipe param types (#5584) docs: description required for "Add Extension" in cli (#5573) fix: Add schema-aware numeric coercion for MCP tool arguments (#5478) Add uv for uvx in Justfile (#5581) Keep llm logs in place (#5577) bump to 1.12.0 (#5580) automate more of the release process (#5409) add clippy warning for string_slice (#5422) improve linux tray icon support (#5425) feat: log rotation (#5561) use app.isPackaged instead of checking for node env development (#5465) disable RPM build-ID generation to prevent package conflicts (#5563) Add Diagnostics Info to Q&A and Bug Report Templates (#5565) fix: improve server error messages to include HTTP status code (#5532) improvement: add useful error message when attempting to use unauthenticated cursor-agent (#5300) fix: unblock acp via databricks (#5562) ...

* main: fix: customised recipe to yaml string to avoid minininjia parsing error (#5494) Add pending extension indicator to extension panel (#5493) Add environment subsition for auth blocks (#5439) acp: ToolCallLocations and working cancellation (#5588) feat(providers): add Mistral AI provider (#5009) Listen for ctrl-c during provider request (#5585) Also accept null as description, not just missing (#5589) Document missing recipe param types (#5584) docs: description required for "Add Extension" in cli (#5573) fix: Add schema-aware numeric coercion for MCP tool arguments (#5478) Add uv for uvx in Justfile (#5581) Keep llm logs in place (#5577) bump to 1.12.0 (#5580) automate more of the release process (#5409)

* origin/main: (75 commits) fix: customised recipe to yaml string to avoid minininjia parsing error (#5494) Add pending extension indicator to extension panel (#5493) Add environment subsition for auth blocks (#5439) acp: ToolCallLocations and working cancellation (#5588) feat(providers): add Mistral AI provider (#5009) Listen for ctrl-c during provider request (#5585) Also accept null as description, not just missing (#5589) Document missing recipe param types (#5584) docs: description required for "Add Extension" in cli (#5573) fix: Add schema-aware numeric coercion for MCP tool arguments (#5478) Add uv for uvx in Justfile (#5581) Keep llm logs in place (#5577) bump to 1.12.0 (#5580) automate more of the release process (#5409) add clippy warning for string_slice (#5422) improve linux tray icon support (#5425) feat: log rotation (#5561) use app.isPackaged instead of checking for node env development (#5465) disable RPM build-ID generation to prevent package conflicts (#5563) Add Diagnostics Info to Q&A and Bug Report Templates (#5565) ...

* main: (60 commits) fix: add standard context menu items to prevent empty right-click menu (#5616) Bump openapi in prepare-release (#5611) docs: add access control section to Developer tutorial (#5615) Token state not showing on load, or after message is finished. (#5606) Change the other location too (#5608) feat(ui): bring back quick launcher (#5144) Support platform tools through CLI (#5570) Avoid web double write (#5601) fix: gemini flash -> pro for mcp smoke tests (#5574) Manual compaction test and fix (#5568) fix: tidy up claude cli handling (#5594) Remove jetbrains (#5602) feat(githubcopilot): add support for newer Copilot AI Models (#5603) fix: customised recipe to yaml string to avoid minininjia parsing error (#5494) Add pending extension indicator to extension panel (#5493) Add environment subsition for auth blocks (#5439) acp: ToolCallLocations and working cancellation (#5588) feat(providers): add Mistral AI provider (#5009) Listen for ctrl-c during provider request (#5585) Also accept null as description, not just missing (#5589) ...

* main: (31 commits) Standardize CLI argument flags and update documentation (#5516) Release 1.13.0 fix: move goosehints/AGENTS.md handling to goose, and out of developer extension (#5575) fix: add standard context menu items to prevent empty right-click menu (#5616) Bump openapi in prepare-release (#5611) docs: add access control section to Developer tutorial (#5615) Token state not showing on load, or after message is finished. (#5606) Change the other location too (#5608) feat(ui): bring back quick launcher (#5144) Support platform tools through CLI (#5570) Avoid web double write (#5601) fix: gemini flash -> pro for mcp smoke tests (#5574) Manual compaction test and fix (#5568) fix: tidy up claude cli handling (#5594) Remove jetbrains (#5602) feat(githubcopilot): add support for newer Copilot AI Models (#5603) fix: customised recipe to yaml string to avoid minininjia parsing error (#5494) Add pending extension indicator to extension panel (#5493) Add environment subsition for auth blocks (#5439) acp: ToolCallLocations and working cancellation (#5588) ...

Signed-off-by: fbalicchia <fbalicchia@gmail.com>

Signed-off-by: Blair Allan <Blairallan@icloud.com>

acp: ToolCallLocations and working cancellation

aa01e2c

alexhancock requested review from Copilot and michaelneale November 5, 2025 21:16

alexhancock mentioned this pull request Nov 5, 2025

fix: make ACP cancellation work #5583

Closed

Copilot AI reviewed Nov 5, 2025

View reviewed changes

michaelneale reviewed Nov 5, 2025

View reviewed changes

michaelneale approved these changes Nov 5, 2025

View reviewed changes

DOsinga merged commit b2aa26a into main Nov 6, 2025
24 of 25 checks passed

github-actions bot mentioned this pull request Nov 6, 2025

chore(release): release version 1.13.1 (patch) #5619

Merged

fbalicchia pushed a commit to fbalicchia/goose that referenced this pull request Nov 7, 2025

acp: ToolCallLocations and working cancellation (block#5588)

8548985

Signed-off-by: fbalicchia <fbalicchia@gmail.com>

github-actions bot mentioned this pull request Nov 11, 2025

chore(release): release version 1.14.0 (minor) #5676

Merged

Surendhar-N-D pushed a commit to Surendhar-N-D/goose that referenced this pull request Nov 17, 2025

acp: ToolCallLocations and working cancellation (block#5588)

e59a9cd

arul-cc pushed a commit to arul-cc/goose that referenced this pull request Nov 17, 2025

acp: ToolCallLocations and working cancellation (block#5588)

9540724

BlairAllan pushed a commit to BlairAllan/goose that referenced this pull request Nov 29, 2025

acp: ToolCallLocations and working cancellation (block#5588)

024c84c

Signed-off-by: Blair Allan <Blairallan@icloud.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

acp: ToolCallLocations and working cancellation#5588

acp: ToolCallLocations and working cancellation#5588
DOsinga merged 1 commit intomainfrom
alexhancock/acp-improvements

alexhancock commented Nov 5, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Nov 5, 2025

Uh oh!

Copilot AI Nov 5, 2025

Uh oh!

michaelneale Nov 5, 2025

Uh oh!

michaelneale left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

alexhancock commented Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

michaelneale Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

michaelneale left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

alexhancock commented Nov 5, 2025 •

edited

Loading