Skip to content

external-agent-migration: avoid mixed MCP transport configs#26435

Merged
stefanstokic-oai merged 1 commit into
mainfrom
codex/fix-mixed-mcp-transport-configs
Jun 4, 2026
Merged

external-agent-migration: avoid mixed MCP transport configs#26435
stefanstokic-oai merged 1 commit into
mainfrom
codex/fix-mixed-mcp-transport-configs

Conversation

@stefanstokic-oai
Copy link
Copy Markdown
Contributor

Why

MCP migration could recursively merge an imported server into an existing same-named Codex server. When one definition used stdio and the other used HTTP, this produced an invalid mixed configuration containing both command and url.

What changed

  • Merge MCP configuration at the server level instead of field by field.
  • Preserve an existing same-named Codex MCP server unchanged.
  • Report only MCP servers that would actually be added during detection.
  • Add regression coverage for mixed command/HTTP source configurations.
  • Use neutral fixture names and reserved example.com URLs.

Test plan

  • just test -p codex-app-server repo_mcp
    • 5 tests passed.
  • just test -p codex-external-agent-migration mcp_migration_prefers_command_transport_for_mixed_server_config
    • 1 test passed.

@stefanstokic-oai stefanstokic-oai marked this pull request as ready for review June 4, 2026 17:47
@stefanstokic-oai stefanstokic-oai merged commit c8fdc74 into main Jun 4, 2026
31 checks passed
@stefanstokic-oai stefanstokic-oai deleted the codex/fix-mixed-mcp-transport-configs branch June 4, 2026 18:16
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 4, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants