feat(code-mode): use server names for MCP extensions #6284

codefromthecrypt · 2025-12-26T01:30:33Z

Summary

Makes code mode usable in ACP and improves extension naming for better LLM accuracy.

Code mode in ACP: Adds --with-builtin arg so ACP clients can enable code_execution and developer extensions.

Better extension names: When no name is configured (e.g., CLI --with-streamable-http-extension), extensions now use server-declared names instead of anonymous identifiers. User-configured names from goose config or ACP sessions are still preferred.

Before (CLI arg, no configured name):

$ goose run --with-streamable-http-extension 'https://mcp.kiwi.com'   -t 'Use kiwi to find the fastest itinerary from BKI to SYD tomorrow'
--snip--
─── search-flight | mcpkiwicom_yfvx6ext ──────────────────────────

After:

─── search-flight | kiwi-mcp-server ──────────────────────────

LLMs can now match extension names to server info in their prompts. Collision suffix added when duplicate names exist.

Type of Change

Feature
Tests

AI Assistance

This PR was created or reviewed with AI assistance

Testing

New integration test: test_acp_with_builtin_and_mcp - verifies code_execution and MCP servers work together in ACP mode.

Manual:

goose run --with-streamable-http-extension 'https://mcp.kiwi.com'   -t 'Use kiwi to find the fastest itinerary from BKI to SYD tomorrow'

Related Issues

Closes #6188

Copilot

Pull request overview

This PR enhances MCP extension handling in goose by enabling code mode in ACP and improving extension naming for better LLM interaction.

Key Changes

ACP code mode support: Adds --with-builtin CLI argument allowing ACP clients to enable built-in extensions like code_execution and developer
Server-based extension naming: Extensions without configured names now use MCP server-declared names instead of random identifiers, with collision detection
Search filtering: Excludes extensionmanager from code_execution search results to reduce LLM confusion about internal tools

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
crates/goose/src/agents/extension_manager.rs	Adds `resolve_extension_name()` function to use server-declared names with collision handling via random suffixes
crates/goose/src/agents/code_execution_extension.rs	Filters out `extensionmanager` from module search results
crates/goose-cli/src/session/mod.rs	Removes `generate_extension_name()` - extensions now use empty name strings to trigger server name resolution
crates/goose-cli/src/commands/acp.rs	Adds `add_builtins()` helper and `--with-builtin` parameter support for ACP mode
crates/goose-cli/src/cli.rs	Adds `--with-builtin` CLI argument with comma-separated builtin names
crates/goose/tests/acp_integration_test.rs	Adds `test_acp_with_builtin_and_mcp` integration test verifying code_execution works with MCP servers, updates test server to declare explicit name
crates/goose/tests/test_data/openai_*.txt	Updates test fixtures with new model format and adds builtin extension interaction test data

crates/goose/src/agents/extension_manager.rs

codefromthecrypt · 2025-12-27T01:46:24Z

crates/goose/src/agents/extension_manager.rs

+            }
+        }
+
+        #[test_case("kiwi", Some("kiwi-mcp-server"), None, "^kiwi$" ; "ACP session prefers explicit name")]


FYI: all of these are real server names scraped from the public MCP impls

crates/goose/src/agents/code_execution_extension.rs

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated no new comments.

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated no new comments.

Copilot

Pull request overview

Copilot reviewed 14 out of 15 changed files in this pull request and generated no new comments.

crates/goose/src/providers/oauth.rs

codefromthecrypt · 2025-12-29T05:26:39Z

crates/goose/tests/acp_integration_test.rs

        .env("GOOSE_MODE", "approve")
        .env("OPENAI_HOST", mock_server.uri())
        .env("OPENAI_API_KEY", "test-key")
+        .env("GOOSE_PATH_ROOT", data_root)


added this to isolate the DBs between tests, but allow us to intentionally share them. This will be very important in subsequent change for session load, resume and list capabilities

makes sense.

Copilot

Pull request overview

Copilot reviewed 13 out of 14 changed files in this pull request and generated 2 comments.

crates/goose/Cargo.toml

crates/goose-cli/Cargo.toml

michaelneale · 2025-12-29T05:43:06Z

I'm not sure why - but the GUI isn't working with this - never get a response, no matter what I do (I just flicked to main and tried again) - if I turn off code mode it is fine.

codefromthecrypt · 2025-12-29T06:44:33Z

@michaelneale good check and I promise to use the gui also from now on or at least until all the things load extensions the same way.

What happened is that on main we load the same extension multiple times. My change was overzealous wrt collisions and it added a suffix if an extension already exists. This is wrong even if loading the same extension multiple times is inefficient.

I will fix the code to only do collision avoidance on anonymous extensions. There is a real chance they will collide as all the paths are like /mcp and sometimes even the server name is fake 'StatelessApp'.

Copilot

Pull request overview

Copilot reviewed 14 out of 15 changed files in this pull request and generated no new comments.

codefromthecrypt · 2025-12-30T00:38:16Z

