Skip to content

fix(desktop): wire MCP server for Claude Code agents - #6604

Open
BradGroux wants to merge 1 commit into
block:mainfrom
BradGroux:fix/claude-mcp-command
Open

fix(desktop): wire MCP server for Claude Code agents#6604
BradGroux wants to merge 1 commit into
block:mainfrom
BradGroux:fix/claude-mcp-command

Conversation

@BradGroux

Copy link
Copy Markdown
Contributor

Summary

Claude Code agents get no MCP server from Buzz because the Claude entry in KNOWN_ACP_RUNTIMES has mcp_command: None. Desktop sets BUZZ_ACP_MCP_COMMAND="", and the harness's build_mcp_servers returns an empty list — the session/new mcpServers field stays empty.

Goose avoids this because it loads MCP servers from its own config.yaml (supports_acp_native_config: true). Claude has no native config support — the only way it receives MCP servers is through the session/new mcpServers field, which stays empty when BUZZ_ACP_MCP_COMMAND is blank.

Set Claude's mcp_command to Some("buzz-dev-mcp"), matching Codex and Buzz Agent.

Related issue

Closes #6593

Testing

New unit test claude_has_mcp_command in runtime/tests.rs asserts that known_acp_runtime("claude-agent-acp") resolves with mcp_command: Some("buzz-dev-mcp"). The existing codex_has_mcp_command and goose_has_no_mcp_hooks tests are unchanged, confirming Goose still uses its native config path and Codex still has its MCP command.

Cannot run the full cargo test suite from this host (no Rust toolchain). The build and test gate will be verified on CI.

Claude Code's entry in KNOWN_ACP_RUNTIMES had mcp_command: None, so
Desktop set BUZZ_ACP_MCP_COMMAND="" and the harness never spawned a
MCP server for Claude agents. Goose avoided this because it loads MCP
servers from its own config.yaml (supports_acp_native_config: true),
but Claude has no native config support — the only way it receives
MCP servers is through the session/new mcpServers field, which stays
empty when BUZZ_ACP_MCP_COMMAND is blank.

Set Claude's mcp_command to Some("buzz-dev-mcp"), matching Codex and
Buzz Agent. Added a test asserting Claude has the MCP command wired.

Closes block#6593

Co-authored-by: Brad Groux <brad@digitalmeld.com>
Signed-off-by: Brad Groux <brad@digitalmeld.com>
@BradGroux
BradGroux requested a review from a team as a code owner August 23, 2026 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

buzz-acp: mcp_command / BUZZ_ACP_MCP_COMMAND is never wired for runtime=claude (only runtime=goose)

1 participant