@devries-cameron20 / t3code-1 / commits / c398b46af0
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(server): Codex text generation runs when launch args define an MCP server (#36223)

Julius Marminge committed Nov 13, 2026 at 08:47 UTC c398b46af0ec2aa866c5d92f48ed65c0c385cb78
2 files changed +93 -5
apps/server/src/textGeneration/CodexTextGeneration.test.ts
+76 -1
@@ -58,6 +58,7 @@ interface FakeCodexInput {
58 mcpServers?: ReadonlyArray<{ name: string; enabled: boolean }> | number;
59 requiredCwd?: string;
60 requireInstructions?: string;
61 + requireMcpServersOff?: ReadonlyArray<string>;
62 }
63
64 function makeFakeCodexBinary(dir: string, input: FakeCodexInput) {
@@ -73,6 +74,7 @@ function makeFakeCodexBinary(dir: string, input: FakeCodexInput) {
74 mcpServers: input.mcpServers ?? [],
75 requiredCwd: input.requiredCwd ?? null,
76 requireInstructions: input.requireInstructions ?? null,
77 + requireMcpServersOff: input.requireMcpServersOff ?? [],
78 stderr: input.stderr ?? null,
79 output: input.output,
80 exitCode: input.exitCode ?? 0,
@@ -129,6 +131,33 @@ function makeFakeCodexBinary(dir: string, input: FakeCodexInput) {
131 ' process.stderr.write(message + "\\n");',
132 " process.exit(code);",
133 "}",
134 + "// Like Codex: a later mcp_servers={...} override replaces servers earlier -c flags defined.",
135 + "const servers = new Map();",
136 + "const offServers = new Set();",
137 + "for (let index = 0; index < args.length; index += 1) {",
138 + ' if (args[index] !== "-c" && args[index] !== "--config") continue;',
139 + ' const value = args[index + 1] ?? "";',
140 + ' if (value.startsWith("mcp_servers={")) {',
141 + ' const named = [...value.matchAll(/"([^"]+)"=\\{enabled=false\\}/g)].map((match) => match[1]);',
142 + " for (const name of named) offServers.add(name);",
143 + " for (const name of [...servers.keys()]) {",
144 + " if (named.includes(name)) servers.set(name, false);",
145 + " else servers.delete(name);",
146 + " }",
147 + ' } else if (value.startsWith("mcp_servers.")) {',
148 + ' const [name, key] = value.slice("mcp_servers.".length).split(/[.=]/);',
149 + " if (value === `mcp_servers.${name}.enabled=false`) offServers.add(name);",
150 + " // An enabled flag alone toggles a server another layer (config.toml) defines.",
151 + ' if (key === "enabled" && !servers.has(name)) continue;',
152 + ' servers.set(name, servers.get(name) === true || key === "url" || key === "command");',
153 + " }",
154 + "}",
155 + "for (const [name, hasTransport] of servers) {",
156 + ' if (!hasTransport) fail("Error loading config.toml: invalid transport in `mcp_servers." + name + "`", 12);',
157 + "}",
158 + "for (const name of check.requireMcpServersOff) {",
159 + ' if (!offServers.has(name)) fail("MCP server left on: " + name, 13);',
160 + "}",
161 'if (check.requiredCwd !== null && process.cwd() !== check.requiredCwd) fail("cannot inspect checkout", 10);',
162 'if (check.requireInstructions !== null && !instructions.includes(check.requireInstructions)) fail("missing writer task", 11);',
163 "if (check.requireArg !== null && !originalArgs.includes(` ${check.requireArg} `)) {",
@@ -365,7 +394,7 @@ it.layer(layerCodexTextGenerationTest)("CodexTextGeneration", (it) => {
394 { name: "already-off", enabled: false },
395 ],
396 requireArg:
368 - '--config features.plugins=false --config features.apps=false --config mcp_servers={"augmenter"={enabled=false},"my.server"={enabled=false}}',
397 + 'exec --config mcp_servers={"augmenter"={enabled=false},"my.server"={enabled=false}} --config developer_instructions="Use',
398 },
399 (textGeneration) =>
400 Effect.gen(function* () {
@@ -384,6 +413,52 @@ it.layer(layerCodexTextGenerationTest)("CodexTextGeneration", (it) => {
413 ),
414 );
415
416 + it.effect("turns off an MCP server that launch args define without dropping its transport", () =>
417 + withFakeCodexEnv(
418 + {
419 + output: JSON.stringify({ title: "Remove default shapes" }),
420 + launchArgs: `-c 'mcp_servers.t3-code.url="http://127.0.0.1:1/mcp"' -c 'mcp_servers.t3-code.enabled=true'`,
421 + mcpServers: [{ name: "t3-code", enabled: true }],
422 + requireMcpServersOff: ["t3-code"],
423 + requireArg:
424 + "--config features.apps=false --config mcp_servers.t3-code.enabled=false --ephemeral",
425 + },
426 + (textGeneration) =>
427 + Effect.gen(function* () {
428 + const result = yield* textGeneration.generateThreadTitle({
429 + cwd: process.cwd(),
430 + message: "Remove default shapes from characters",
431 + modelSelection: DEFAULT_TEST_MODEL_SELECTION,
432 + });
433 + expect(result.title).toBe("Remove default shapes");
434 + }),
435 + ),
436 + );
437 +
438 + it.effect("keeps MCP servers off when launch args set their own mcp_servers table", () =>
439 + withFakeCodexEnv(
440 + {
441 + output: JSON.stringify({ title: "Remove default shapes" }),
442 + launchArgs: `-c 'mcp_servers={"my.server"={command="echo",enabled=true}}'`,
443 + mcpServers: [
444 + { name: "my.server", enabled: true },
445 + { name: "my server", enabled: true },
446 + ],
447 + requireArg:
448 + '--config features.apps=false --config mcp_servers={"my.server"={enabled=false},"my server"={enabled=false}} --config mcp_servers.my server.enabled=false --ephemeral',
449 + },
450 + (textGeneration) =>
451 + Effect.gen(function* () {
452 + const result = yield* textGeneration.generateThreadTitle({
453 + cwd: process.cwd(),
454 + message: "Remove default shapes from characters",
455 + modelSelection: DEFAULT_TEST_MODEL_SELECTION,
456 + });
457 + expect(result.title).toBe("Remove default shapes");
458 + }),
459 + ),
460 + );
461 +
462 it.effect("still generates when Codex cannot list its MCP servers", () =>
463 withFakeCodexEnv(
464 {
apps/server/src/textGeneration/CodexTextGeneration.ts
+17 -4
@@ -55,6 +55,11 @@ const codexMcpServersOff = (names: ReadonlyArray<string>): string | null =>
55 names.length === 0
56 ? null
57 : `mcp_servers={${names.map((name) => `${JSON.stringify(name)}={enabled=false}`).join(",")}}`;
58 +// Codex splits -c keys at the first "=" and on every dot, so only those names take a dotted flag.
59 +const codexMcpServerOffFlags = (names: ReadonlyArray<string>) =>
60 + names
61 + .filter((name) => !name.includes(".") && !name.includes("="))
62 + .flatMap((name) => ["--config", `mcp_servers.${name}.enabled=false`]);
63 const encodeJsonString = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
64 export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(function* (
65 codexConfig: CodexSettings,
@@ -291,20 +296,28 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
296 }
297 : {}),
298 };
294 - const mcpServersOff = yield* listEnabledMcpServers({
299 + const enabledMcpServers = yield* listEnabledMcpServers({
300 binary,
301 cwd,
302 env,
303 launchArgs: codexMcpListLaunchArgs(launchArgs),
299 - }).pipe(Effect.map(codexMcpServersOff));
304 + });
305 + const mcpServersOff = codexMcpServersOff(enabledMcpServers);
306 + const execLaunchArgs = codexExecLaunchArgs(launchArgs);
307 + // A launch-arg mcp_servers={...} table replaces ours and can re-enable dotted names.
308 + const launchArgsSetMcpTable = execLaunchArgs.some((arg) => /\bmcp_servers\s*=/.test(arg));
309 const spawnCommand = yield* resolveSpawnCommand(
310 binary,
311 [
312 "exec",
304 - ...codexExecLaunchArgs(launchArgs),
313 + // Before launch args: a later table would replace servers their -c flags define.
314 + ...(mcpServersOff ? ["--config", mcpServersOff] : []),
315 + ...execLaunchArgs,
316 // A user's MCP server could act on the text-generation prompt.
317 ...CODEX_NO_PLUGIN_ARGS,
307 - ...(mcpServersOff ? ["--config", mcpServersOff] : []),
318 + ...(mcpServersOff && launchArgsSetMcpTable ? ["--config", mcpServersOff] : []),
319 + // After launch args, so a launch arg's enabled=true cannot turn a server back on.
320 + ...codexMcpServerOffFlags(enabledMcpServers),
321 "--ephemeral",
322 "--skip-git-repo-check",
323 "-s",