xcap needed an update to be compatible with core-foundation 0.10.0 → 0.10.1

I'm running a manual flow to capture windows, my screen etc to make sure everything is keen

codefromthecrypt · 2025-12-30T01:25:20Z

Manually tested code affected by the xcap by using the following prompts:

list all open windows on my screen
capture a screenshot of the window titled Calculator
capture a screenshot of my main display

Note: Goose doesn't work with capture on macos until authorized, you need to authorize the binary you built from source.

So you need to..

Edit Justfile so that it has consistent signatures between Goose.app and goosed
just make-ui then unzip the result somewhere
open "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture"
Hit the + sign and drag the Goose binary into that
Then launch the same binary

diff --git a/Justfile b/Justfile
index e7a6ea9d93..ca75de10aa 100644
--- a/Justfile
+++ b/Justfile
@@ -199,7 +199,18 @@ generate-openapi:
 lint-ui:
     cd ui/desktop && npm run lint:check
 
-# make GUI with latest binary
+# Signing added for screenshots on MacOS
+# open "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture"
+# and authorize ui/desktop/out/Goose-darwin-arm64/Goose.app before running Goose
+[macos]
+make-ui:
+    @just release-binary
+    cd ui/desktop && npm run bundle:default
+    codesign --force --deep --sign - --entitlements ui/desktop/entitlements.plist ui/desktop/out/Goose-darwin-arm64/Goose.app/Contents/Resources/bin/goosed
+    codesign --force --deep --sign - --entitlements ui/desktop/entitlements.plist ui/desktop/out/Goose-darwin-arm64/Goose.app
+
+[linux]
+[windows]
 make-ui:
     @just release-binary
     cd ui/desktop && npm run bundle:default

For example, you should have Goose here, but the important thing is that it is from the path you are actually running

If you don't do this, list windows will partially work only able to read the background image and system menubar. This has nothing to do with this PR, just I wanted to write this down for future self.

codefromthecrypt · 2025-12-30T01:56:12Z

noticed xcap update was attempted in #4344 and the main thing was the CI packages. I used the same literal packages from xcap themselves, so 🤞 it will pass

Copilot

Pull request overview

Copilot reviewed 18 out of 19 changed files in this pull request and generated 4 comments.

crates/goose-mcp/src/computercontroller/pdf_tool.rs

Signed-off-by: Adrian Cole <[email protected]>

Copilot

Pull request overview

Copilot reviewed 18 out of 19 changed files in this pull request and generated no new comments.

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt · 2025-12-30T04:58:17Z

crates/goose-mcp/Cargo.toml

 shellexpand = "3.1.0"
 indoc = "2.0.5"
-xcap = "0.0.14"
+xcap = "=0.4.0"


this is the revlock version that allows everything else to pass. Movement past this in #6301

codefromthecrypt · 2025-12-30T05:00:47Z

re-ran all steps manually, choosing xcap 0.4.0 which is the latest version that needs no new platform deps on linux.

codefromthecrypt · 2025-12-30T05:08:48Z

thanks for all the support @michaelneale!

codefromthecrypt · 2025-12-30T05:13:34Z

fyi opened this nashaofu/xcap#250 and once it is merged and when we can upgrade will be a lot easier to detect subtle permissions problem on screen capture that need the user to overcome.

