[kocaemre]

Summary

• Fixes MCP env overrides in CODEX_CONFIG get dropped when a session adds another MCP server #489.
• Merges CODEX_CONFIG mcp_servers with ACP-provided MCP servers instead of replacing the configured map when a session adds another server.
• Adds a regression test that preserves an existing node_repl proxy env override while adding a separate ACP docs server.

Test Plan

• npm test -- src/__tests__/CodexACPAgent/CodexAcpClient.test.ts -t 'preserves MCP servers from CODEX_CONFIG'
• npm run typecheck
• npm test
• git diff --check

Claude Code note: attempted claude -p diff review locally, but this machine's Claude Code is not logged in (Not logged in · Please run /login).

[kocaemre]

Rebased this onto the current main and resolved the MCP config merge conflict by keeping the current normalized MCP serialization while preserving existing CODEX_CONFIG.mcp_servers entries.

Verification on head 1859cc7:

• npm ci
• npm run test -- src/__tests__/CodexACPAgent/CodexAcpClient.test.ts -t 'CODEX_CONFIG|sanitizes whitespace in ACP MCP server names' — 2 passed, 111 skipped
• npm run test -- src/__tests__/CodexACPAgent/CodexAcpClient.test.ts — 113 passed
• npm run typecheck
• npm run build
• git diff --check upstream/main..HEAD

[kocaemre]

Rebased this onto current main after the 2.1.0 release and resolved the MCP config conflict by preserving the current createMcpSeverConfig(...) path while keeping the existing CODEX_CONFIG.mcp_servers merge behavior.

Local verification on the rebased head:

• npm ci
• npm run test -- src/__tests__/CodexACPAgent/CodexAcpClient.test.ts -t 'CODEX_CONFIG|sanitizes whitespace in ACP MCP server names' — 2 passed / 111 skipped
• npm run test -- src/__tests__/CodexACPAgent/CodexAcpClient.test.ts — 113 passed
• npm run typecheck
• npm run build
• git diff --check upstream/main..HEAD

[kocaemre]

Closing this as duplicate of #490. That earlier PR preserves CODEX_CONFIG.mcp_servers when ACP adds another server with the same object-merge behavior, and also tests conflicts and session isolation. No need to ask maintainers to review two implementations of the same fix.