stefanstokic-oai and GitHub
c8fdc74b42
external-agent-migration: avoid mixed MCP transport configs ( #26435 )
...
## 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.
2026-06-04 14:16:03 -04:00
..
2026-05-18 10:32:33 -07:00
2026-05-19 17:54:41 -07:00
2026-05-26 20:59:47 -07:00
2026-05-07 15:44:17 -07:00
2026-04-28 12:35:00 -07:00
2026-06-03 16:06:52 -07:00
2026-05-07 15:44:17 -07:00
2026-06-04 14:16:03 -04:00
2026-06-02 13:18:59 -07:00
2026-05-25 09:41:12 -07:00
2026-06-04 01:25:11 +05:30
2026-05-28 14:54:39 -07:00
2026-06-02 17:01:02 -07:00
2026-06-01 18:45:07 +00:00
2026-06-03 19:08:19 -07:00
2026-05-07 15:44:17 -07:00
2026-05-08 04:07:59 +00:00
2026-06-04 01:25:11 +05:30
2026-05-05 22:22:01 -07:00
2026-06-01 11:04:21 -07:00
2026-06-04 12:20:32 -05:00
2026-06-02 16:41:48 -07:00
2026-05-07 15:44:17 -07:00
2026-05-07 15:44:17 -07:00
2026-05-07 15:44:17 -07:00
2026-06-04 09:39:20 -07:00
2026-06-02 12:10:14 +02:00
2026-06-01 21:25:42 -07:00
2026-05-26 20:59:47 -07:00
2026-05-07 15:44:17 -07:00
2026-06-02 17:04:11 +02:00
2026-05-07 15:44:17 -07:00
2026-06-02 16:26:36 -07:00
2026-05-28 22:08:05 -07:00
2026-06-03 13:32:55 +02:00
2026-06-04 09:39:20 -07:00
2026-05-19 10:19:46 +00:00
2026-06-04 11:21:40 -04:00
2026-06-04 15:28:06 +02:00
2026-06-02 16:22:32 -07:00
2026-06-02 13:18:59 -07:00
2026-06-01 11:53:31 -07:00
2026-05-07 15:44:17 -07:00
2026-05-07 15:44:17 -07:00
2026-06-04 09:39:20 -07:00
2026-06-04 14:16:03 -04:00
2026-06-04 13:13:05 -04:00
2026-06-01 13:01:36 -07:00
2026-05-26 15:59:25 -07:00
2026-05-07 15:44:17 -07:00
2026-06-01 11:53:31 -07:00
2026-05-28 23:09:55 -07:00
2026-05-18 10:53:49 -07:00
2026-06-02 13:18:59 -07:00
2026-06-03 19:08:19 -07:00
2026-05-07 15:44:17 -07:00
2026-05-28 15:26:55 -07:00
2026-05-07 15:44:17 -07:00
2026-05-28 05:40:17 -07:00
2026-06-01 04:33:20 +00:00
2026-06-01 21:25:42 -07:00
2026-06-04 09:53:08 -04:00
2026-05-30 11:54:58 -07:00
2026-05-28 10:29:06 -07:00
2026-06-02 12:10:14 +02:00
2026-06-01 23:23:59 +00:00
2026-06-04 09:53:08 -04:00
2026-05-28 14:07:25 +02:00
2026-05-21 16:11:59 -07:00
2026-05-25 17:26:10 -03:00
2026-06-03 13:32:55 +02:00
2026-06-03 19:49:58 +00:00
2026-05-07 15:44:17 -07:00
2026-04-22 22:24:12 -07:00
2026-05-07 15:44:17 -07:00
2026-06-04 09:53:08 -04:00
2026-06-02 13:05:20 +02:00
2026-06-01 19:57:11 +02:00
2026-06-03 10:41:41 -07:00
2026-05-26 20:59:47 -07:00
2026-05-07 15:44:17 -07:00
2026-05-29 03:00:35 +00:00
2026-05-07 15:44:17 -07:00
2026-05-28 15:11:11 +00:00
2026-06-04 10:12:08 -05:00
2026-05-07 15:44:17 -07:00
2026-05-13 21:23:19 +00:00
2026-05-07 15:44:17 -07:00
2026-05-29 21:35:53 -07:00
2026-06-02 13:05:20 +02:00
2026-06-02 12:00:04 -07:00
2026-06-03 20:30:15 -03:00
2026-05-07 15:44:17 -07:00
2026-05-27 12:59:11 -07:00
2026-05-18 21:33:05 -07:00
2026-05-06 18:10:30 +00:00
2026-06-03 15:33:34 -07:00
2026-04-24 17:49:29 -07:00
2026-06-04 09:39:20 -07:00
2026-06-04 09:53:08 -04:00
2026-04-20 22:41:54 -07:00
2026-05-13 03:08:01 +00:00
2026-06-04 09:16:03 -07:00
2026-05-26 20:59:47 -07:00