fix(desktop): enable buzz-dev-mcp MCP server for Codex agents#1394
Merged
Conversation
wpfleger96
force-pushed
the
duncan/codex-mcp-env-forward
branch
from
3cd4cc9 to
21ecf09
Compare
wpfleger96
force-pushed
the
duncan/codex-mcp-env-forward
branch
from
21ecf09 to
84b1bc7
Compare
The codex runtime entry in discovery.rs had mcp_command: None, so
build_mcp_servers returned vec![] — no MCP server was ever configured
for Codex agents and buzz-dev-mcp was never spawned.
Set mcp_command: Some("buzz-dev-mcp") to match the buzz-agent entry.
This wires buzz-dev-mcp as a configured MCP server with BUZZ_RELAY_URL,
BUZZ_PRIVATE_KEY, and BUZZ_AUTH_TAG forwarded via the ACP McpServer.env
field, bypassing Codex's parent-env scrub via the protocol.
Leave mcp_hooks: false since codex-acp does not handle MCP_HOOK_SERVERS
today. Add codex_has_mcp_command test that pins both fields.
Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
wpfleger96
force-pushed
the
duncan/codex-mcp-env-forward
branch
from
84b1bc7 to
8328e5a
Compare
wpfleger96
pushed a commit
that referenced
this pull request
Jun 30, 2026
…work * origin/main: (25 commits) fix(thread): stop mid-scroll content jump in live threads (#1397) fix(ci): restore main to green — tauri fmt, personas.rs file-size split, Windows path test (#1399) fix(desktop): enable buzz-dev-mcp MCP server for Codex agents (#1394) fix(ci): restore E2E flakiness fixes for pgschema, docker-pull, and spec timing (#1396) fix(personas): persist pack-backed persona UI edits across reboot (#1392) fix(buzz-acp): clear steer_rx on all run_prompt_task exit paths (#1391) Restore channel date divider rule (#1395) Speed up profile wave action (#1379) Restore visible links for rich previews (#1378) Mobile channel list polish (#1367) style(desktop): unify corner radii to rounded-2xl (16px) (#1393) fix(desktop): skip keychain write when blob contents are unchanged (#1377) fix(desktop): stop clipping the agent-activity row under the composer (#1371) Constrain macOS overscroll to conversations (#1317) Mobile appearance foundation (#1366) chore(release): release Buzz Desktop version 0.3.38 (#1375) feat(desktop): provider-agnostic model selection + databricks discovery (#1307) release(helm): buzz chart 0.1.1 (#1374) Harden relay attack surfaces (#1369) ci(helm): publish chart to GHCR on chart-v* tags (#1372) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes Codex agents never connecting to `buzz-dev-mcp` by enabling the MCP server for the codex runtime.
The codex runtime entry in `discovery.rs` had `mcp_command: None`. This propagated to `BUZZ_ACP_MCP_COMMAND=""` when spawning buzz-acp for a Codex agent, causing `build_mcp_servers` to return an empty list — no MCP server was ever configured, so `buzz-dev-mcp` was never started and Codex agents had no access to buzz tools. The Codex-native exec tool is seatbelt-sandboxed with network disabled, so the only way to run `buzz messages send` is through the MCP `shell` tool; without this fix, Codex agents could receive mentions but could never reply.
E2E verified: Thufir replied via `buzz messages send` through the MCP `shell` tool after applying this change in a `just staging` dev build.