* main: fix: adding more open models (#6300) docs: add goose for vs code extension (#6262) feat(code-mode): use server names for MCP extensions (#6284) docs: agent skills compatibility note (#6299) docs: clarify GOOSE_TERMINAL requires ~/.zshenv for zsh users (#6297) feat: add OpenAI Codex CLI provider (#6263) docs: fix Resources menu (#6292) Remove Advent of AI announcement banner (#6291) Add blog post: How We Use goose to Maintain goose (#6289)

Signed-off-by: Adrian Cole <[email protected]> Signed-off-by: James Loope <[email protected]>

codefromthecrypt marked this pull request as ready for review December 26, 2025 01:58

Copilot AI review requested due to automatic review settings December 26, 2025 01:58

codefromthecrypt mentioned this pull request Dec 26, 2025

code mode: better LLM UX on runtime added extensions #6188

Closed

1 task

Copilot started reviewing on behalf of codefromthecrypt December 26, 2025 01:59 View session

Copilot AI reviewed Dec 26, 2025

View reviewed changes

crates/goose/src/agents/extension_manager.rs Outdated Show resolved Hide resolved

codefromthecrypt commented Dec 27, 2025

View reviewed changes

crates/goose/src/agents/code_execution_extension.rs Outdated Show resolved Hide resolved

Copilot AI review requested due to automatic review settings December 27, 2025 07:20

Copilot started reviewing on behalf of codefromthecrypt December 27, 2025 07:21 View session

Copilot AI reviewed Dec 27, 2025

View reviewed changes

codefromthecrypt force-pushed the codeex_ux branch from 51de2f1 to 451c7c3 Compare December 28, 2025 01:08

Copilot AI review requested due to automatic review settings December 28, 2025 04:05

Copilot started reviewing on behalf of codefromthecrypt December 28, 2025 04:06 View session

Copilot AI reviewed Dec 28, 2025

View reviewed changes

codefromthecrypt force-pushed the codeex_ux branch from edbb8e6 to c84aafb Compare December 28, 2025 06:03

michaelneale self-assigned this Dec 29, 2025

Copilot AI review requested due to automatic review settings December 29, 2025 02:22

Copilot started reviewing on behalf of codefromthecrypt December 29, 2025 02:23 View session

Copilot AI reviewed Dec 29, 2025

View reviewed changes

michaelneale reviewed Dec 29, 2025

View reviewed changes

crates/goose/src/providers/oauth.rs Show resolved Hide resolved

codefromthecrypt force-pushed the codeex_ux branch from ee2e3f2 to e32f7f6 Compare December 29, 2025 05:10

Copilot AI review requested due to automatic review settings December 29, 2025 05:25

codefromthecrypt force-pushed the codeex_ux branch from e32f7f6 to ebd1f3b Compare December 29, 2025 05:25

Copilot started reviewing on behalf of codefromthecrypt December 29, 2025 05:26 View session

codefromthecrypt commented Dec 29, 2025

View reviewed changes

codefromthecrypt requested a review from michaelneale December 29, 2025 05:26

Copilot AI reviewed Dec 29, 2025

View reviewed changes

crates/goose/Cargo.toml Show resolved Hide resolved

crates/goose-cli/Cargo.toml Show resolved Hide resolved

Copilot AI review requested due to automatic review settings December 29, 2025 07:01

Copilot AI reviewed Dec 30, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 30, 2025 01:55

codefromthecrypt force-pushed the codeex_ux branch from 653b2e1 to b8ece62 Compare December 30, 2025 01:55

Copilot started reviewing on behalf of codefromthecrypt December 30, 2025 01:55 View session

Copilot AI reviewed Dec 30, 2025

View reviewed changes

codefromthecrypt added 4 commits December 30, 2025 10:39

feat(code-mode): use server names for MCP extensions

7595012

Signed-off-by: Adrian Cole <[email protected]>

fix: only generate extension name when config name is empty

1063eb1

Signed-off-by: Adrian Cole <[email protected]>

chore: upgrade sacp to 10.0.0-alpha.3

334b3da

Signed-off-by: Adrian Cole <[email protected]>

fix: address tempfile deprecation warnings

c4f4ac7

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt force-pushed the codeex_ux branch from b8ece62 to ed23d02 Compare December 30, 2025 02:44

codefromthecrypt mentioned this pull request Dec 30, 2025

Remove Linux screen capture support due to xcap maintenance burden #6301

Open

Copilot AI review requested due to automatic review settings December 30, 2025 03:18

Copilot started reviewing on behalf of codefromthecrypt December 30, 2025 03:18 View session

Copilot AI reviewed Dec 30, 2025

View reviewed changes

codefromthecrypt added 2 commits December 30, 2025 12:53

fix: update xcap to be compatible with core-foundation 0.10.0 → 0.10.1

c279829

Signed-off-by: Adrian Cole <[email protected]>

lines

3605eac

Signed-off-by: Adrian Cole <[email protected]>

codefromthecrypt force-pushed the codeex_ux branch from 4452d23 to 3605eac Compare December 30, 2025 04:55

codefromthecrypt commented Dec 30, 2025

View reviewed changes

codefromthecrypt merged commit d1f9575 into block:main Dec 30, 2025
18 checks passed

codefromthecrypt deleted the codeex_ux branch December 30, 2025 05:13

github-actions bot mentioned this pull request Jan 6, 2026

chore(release): release version 1.19.0 (minor) #6344

Merged

BrewTestBot mentioned this pull request Jan 6, 2026

block-goose-cli 1.19.0 Homebrew/homebrew-core#261531

Merged

cronus42 pushed a commit to cronus42/goose that referenced this pull request Jan 7, 2026

feat(code-mode): use server names for MCP extensions (block#6284)

c303efa

Signed-off-by: Adrian Cole <[email protected]> Signed-off-by: James Loope <[email protected]>

feat(code-mode): use server names for MCP extensions #6284

feat(code-mode): use server names for MCP extensions #6284

Uh oh!

Conversation

codefromthecrypt commented Dec 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Type of Change

AI Assistance

Testing

Related Issues

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Uh oh!

codefromthecrypt Dec 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

codefromthecrypt Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

michaelneale Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

michaelneale commented Dec 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codefromthecrypt commented Dec 29, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

codefromthecrypt commented Dec 30, 2025

Uh oh!

codefromthecrypt commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codefromthecrypt commented Dec 30, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

codefromthecrypt Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

codefromthecrypt commented Dec 30, 2025

codefromthecrypt commented Dec 26, 2025 •

edited

Loading

michaelneale commented Dec 29, 2025 •

edited

Loading

codefromthecrypt commented Dec 30, 2025 •

edited

Loading