agent-tower 0.7.4 → 0.7.5-beta.5

package/dist/executors/__tests__/codex-mcp-windows.test.js

@@ -0,0 +1,128 @@
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { buildAgentTowerMcpConfigOverrides, getCodexMcpServerNamesForLaunch, resetCodexMcpServerCache, } from '../codex.executor.js';
+import { ExecutionEnv } from '../execution-env.js';
+const mocks = vi.hoisted(() => ({ execFile: vi.fn() }));
+vi.mock('child_process', async (importOriginal) => ({
+    ...await importOriginal(),
+    execFile: mocks.execFile,
+}));
+const nativePlatform = process.platform;
+const platformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform');
+const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-mcp-windows-'));
+const workingDir = path.join(tmpDir, 'project with spaces');
+const codexHome = path.join(tmpDir, 'codex-home');
+fs.mkdirSync(path.join(workingDir, '.codex'), { recursive: true });
+fs.mkdirSync(codexHome);
+fs.writeFileSync(path.join(workingDir, '.codex', 'config.toml'), '[mcp_servers.agent-tower]\ncommand="old-tower"');
+beforeEach(() => {
+    Object.defineProperty(process, 'platform', { ...platformDescriptor, value: 'win32' });
+    resetCodexMcpServerCache();
+    mocks.execFile.mockReset();
+    mocks.execFile.mockImplementation((_command, _args, _options, callback) => {
+        callback(null, JSON.stringify([{ name: 'agent-tower' }, { name: 'project-only' }]));
+    });
+});
+afterEach(() => {
+    Object.defineProperty(process, 'platform', platformDescriptor);
+    resetCodexMcpServerCache();
+});
+afterAll(() => { fs.rmSync(tmpDir, { recursive: true, force: true }); });
+function environment(overrides = {}) {
+    return { CODEX_HOME: codexHome, PROVIDER_SENTINEL: 'provider-value', ...overrides };
+}
+describe('Windows Codex MCP launch discovery', () => {
+    it.each(['cmd', 'BAT'])('loads project MCPs through a .%s shim with cwd, env and config arguments', async (extension) => {
+        const executable = path.join(tmpDir, `npm directory/codex.${extension}`);
+        const env = environment({ ComSpec: 'custom-cmd.exe' });
+        const overrides = ['--profile', 'work profile', '-c', 'model="test model"'];
+        const names = await getCodexMcpServerNamesForLaunch(overrides, undefined, { program: executable, args: overrides }, env, workingDir);
+        expect(names).toEqual(new Set(['agent-tower', 'project-only']));
+        expect(mocks.execFile).toHaveBeenCalledOnce();
+        const [command, args, options] = mocks.execFile.mock.calls[0];
+        expect(command).toBe('custom-cmd.exe');
+        expect(args.slice(0, 3)).toEqual(['/d', '/s', '/c']);
+        expect(args[3]).toContain('codex.' + extension);
+        expect(args[3]).toContain('--profile "work profile"');
+        expect(args[3]).toContain('-c "model=\\"test model\\""');
+        expect(args[3]).toMatch(/ mcp list --json"$/);
+        expect(options).toMatchObject({
+            cwd: fs.realpathSync(workingDir), env, timeout: 3000, windowsHide: true, windowsVerbatimArguments: true,
+        });
+        expect(options.shell).not.toBe(true);
+        const sessionEnv = ExecutionEnv.default(workingDir).merge({
+            AGENT_TOWER_AGENT_CREDENTIAL: 'windows-session-credential',
+            AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+            AGENT_TOWER_SESSION_ID: 'windows-mcp-session',
+        });
+        expect(buildAgentTowerMcpConfigOverrides(sessionEnv, names)).toContain('mcp_servers.agent-tower.enabled=false');
+    });
+    it.each(['ComSpec', 'COMSPEC', undefined])('selects the configured command interpreter (%s)', async (key) => {
+        const env = environment(key ? { [key]: 'selected-cmd.exe' } : {});
+        await getCodexMcpServerNamesForLaunch([], undefined, { program: path.join(tmpDir, 'codex.cmd'), args: [] }, env, workingDir);
+        expect(mocks.execFile.mock.calls[0][0]).toBe(key ? 'selected-cmd.exe' : 'cmd.exe');
+    });
+    it('resolves an npm shim from a Windows Path variable', async () => {
+        const binDir = path.join(tmpDir, 'npm-bin');
+        fs.mkdirSync(binDir, { recursive: true });
+        fs.writeFileSync(path.join(binDir, 'codex.CMD'), '');
+        const env = environment({ Path: binDir, PATHEXT: '.EXE;.CMD;.BAT' });
+        await getCodexMcpServerNamesForLaunch([], undefined, { program: 'codex', args: [] }, env, workingDir);
+        expect(mocks.execFile.mock.calls[0][0]).toBe('cmd.exe');
+        expect(mocks.execFile.mock.calls[0][1][3]).toContain('codex.CMD');
+    });
+    it('retains a relative custom shim and resolves it from the target workspace', async () => {
+        await getCodexMcpServerNamesForLaunch([], undefined, { program: './tools/custom-codex.cmd', args: ['--profile', 'custom'] }, environment(), workingDir);
+        const args = mocks.execFile.mock.calls[0][1];
+        expect(args[3]).toContain('custom-codex.cmd');
+        // cmd quoting escapes Windows path separators; normalize only for this assertion.
+        expect(args[3].replace(/\\\\/g, '\\')).toContain(path.join(workingDir, 'tools', 'custom-codex.cmd'));
+        expect(args[3]).toContain('--profile custom mcp list --json');
+    });
+    it('keeps native executables and missing custom commands on the direct path', async () => {
+        for (const program of [path.join(tmpDir, 'native codex.exe'), 'custom-missing-codex']) {
+            const args = ['-c', 'model="test model"'];
+            await getCodexMcpServerNamesForLaunch(args, undefined, { program, args }, environment(), workingDir);
+            expect(mocks.execFile).toHaveBeenLastCalledWith(program, [...args, 'mcp', 'list', '--json'], expect.not.objectContaining({ windowsVerbatimArguments: true }), expect.any(Function));
+        }
+    });
+    it('retains the existing global fallback if the command interpreter fails', async () => {
+        const configPath = path.join(tmpDir, 'fallback.toml');
+        fs.writeFileSync(configPath, '[mcp_servers.global-only]\ncommand="fallback-mcp"');
+        mocks.execFile.mockImplementation((_command, _args, _options, callback) => callback(new Error('interpreter failed'), ''));
+        const names = await getCodexMcpServerNamesForLaunch([], configPath, { program: path.join(tmpDir, 'codex.cmd'), args: [] }, environment(), workingDir);
+        expect(names).toEqual(new Set(['global-only']));
+    });
+    it('does not wrap a .cmd filename on Unix', async () => {
+        Object.defineProperty(process, 'platform', { ...platformDescriptor, value: 'linux' });
+        const executable = path.join(tmpDir, 'unix-codex.cmd');
+        await getCodexMcpServerNamesForLaunch([], undefined, { program: executable, args: [] }, environment(), workingDir);
+        expect(mocks.execFile).toHaveBeenCalledWith(executable, ['mcp', 'list', '--json'], expect.not.objectContaining({ windowsVerbatimArguments: true }), expect.any(Function));
+    });
+});
+describe.skipIf(nativePlatform !== 'win32')('native Windows npm shim discovery', () => {
+    it.each(['cmd', 'bat'])('round-trips project configuration and arguments through a real .%s shim', async (extension) => {
+        const nativeChildProcess = await vi.importActual('child_process');
+        mocks.execFile.mockImplementation(nativeChildProcess.execFile);
+        const script = path.join(tmpDir, 'native-probe.cjs');
+        const captured = path.join(tmpDir, `native-args-${extension}.json`);
+        fs.writeFileSync(script, [
+            'const fs = require("node:fs");',
+            `fs.writeFileSync(${JSON.stringify(captured)}, JSON.stringify({args: process.argv.slice(2), cwd: process.cwd(), sentinel: process.env.PROVIDER_SENTINEL}));`,
+            'const config = fs.readFileSync(".codex/config.toml", "utf8");',
+            'process.stdout.write(JSON.stringify(config.includes("mcp_servers.agent-tower") ? [{name:"agent-tower"}] : []));',
+        ].join('\n'));
+        const shim = path.join(tmpDir, `native codex.${extension}`);
+        fs.writeFileSync(shim, `@echo off\r\n"${process.execPath}" "${script}" %*\r\n`);
+        const args = ['-c', 'model="test model"'];
+        const env = environment({ ...process.env, CODEX_HOME: codexHome });
+        const names = await getCodexMcpServerNamesForLaunch(args, undefined, { program: shim, args }, env, workingDir);
+        expect(names).toEqual(new Set(['agent-tower']));
+        expect(JSON.parse(fs.readFileSync(captured, 'utf8'))).toEqual({
+            args: [...args, 'mcp', 'list', '--json'], cwd: fs.realpathSync(workingDir), sentinel: 'provider-value',
+        });
+    });
+});
+//# sourceMappingURL=codex-mcp-windows.test.js.map

package/dist/executors/__tests__/codex-mcp-windows.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-mcp-windows.test.js","sourceRoot":"","sources":["../../../src/executors/__tests__/codex-mcp-windows.test.ts"],"names":[],"mappings":"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"}

package/dist/executors/__tests__/codex.executor.test.js

@@ -2,7 +2,8 @@ import { describe, expect, it, afterAll, afterEach, beforeEach, vi } from 'vites
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { buildAgentTowerMcpEnvConfigOverrides, getCodexDeclaredMcpServerNames, queryCodexMcpServerNames, detectDeclaredMcpServers, getCachedCodexMcpServerNames, resetCodexMcpServerCache, waitForCodexMcpServerCacheRefresh, CODEX_HTTP_ONLY_OPENAI_PROVIDER_ID, getCodexPermissionMode, CodexExecutor, } from '../codex.executor.js';
+import { parse as parseToml } from 'smol-toml';
+import { buildAgentTowerMcpConfigOverrides, buildAgentTowerMcpEnvConfigOverrides, getCodexDeclaredMcpServerNames, queryCodexMcpServerNames, detectDeclaredMcpServers, getCachedCodexMcpServerNames, getCodexMcpServerNamesForLaunch, resetCodexMcpServerCache, waitForCodexMcpServerCacheRefresh, CODEX_HTTP_ONLY_OPENAI_PROVIDER_ID, getCodexPermissionMode, CodexExecutor, } from '../codex.executor.js';
 import { AGENT_SUBPROCESS_BLOCKED_ENV_KEYS, AGENT_TOWER_MCP_IDENTITY_ENV_KEYS, AGENT_TOWER_MCP_SERVICE_ENV_KEYS, ExecutionEnv, } from '../execution-env.js';
 import { getExecutorByProvider, createExecutorFromProvider } from '../index.js';
 import { createProvider as createRawProvider, reloadProviders, updateProvider } from '../providers.js';
@@ -637,6 +638,7 @@ function createAsyncProbeCodex(name, stdout, options = {}) {
     const script = [
         '#!/bin/sh',
         `printf '1\\n' >> "${countFile}"`,
+        `pwd >> "${path.join(binDir, 'probe-cwds')}"`,
         `sleep ${delaySeconds}`,
         'cat <<\'FAKE_EOF\'',
         stdout,
@@ -653,6 +655,34 @@ function probeCount(binDir) {
         return 0;
     return fs.readFileSync(file, 'utf-8').trim().split('\n').filter(Boolean).length;
 }
+function createWorkspaceProbeCodex(name, options = {}) {
+    const binDir = path.join(tmpDir, `workspace-probe-${name}`);
+    fs.mkdirSync(binDir, { recursive: true });
+    const script = `#!${process.execPath}
+const fs = require('node:fs');
+const path = require('node:path');
+fs.appendFileSync(${JSON.stringify(path.join(binDir, 'probe-count'))}, '1\\n');
+fs.appendFileSync(${JSON.stringify(path.join(binDir, 'probe-cwds'))}, process.cwd() + '\\n');
+setTimeout(() => {
+  const files = [path.join(process.env.CODEX_HOME, 'config.toml')];
+  if (!${Boolean(options.ignoreProject)}) {
+    for (let dir = process.cwd(); ; dir = path.dirname(dir)) {
+      files.push(path.join(dir, '.codex', 'config.toml'));
+      if (path.dirname(dir) === dir) break;
+    }
+  }
+  const names = new Set();
+  for (const file of files) {
+    try {
+      for (const match of fs.readFileSync(file, 'utf8').matchAll(/^\\[mcp_servers\\.([a-zA-Z0-9_-]+)\\]/gm)) names.add(match[1]);
+    } catch {}
+  }
+  process.stdout.write(JSON.stringify([...names].map(name => ({ name }))));
+}, ${options.delayMs ?? 0});
+`;
+    fs.writeFileSync(path.join(binDir, 'codex'), script, { mode: 0o755 });
+    return binDir;
+}
 describe('getCachedCodexMcpServerNames', () => {
     it('returns fallback names immediately and probes without blocking the event loop', async () => {
         const binDir = createAsyncProbeCodex('nonblocking', JSON.stringify([{ name: 'agent-tower' }]), { delayMs: 500 });
@@ -724,6 +754,126 @@ describe('getCachedCodexMcpServerNames', () => {
         await waitForCodexMcpServerCacheRefresh();
         expect(probeCount(binDir)).toBe(1);
     });
+    it('awaits effective workspace and ancestor declarations on the first launch without blocking the event loop', async () => {
+        const binDir = createWorkspaceProbeCodex('workspace-fallback', { delayMs: 100 });
+        const home = path.join(tmpDir, 'workspace-fallback-home');
+        const project = path.join(tmpDir, 'workspace-fallback-project');
+        const workingDir = path.join(project, 'packages', 'app');
+        fs.mkdirSync(home, { recursive: true });
+        fs.mkdirSync(path.join(project, '.codex'), { recursive: true });
+        fs.mkdirSync(path.join(workingDir, '.codex'), { recursive: true });
+        fs.writeFileSync(path.join(home, 'config.toml'), '[mcp_servers.global-tool]\ncommand="global-mcp"');
+        fs.writeFileSync(path.join(project, '.codex', 'config.toml'), '[mcp_servers.agent-tower]\nurl="https://old.example/mcp"');
+        const sessionEnv = ExecutionEnv.default(workingDir).merge({
+            AGENT_TOWER_AGENT_CREDENTIAL: 'project-session-credential',
+            AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+            AGENT_TOWER_SESSION_ID: 'project-fallback-session',
+        });
+        const generatedName = buildAgentTowerMcpConfigOverrides(sessionEnv, new Set())
+            .find(arg => /^mcp_servers\.agent-tower-[a-f0-9]{8}=/.test(arg))
+            .split('=')[0].slice('mcp_servers.'.length);
+        fs.writeFileSync(path.join(workingDir, '.codex', 'config.toml'), [
+            '[mcp_servers.agent-tower-dev]', 'command="old-dev-mcp"',
+            `[mcp_servers.${generatedName}]`, 'url="https://old-name.example/mcp"',
+        ].join('\n'));
+        const environment = { ...process.env, PATH: `${binDir}:${savedPath}`, CODEX_HOME: home };
+        const probe = { program: 'codex', args: [] };
+        const expected = new Set(['global-tool', 'agent-tower', 'agent-tower-dev', generatedName]);
+        let eventLoopAdvanced = false;
+        const tick = new Promise(resolve => setTimeout(() => { eventLoopAdvanced = true; resolve(); }, 0));
+        const initial = await getCodexMcpServerNamesForLaunch([], undefined, probe, environment, workingDir);
+        expect(eventLoopAdvanced).toBe(true);
+        await tick;
+        expect(initial).toEqual(expected);
+        const overrides = buildAgentTowerMcpConfigOverrides(sessionEnv, initial);
+        expect(overrides).toContain('mcp_servers.agent-tower.enabled=false');
+        expect(overrides).toContain('mcp_servers.agent-tower-dev.enabled=false');
+        expect(overrides.some(arg => arg.startsWith(`mcp_servers.${generatedName}-2=`))).toBe(true);
+        await waitForCodexMcpServerCacheRefresh();
+        expect(getCachedCodexMcpServerNames([], undefined, probe, environment, workingDir)).toEqual(expected);
+        expect(fs.readFileSync(path.join(binDir, 'probe-cwds'), 'utf8').trim()).toBe(fs.realpathSync(workingDir));
+    });
+    it('isolates cached probes for workspaces sharing the same executable and CODEX_HOME', async () => {
+        const binDir = createWorkspaceProbeCodex('workspace-isolation');
+        const home = path.join(tmpDir, 'workspace-isolation-home');
+        fs.mkdirSync(home, { recursive: true });
+        const environment = { ...process.env, PATH: `${binDir}:${savedPath}`, CODEX_HOME: home };
+        const probe = { program: 'codex', args: [] };
+        const workspaces = ['first', 'second'].map(name => {
+            const workspace = path.join(tmpDir, `isolated-${name}`);
+            fs.mkdirSync(path.join(workspace, '.codex'), { recursive: true });
+            fs.writeFileSync(path.join(workspace, '.codex', 'config.toml'), `[mcp_servers.${name}-tool]\ncommand="${name}-mcp"`);
+            return workspace;
+        });
+        const [first, second] = await Promise.all(workspaces.map(workspace => getCodexMcpServerNamesForLaunch([], undefined, probe, environment, workspace)));
+        expect(first).toEqual(new Set(['first-tool']));
+        expect(second).toEqual(new Set(['second-tool']));
+        expect(probeCount(binDir)).toBe(2);
+        expect(new Set(fs.readFileSync(path.join(binDir, 'probe-cwds'), 'utf8').trim().split('\n'))).toEqual(new Set(workspaces.map(workspace => fs.realpathSync(workspace))));
+        expect(getCachedCodexMcpServerNames([], undefined, probe, environment, workspaces[0])).toEqual(new Set(['first-tool']));
+        expect(getCachedCodexMcpServerNames([], undefined, probe, environment, workspaces[1])).toEqual(new Set(['second-tool']));
+    });
+    it.each(['workspace', 'ancestor'])('invalidates the cache when a %s config is created, changed or removed', async (scope) => {
+        const binDir = createWorkspaceProbeCodex(`workspace-config-change-${scope}`);
+        const home = path.join(tmpDir, `project-config-change-home-${scope}`);
+        const project = path.join(tmpDir, `project-config-change-${scope}`);
+        const workingDir = path.join(project, 'nested', 'app');
+        fs.mkdirSync(home, { recursive: true });
+        fs.mkdirSync(workingDir, { recursive: true });
+        const environment = { ...process.env, PATH: `${binDir}:${savedPath}`, CODEX_HOME: home };
+        const probe = { program: 'codex', args: [] };
+        const configPath = path.join(scope === 'workspace' ? workingDir : project, '.codex', 'config.toml');
+        const lookup = () => getCodexMcpServerNamesForLaunch([], undefined, probe, environment, workingDir);
+        expect(await lookup()).toEqual(new Set());
+        fs.mkdirSync(path.dirname(configPath), { recursive: true });
+        fs.writeFileSync(configPath, '[mcp_servers.agent-tower]\ncommand="old-mcp"');
+        expect(await lookup()).toEqual(new Set(['agent-tower']));
+        fs.writeFileSync(configPath, '[mcp_servers.agent-tower-dev]\ncommand="another-mcp"');
+        expect(await lookup()).toEqual(new Set(['agent-tower-dev']));
+        fs.unlinkSync(configPath);
+        expect(await lookup()).toEqual(new Set());
+        expect(probeCount(binDir)).toBeGreaterThanOrEqual(3);
+    });
+    it('does not fabricate disabled aliases from a project ignored by the CLI trust rules', async () => {
+        const binDir = createWorkspaceProbeCodex('untrusted-project', { ignoreProject: true });
+        const home = path.join(tmpDir, 'untrusted-project-home');
+        const workingDir = path.join(tmpDir, 'untrusted-project-workspace');
+        fs.mkdirSync(home, { recursive: true });
+        fs.mkdirSync(path.join(workingDir, '.codex'), { recursive: true });
+        fs.writeFileSync(path.join(workingDir, '.codex', 'config.toml'), '[mcp_servers.agent-tower]\ncommand="ignored-project-mcp"');
+        const environment = { ...process.env, PATH: `${binDir}:${savedPath}`, CODEX_HOME: home };
+        const names = await getCodexMcpServerNamesForLaunch([], undefined, { program: 'codex', args: [] }, environment, workingDir);
+        const sessionEnv = ExecutionEnv.default(workingDir).merge({
+            AGENT_TOWER_AGENT_CREDENTIAL: 'untrusted-session-credential',
+            AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+            AGENT_TOWER_SESSION_ID: 'untrusted-project-session',
+        });
+        expect(names).toEqual(new Set());
+        const overrides = buildAgentTowerMcpConfigOverrides(sessionEnv, names);
+        expect(overrides).not.toContain('mcp_servers.agent-tower.enabled=false');
+        expect(managedMcpServer(overrides).enabled).toBe(true);
+    });
+    it('waits for its shared refresh when a launch cache expires', async () => {
+        const name = 'launch-expired-cache';
+        const binDir = createAsyncProbeCodex(name, '[{"name":"previous-tool"}]');
+        const home = path.join(tmpDir, 'launch-expired-home');
+        fs.mkdirSync(home, { recursive: true });
+        const environment = { ...process.env, PATH: `${binDir}:${savedPath}`, CODEX_HOME: home };
+        const probe = { program: 'codex', args: [] };
+        const date = vi.spyOn(Date, 'now').mockReturnValue(1_000_000);
+        try {
+            expect(await getCodexMcpServerNamesForLaunch([], undefined, probe, environment, tmpDir)).toEqual(new Set(['previous-tool']));
+            createAsyncProbeCodex(name, '[{"name":"current-tool"}]', { delayMs: 50 });
+            date.mockReturnValue(1_030_001);
+            const results = await Promise.all(Array.from({ length: 3 }, () => getCodexMcpServerNamesForLaunch([], undefined, probe, environment, tmpDir)));
+            expect(results).toEqual(Array.from({ length: 3 }, () => new Set(['current-tool'])));
+            expect(probeCount(binDir)).toBe(2);
+        }
+        finally {
+            await waitForCodexMcpServerCacheRefresh();
+            date.mockRestore();
+        }
+    });
 });
 // ─── getCodexDeclaredMcpServerNames (config.toml fallback) ───────
 describe('getCodexDeclaredMcpServerNames', () => {
@@ -1107,4 +1257,247 @@ describe('buildAgentTowerMcpEnvConfigOverrides', () => {
         ]);
     });
 });
+function managedMcpServer(args) {
+    const assignment = args.find(arg => /^mcp_servers\.agent-tower-[a-f0-9]{8}(?:-\d+)?=/.test(arg));
+    expect(assignment).toBeDefined();
+    const parsed = parseToml(assignment);
+    const name = Object.keys(parsed.mcp_servers)[0];
+    const server = parsed.mcp_servers[name];
+    server.env = {};
+    for (const arg of args.filter(arg => arg.startsWith(`mcp_servers.${name}.env.`))) {
+        const projected = parseToml(arg);
+        Object.assign(server.env, projected.mcp_servers[name].env);
+    }
+    return server;
+}
+describe('managed Codex CLI MCP registration', () => {
+    beforeEach(() => {
+        for (const key of [
+            ...AGENT_TOWER_MCP_IDENTITY_ENV_KEYS, ...AGENT_TOWER_MCP_SERVICE_ENV_KEYS,
+            'AGENT_TOWER_MCP_ENTRY', 'AGENT_TOWER_DESKTOP_RUNTIME_MODE', 'AGENT_TOWER_NODE_RUNTIME',
+            'AGENT_TOWER_DESKTOP_NODE', 'ELECTRON_RUN_AS_NODE',
+        ])
+            vi.stubEnv(key, undefined);
+    });
+    afterEach(() => { vi.unstubAllEnvs(); });
+    it('registers the source MCP without user configuration and scopes its environment to the current session', () => {
+        vi.stubEnv('AGENT_TOWER_AGENT_CREDENTIAL', 'parent-agent-secret');
+        vi.stubEnv('AGENT_TOWER_INTERNAL_TOKEN', 'parent-internal-secret');
+        vi.stubEnv('AGENT_TOWER_SESSION_ID', 'parent-session');
+        vi.stubEnv('AGENT_TOWER_TEAM_RUN_ID', 'parent-team');
+        const env = ExecutionEnv.default(tmpDir).merge({
+            AGENT_TOWER_AGENT_CREDENTIAL: 'current-agent-credential',
+            AGENT_TOWER_INTERNAL_TOKEN: 'must-not-forward-internal',
+            AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+            AGENT_TOWER_PORT: '42001',
+            AGENT_TOWER_SESSION_ID: 'current-session',
+            AGENT_TOWER_INVOCATION_ID: 'current-invocation',
+            AGENT_TOWER_TEAM_RUN_ID: 'current-team',
+            AGENT_TOWER_MEMBER_ID: 'current-member',
+            OPENAI_API_KEY: 'provider-secret',
+        });
+        const args = buildAgentTowerMcpConfigOverrides(env, new Set());
+        const server = managedMcpServer(args);
+        expect(server).toEqual({
+            command: process.execPath,
+            args: ['--import', expect.stringMatching(/[\\/]tsx[\\/]dist[\\/]loader\.mjs$/), path.resolve('packages/server/src/mcp/index.ts')],
+            enabled: true,
+            env: {
+                AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+                AGENT_TOWER_PORT: '42001',
+                AGENT_TOWER_AGENT_CREDENTIAL: 'current-agent-credential',
+                AGENT_TOWER_SESSION_ID: 'current-session',
+                AGENT_TOWER_INVOCATION_ID: 'current-invocation',
+                AGENT_TOWER_TEAM_RUN_ID: 'current-team',
+                AGENT_TOWER_MEMBER_ID: 'current-member',
+            },
+        });
+        expect(args.join(' ')).not.toMatch(/parent-|must-not-forward-internal|provider-secret/);
+        const registration = args.find(arg => /^mcp_servers\.agent-tower-[a-f0-9]{8}=/.test(arg));
+        expect(registration).not.toContain('current-agent-credential');
+        expect(registration).not.toContain('env');
+        expect(args.some(arg => arg.startsWith('mcp_servers.agent-tower.env.'))).toBe(false);
+    });
+    it('uses a distinct backend and credential for each session without inheriting a previous team identity', () => {
+        vi.stubEnv('AGENT_TOWER_TEAM_RUN_ID', 'stale-parent-team');
+        const first = ExecutionEnv.default(tmpDir).merge({
+            AGENT_TOWER_AGENT_CREDENTIAL: 'first-credential', AGENT_TOWER_PORT: '42001',
+            AGENT_TOWER_SESSION_ID: 'first-session', AGENT_TOWER_TEAM_RUN_ID: 'first-team',
+        });
+        const second = ExecutionEnv.default(tmpDir).merge({
+            AGENT_TOWER_AGENT_CREDENTIAL: 'second-credential', AGENT_TOWER_URL: 'http://127.0.0.1:42002',
+            AGENT_TOWER_SESSION_ID: 'second-session',
+        });
+        const firstServer = managedMcpServer(buildAgentTowerMcpConfigOverrides(first, new Set()));
+        const secondServer = managedMcpServer(buildAgentTowerMcpConfigOverrides(second, new Set()));
+        expect(firstServer.env.AGENT_TOWER_URL).toBe('http://127.0.0.1:42001');
+        expect(firstServer.env.AGENT_TOWER_TEAM_RUN_ID).toBe('first-team');
+        expect(secondServer.env).toEqual({
+            AGENT_TOWER_URL: 'http://127.0.0.1:42002',
+            AGENT_TOWER_AGENT_CREDENTIAL: 'second-credential',
+            AGENT_TOWER_SESSION_ID: 'second-session',
+        });
+    });
+    it.each(['workspace', 'packaged'])('uses the trusted %s runtime entry and keeps its Node environment', mode => {
+        const entry = path.join(tmpDir, `${mode} install`, 'dist', 'mcp', 'index.js');
+        fs.mkdirSync(path.dirname(entry), { recursive: true });
+        fs.writeFileSync(entry, '');
+        vi.stubEnv('AGENT_TOWER_MCP_ENTRY', entry);
+        vi.stubEnv('AGENT_TOWER_DESKTOP_RUNTIME_MODE', mode);
+        vi.stubEnv('AGENT_TOWER_NODE_RUNTIME', 'C:\\Program Files\\Agent Tower\\node.exe');
+        vi.stubEnv('ELECTRON_RUN_AS_NODE', '1');
+        const env = ExecutionEnv.default(tmpDir).merge({
+            AGENT_TOWER_URL: 'http://127.0.0.1:12580',
+            AGENT_TOWER_INTERNAL_TOKEN: 'trusted-internal-token',
+        });
+        const server = managedMcpServer(buildAgentTowerMcpConfigOverrides(env, new Set()));
+        expect(server.command).toBe(mode === 'packaged' ? 'C:\\Program Files\\Agent Tower\\node.exe' : process.execPath);
+        expect(server.args).toEqual([entry]);
+        expect(server.env).toEqual({
+            AGENT_TOWER_URL: 'http://127.0.0.1:12580',
+            AGENT_TOWER_INTERNAL_TOKEN: 'trusted-internal-token',
+            ...(mode === 'packaged' ? { ELECTRON_RUN_AS_NODE: '1' } : {}),
+        });
+    });
+    it('disables declared Tower endpoints without sharing credentials and leaves unrelated MCP servers alone', () => {
+        const env = ExecutionEnv.default(tmpDir).merge({
+            AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+            AGENT_TOWER_AGENT_CREDENTIAL: 'session-credential',
+            AGENT_TOWER_INTERNAL_TOKEN: 'must-not-forward-internal',
+            AGENT_TOWER_SESSION_ID: 'session',
+        });
+        const args = buildAgentTowerMcpConfigOverrides(env, new Set(['agent-tower', 'agent-tower-dev', 'other-server']));
+        expect(managedMcpServer(args).env.AGENT_TOWER_AGENT_CREDENTIAL).toBe('session-credential');
+        expect(args).toContain('mcp_servers.agent-tower.enabled=false');
+        expect(args).toContain('mcp_servers.agent-tower-dev.enabled=false');
+        expect(args.some(arg => /^mcp_servers\.(agent-tower|agent-tower-dev)\.env\./.test(arg))).toBe(false);
+        expect(args.join(' ')).not.toContain('must-not-forward-internal');
+        expect(args.some(arg => arg.includes('other-server'))).toBe(false);
+    });
+    it('does not register MCP from credentials belonging to a parent process', () => {
+        vi.stubEnv('AGENT_TOWER_AGENT_CREDENTIAL', 'parent-agent-secret');
+        vi.stubEnv('AGENT_TOWER_INTERNAL_TOKEN', 'parent-internal-secret');
+        const env = ExecutionEnv.default(tmpDir).set('AGENT_TOWER_SESSION_ID', 'session');
+        expect(buildAgentTowerMcpConfigOverrides(env, new Set())).toEqual([]);
+        expect(buildAgentTowerMcpConfigOverrides(env, new Set(['agent-tower']))).toEqual([
+            '-c', 'mcp_servers.agent-tower.env.AGENT_TOWER_SESSION_ID="session"',
+        ]);
+    });
+    it('chooses an unused managed server name without changing an existing server at the generated name', () => {
+        const env = ExecutionEnv.default(tmpDir).merge({
+            AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+            AGENT_TOWER_AGENT_CREDENTIAL: 'session-credential',
+            AGENT_TOWER_SESSION_ID: 'session-with-existing-server',
+        });
+        const initial = buildAgentTowerMcpConfigOverrides(env, new Set());
+        const assignment = initial.find(arg => /^mcp_servers\.agent-tower-[a-f0-9]{8}=/.test(arg));
+        const existingName = assignment.slice('mcp_servers.'.length, assignment.indexOf('='));
+        const args = buildAgentTowerMcpConfigOverrides(env, new Set([existingName, `${existingName}-2`]));
+        expect(args.some(arg => arg.startsWith(`mcp_servers.${existingName}-3=`))).toBe(true);
+        expect(args.some(arg => arg.startsWith(`mcp_servers.${existingName}.`))).toBe(false);
+        expect(args.some(arg => arg.startsWith(`mcp_servers.${existingName}-2.`))).toBe(false);
+        expect(managedMcpServer(args).env.AGENT_TOWER_AGENT_CREDENTIAL).toBe('session-credential');
+    });
+    it.each(['FULL_ACCESS', 'ASK', 'AUTO_SANDBOX'])('disables project-level Tower aliases on the first new and resumed %s launch', async (executionPermission) => {
+        const home = path.join(tmpDir, `project-launch-home-${executionPermission}`);
+        const workingDir = path.join(tmpDir, `project-launch-workspace-${executionPermission}`);
+        fs.mkdirSync(home, { recursive: true });
+        fs.mkdirSync(path.join(workingDir, '.codex'), { recursive: true });
+        const projectConfig = '[mcp_servers.agent-tower]\nurl="https://old-project.example/mcp"\n[mcp_servers.agent-tower-dev]\ncommand="old-dev-mcp"\n[mcp_servers.project-tool]\ncommand="project-mcp"';
+        const configPath = path.join(workingDir, '.codex', 'config.toml');
+        fs.writeFileSync(configPath, projectConfig);
+        vi.stubEnv('CODEX_HOME', home);
+        const binDir = createWorkspaceProbeCodex(`project-launch-${executionPermission}`, { delayMs: 50 });
+        const executable = path.join(binDir, 'codex');
+        const refresh = vi.spyOn(codexAskCapabilities, 'refreshCodexCliSupport').mockResolvedValue({ supported: true, executable });
+        const support = vi.spyOn(codexAskCapabilities, 'cachedCodexCliSupport').mockReturnValue({ supported: true, executable });
+        const executor = new CodexExecutor({ executionPermission, cmd: { baseCommandOverride: executable } });
+        const stdin = vi.spyOn(executor, 'spawnWithStdin').mockResolvedValue({});
+        const duplex = vi.spyOn(executor, 'spawnWithDuplex').mockResolvedValue({});
+        try {
+            const config = {
+                workingDir, prompt: 'task',
+                env: ExecutionEnv.default(workingDir).merge({
+                    AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+                    AGENT_TOWER_AGENT_CREDENTIAL: 'project-bound-credential',
+                    AGENT_TOWER_SESSION_ID: 'project-launch-session',
+                }),
+            };
+            await executor.spawn(config);
+            await executor.spawnFollowUp(config, 'native-thread');
+            const spawn = executionPermission === 'FULL_ACCESS' ? stdin : duplex;
+            expect(spawn).toHaveBeenCalledTimes(2);
+            for (const [, parts] of spawn.mock.calls) {
+                expect(parts.args).toContain('mcp_servers.agent-tower.enabled=false');
+                expect(parts.args).toContain('mcp_servers.agent-tower-dev.enabled=false');
+                expect(parts.args.some(arg => arg.includes('mcp_servers.project-tool'))).toBe(false);
+                expect(managedMcpServer(parts.args).env.AGENT_TOWER_SESSION_ID).toBe('project-launch-session');
+            }
+            await waitForCodexMcpServerCacheRefresh();
+            expect(fs.readFileSync(path.join(binDir, 'probe-cwds'), 'utf8').trim()).toBe(fs.realpathSync(workingDir));
+            expect(fs.readFileSync(configPath, 'utf8')).toBe(projectConfig);
+            expect(fs.readdirSync(home)).toEqual([]);
+        }
+        finally {
+            await waitForCodexMcpServerCacheRefresh();
+            stdin.mockRestore();
+            duplex.mockRestore();
+            refresh.mockRestore();
+            support.mockRestore();
+        }
+    });
+    it.each(['FULL_ACCESS', 'ASK', 'AUTO_SANDBOX'])('isolates managed MCP from stale user settings on new and resumed %s launches without writing user config', async (executionPermission) => {
+        const home = path.join(tmpDir, `managed-codex-home-${executionPermission}`);
+        fs.mkdirSync(home, { recursive: true });
+        const userConfig = '[mcp_servers.agent-tower]\nurl="https://stale.example/mcp"\nenabled=false\ndisabled_tools=["get_task_handoff"]\n[mcp_servers.other-server]\ncommand="other-mcp"';
+        fs.writeFileSync(path.join(home, 'config.toml'), userConfig);
+        vi.stubEnv('CODEX_HOME', home);
+        const refresh = vi.spyOn(codexAskCapabilities, 'refreshCodexCliSupport').mockResolvedValue({ supported: true, executable: '/verified/codex' });
+        const support = vi.spyOn(codexAskCapabilities, 'cachedCodexCliSupport').mockReturnValue({ supported: true, executable: '/verified/codex' });
+        const executor = new CodexExecutor({
+            executionPermission,
+            settings: userConfig,
+            cmd: { baseCommandOverride: '/verified/codex', env: { AGENT_TOWER_DESKTOP_NODE: '/profile/node' } },
+        });
+        const stdin = vi.spyOn(executor, 'spawnWithStdin').mockResolvedValue({});
+        const duplex = vi.spyOn(executor, 'spawnWithDuplex').mockResolvedValue({});
+        try {
+            const config = {
+                workingDir: tmpDir, prompt: 'task',
+                env: ExecutionEnv.default(tmpDir).merge({
+                    AGENT_TOWER_URL: 'http://127.0.0.1:42001',
+                    AGENT_TOWER_AGENT_CREDENTIAL: 'bound-session-credential',
+                    AGENT_TOWER_SESSION_ID: 'current-session',
+                }),
+            };
+            await executor.spawn(config);
+            await executor.spawnFollowUp(config, 'native-thread');
+            const spawn = executionPermission === 'FULL_ACCESS' ? stdin : duplex;
+            expect(spawn).toHaveBeenCalledTimes(2);
+            const serverNames = new Set(spawn.mock.calls.map(([, parts]) => parts.args.find(arg => /^mcp_servers\.agent-tower-[a-f0-9]{8}(?:-\d+)?=/.test(arg))?.split('=')[0]));
+            expect(serverNames.size).toBe(1);
+            for (const [, parts] of spawn.mock.calls) {
+                const server = managedMcpServer(parts.args);
+                expect(server.command).toBe('/profile/node');
+                expect(server.enabled).toBe(true);
+                expect(server.env.AGENT_TOWER_AGENT_CREDENTIAL).toBe('bound-session-credential');
+                expect(server.env.AGENT_TOWER_SESSION_ID).toBe('current-session');
+                expect(server).not.toHaveProperty('url');
+                expect(server).not.toHaveProperty('disabled_tools');
+                expect(parts.args).toContain('mcp_servers.other-server.command="other-mcp"');
+                expect(parts.args.findIndex(arg => /^mcp_servers\.agent-tower-[a-f0-9]{8}(?:-\d+)?=/.test(arg)))
+                    .toBeGreaterThan(parts.args.indexOf('mcp_servers.agent-tower.enabled=false'));
+            }
+            expect(fs.readdirSync(home)).toEqual(['config.toml']);
+            expect(fs.readFileSync(path.join(home, 'config.toml'), 'utf8')).toBe(userConfig);
+        }
+        finally {
+            await waitForCodexMcpServerCacheRefresh();
+            stdin.mockRestore();
+            duplex.mockRestore();
+            refresh.mockRestore();
+            support.mockRestore();
+        }
+    });
+});
 //# sourceMappingURL=codex.executor.test.js.map