agent-tower 0.5.1-beta.2 → 0.5.2-beta.0

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAkBA,wBAAsB,QAAQ,qUAmE7B"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAmBA,wBAAsB,QAAQ,qUAuE7B"}

package/dist/app.js

@@ -10,6 +10,7 @@ import { initializeSocket, closeSocket } from './socket/index.js';
 import { WorkspaceService } from './services/workspace.service.js';
 import { HibernationScheduler } from './services/hibernation-scheduler.js';
 import { TunnelService } from './services/tunnel.service.js';
+import { getTaskCleanupService } from './core/container.js';
 import { tunnelAuthHook } from './middleware/tunnel-auth.js';
 let hibernationScheduler = null;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -57,10 +58,13 @@ export async function buildApp() {
         // 启动空闲 workspace 自动休眠调度器
         hibernationScheduler = new HibernationScheduler();
         hibernationScheduler.start();
+        // 启动任务删除后台资源清理 worker
+        getTaskCleanupService().start();
     });
     // 服务器关闭时清理 Socket.IO、Tunnel 和 HibernationScheduler
     app.addHook('onClose', async () => {
         hibernationScheduler?.stop();
+        getTaskCleanupService().stop();
         TunnelService.stop();
         await closeSocket();
     });

package/dist/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}

package/dist/core/container.d.ts

@@ -2,10 +2,12 @@ import { EventBus } from './event-bus.js';
 import { SessionManager } from '../services/session-manager.js';
 import { CommitMessageService } from '../services/commit-message.service.js';
 import { NotificationService } from '../services/notifications/index.js';
+import { TaskCleanupService } from '../services/task-cleanup.service.js';
 import type { TerminalManager } from '../services/terminal-manager.js';
 export declare function getEventBus(): EventBus;
 export declare function getSessionManager(): SessionManager;
 export declare function getCommitMessageService(): CommitMessageService;
+export declare function getTaskCleanupService(): TaskCleanupService;
 export declare function getTerminalManager(): Promise<TerminalManager>;
 export declare function getNotificationService(): NotificationService;
 //# sourceMappingURL=container.d.ts.map

package/dist/core/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/core/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAIzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAQvE,wBAAgB,WAAW,IAAI,QAAQ,CAKtC;AAED,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED,wBAAgB,uBAAuB,IAAI,oBAAoB,CAK9D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAMnE;AAED,wBAAgB,sBAAsB,IAAI,mBAAmB,CA6B5D"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/core/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAIzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AASvE,wBAAgB,WAAW,IAAI,QAAQ,CAKtC;AAED,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED,wBAAgB,uBAAuB,IAAI,oBAAoB,CAK9D;AAED,wBAAgB,qBAAqB,IAAI,kBAAkB,CAK1D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAMnE;AAED,wBAAgB,sBAAsB,IAAI,mBAAmB,CA6B5D"}

package/dist/core/container.js

@@ -2,12 +2,14 @@ import { EventBus } from './event-bus.js';
 import { SessionManager } from '../services/session-manager.js';
 import { CommitMessageService } from '../services/commit-message.service.js';
 import { NotificationService } from '../services/notifications/index.js';
+import { TaskCleanupService } from '../services/task-cleanup.service.js';
 import { prisma } from '../utils/index.js';
 let eventBus = null;
 let sessionManager = null;
 let terminalManager = null;
 let commitMessageService = null;
 let notificationService = null;
+let taskCleanupService = null;
 export function getEventBus() {
     if (!eventBus) {
         eventBus = new EventBus();
@@ -26,6 +28,12 @@ export function getCommitMessageService() {
     }
     return commitMessageService;
 }
+export function getTaskCleanupService() {
+    if (!taskCleanupService) {
+        taskCleanupService = new TaskCleanupService(getSessionManager());
+    }
+    return taskCleanupService;
+}
 export async function getTerminalManager() {
     if (!terminalManager) {
         const { TerminalManager: TM } = await import('../services/terminal-manager.js');

package/dist/core/container.js.map

@@ -1 +1 @@
-{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/core/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAK3C,IAAI,QAAQ,GAAoB,IAAI,CAAC;AACrC,IAAI,cAAc,GAA0B,IAAI,CAAC;AACjD,IAAI,eAAe,GAA2B,IAAI,CAAC;AACnD,IAAI,oBAAoB,GAAgC,IAAI,CAAC;AAC7D,IAAI,mBAAmB,GAA+B,IAAI,CAAC;AAE3D,MAAM,UAAU,WAAW;IACzB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,oBAAoB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACpD,CAAC;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QAChF,eAAe,GAAG,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;QAEhD,wCAAwC;QACxC,WAAW,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YACtD,IAAI,MAAM,KAAK,WAAW;gBAAE,OAAO;YACnC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBACrB,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;gBACrB,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;aACzC,CAAC;iBACC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,mBAAoB,CAAC,MAAM,CAAC;oBAC1B,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,aAAa,EAAE,SAAS;oBAC/B,IAAI,EAAE,EAAE,EAAE,SAAS;oBACnB,QAAQ,EAAE;wBACR,MAAM;wBACN,SAAS,EAAE,IAAI,EAAE,KAAK,IAAI,MAAM;wBAChC,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE;qBACjC;iBACF,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,8DAA8D,EAAE,GAAG,CAAC,CAAC;YACrF,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/core/container.ts"],"names":[],"mappings":"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"}

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

@@ -1,15 +1,327 @@
-import { describe, expect, it } from 'vitest';
-import { buildAgentTowerMcpEnvConfigOverrides } from '../codex.executor.js';
+import { describe, expect, it, afterAll, afterEach } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { buildAgentTowerMcpEnvConfigOverrides, getCodexDeclaredMcpServerNames, queryCodexMcpServerNames, detectDeclaredMcpServers, } from '../codex.executor.js';
 import { ExecutionEnv } from '../execution-env.js';
-describe('CodexExecutor TeamRun MCP env overrides', () => {
-    it('projects TeamRun identity env into Codex MCP server config overrides', () => {
+const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-executor-test-'));
+afterAll(() => { fs.rmSync(tmpDir, { recursive: true, force: true }); });
+const savedCodexHome = process.env.CODEX_HOME;
+afterEach(() => {
+    if (savedCodexHome === undefined)
+        delete process.env.CODEX_HOME;
+    else
+        process.env.CODEX_HOME = savedCodexHome;
+});
+/**
+ * Create a fake `codex` executable that writes argv to a file and outputs the given stdout.
+ * Returns the directory containing the fake binary (for prepending to PATH).
+ */
+function createFakeCodex(name, stdout, exitCode = 0) {
+    const binDir = path.join(tmpDir, `fake-codex-${name}`);
+    fs.mkdirSync(binDir, { recursive: true });
+    const argsFile = path.join(binDir, 'captured-args.json');
+    const script = `#!/bin/sh
+printf '%s\\n' "$@" > "${argsFile}"
+cat <<'FAKE_EOF'
+${stdout}
+FAKE_EOF
+exit ${exitCode}
+`;
+    fs.writeFileSync(path.join(binDir, 'codex'), script, { mode: 0o755 });
+    return binDir;
+}
+function readCapturedArgs(binDir) {
+    const argsFile = path.join(binDir, 'captured-args.json');
+    return fs.readFileSync(argsFile, 'utf-8').trim().split('\n');
+}
+// ─── getCodexDeclaredMcpServerNames (config.toml fallback) ───────
+describe('getCodexDeclaredMcpServerNames', () => {
+    it('returns mcp_servers keys from a valid config.toml', () => {
+        const configPath = path.join(tmpDir, 'both.toml');
+        fs.writeFileSync(configPath, `
+[mcp_servers.agent-tower]
+command = "agent-tower-mcp"
+
+[mcp_servers.agent-tower.env]
+AGENT_TOWER_URL = "http://127.0.0.1:12580"
+
+[mcp_servers.agent-tower-dev]
+command = "npx"
+args = ["tsx", "index.ts"]
+`);
+        const result = getCodexDeclaredMcpServerNames(configPath);
+        expect(result).toEqual(new Set(['agent-tower', 'agent-tower-dev']));
+    });
+    it('returns only declared servers when agent-tower-dev is absent', () => {
+        const configPath = path.join(tmpDir, 'only-at.toml');
+        fs.writeFileSync(configPath, `
+[mcp_servers.agent-tower]
+command = "agent-tower-mcp"
+`);
+        const result = getCodexDeclaredMcpServerNames(configPath);
+        expect(result).toEqual(new Set(['agent-tower']));
+    });
+    it('returns empty set when config file does not exist', () => {
+        const result = getCodexDeclaredMcpServerNames(path.join(tmpDir, 'nonexistent.toml'));
+        expect(result).toEqual(new Set());
+    });
+    it('returns empty set when config has no mcp_servers section', () => {
+        const configPath = path.join(tmpDir, 'no-mcp.toml');
+        fs.writeFileSync(configPath, `model = "gpt-5.5"\n`);
+        const result = getCodexDeclaredMcpServerNames(configPath);
+        expect(result).toEqual(new Set());
+    });
+    it('uses CODEX_HOME env to resolve config path when no explicit path given', () => {
+        const customDir = path.join(tmpDir, 'custom-codex-home');
+        fs.mkdirSync(customDir, { recursive: true });
+        fs.writeFileSync(path.join(customDir, 'config.toml'), `
+[mcp_servers.agent-tower]
+command = "agent-tower-mcp"
+`);
+        process.env.CODEX_HOME = customDir;
+        const result = getCodexDeclaredMcpServerNames();
+        expect(result).toEqual(new Set(['agent-tower']));
+    });
+    it('returns empty set for invalid TOML content', () => {
+        const configPath = path.join(tmpDir, 'invalid.toml');
+        fs.writeFileSync(configPath, `[mcp_servers.agent-tower\nbroken`);
+        const result = getCodexDeclaredMcpServerNames(configPath);
+        expect(result).toEqual(new Set());
+    });
+    it('returns empty set when mcp_servers is not an object', () => {
+        const configPath = path.join(tmpDir, 'mcp-string.toml');
+        fs.writeFileSync(configPath, `mcp_servers = "not-an-object"\n`);
+        const result = getCodexDeclaredMcpServerNames(configPath);
+        expect(result).toEqual(new Set());
+    });
+});
+// ─── queryCodexMcpServerNames (CLI primary path, fake codex) ─────
+describe('queryCodexMcpServerNames', () => {
+    it('parses valid JSON array and returns server names', () => {
+        const json = JSON.stringify([
+            { name: 'agent-tower', transport: 'stdio', enabled: true },
+            { name: 'agent-tower-dev', transport: 'stdio', enabled: true },
+        ]);
+        const binDir = createFakeCodex('valid', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            const result = queryCodexMcpServerNames();
+            expect(result).toEqual(new Set(['agent-tower', 'agent-tower-dev']));
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('places configOverrideArgs before subcommand (codex ...args mcp list --json)', () => {
+        const json = JSON.stringify([{ name: 'agent-tower', transport: 'stdio', enabled: true }]);
+        const binDir = createFakeCodex('arg-order', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            queryCodexMcpServerNames(['--profile', 'myprofile', '-c', 'mcp_servers.x.command="y"']);
+            const args = readCapturedArgs(binDir);
+            expect(args).toEqual([
+                '--profile', 'myprofile',
+                '-c', 'mcp_servers.x.command="y"',
+                'mcp', 'list', '--json',
+            ]);
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns only agent-tower when CLI output has one server', () => {
+        const json = JSON.stringify([{ name: 'agent-tower', transport: 'stdio', enabled: true }]);
+        const binDir = createFakeCodex('one-server', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            const result = queryCodexMcpServerNames();
+            expect(result).toEqual(new Set(['agent-tower']));
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns empty set when CLI outputs empty array', () => {
+        const binDir = createFakeCodex('empty-array', '[]');
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            const result = queryCodexMcpServerNames();
+            expect(result).toEqual(new Set());
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when CLI outputs non-JSON', () => {
+        const binDir = createFakeCodex('non-json', 'not json at all');
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when CLI outputs non-array JSON (object)', () => {
+        const binDir = createFakeCodex('non-array', '{"servers": []}');
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when array contains element without name field', () => {
+        const json = JSON.stringify([
+            { name: 'agent-tower', transport: 'stdio' },
+            { transport: 'stdio', enabled: true },
+        ]);
+        const binDir = createFakeCodex('missing-name', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when array contains element with non-string name', () => {
+        const json = JSON.stringify([
+            { name: 'agent-tower', transport: 'stdio' },
+            { name: 123, transport: 'stdio' },
+        ]);
+        const binDir = createFakeCodex('bad-name-type', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when array contains non-object element', () => {
+        const json = JSON.stringify([
+            { name: 'agent-tower', transport: 'stdio' },
+            'not-an-object',
+        ]);
+        const binDir = createFakeCodex('non-object-element', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when CLI exits with non-zero code', () => {
+        const binDir = createFakeCodex('exit-error', '', 1);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns null when codex CLI is not in PATH', () => {
+        const origPath = process.env.PATH;
+        process.env.PATH = '/nonexistent-path-only';
+        try {
+            expect(queryCodexMcpServerNames()).toBeNull();
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+});
+// ─── detectDeclaredMcpServers (CLI + fallback) ──────────────────
+describe('detectDeclaredMcpServers', () => {
+    it('uses CLI result when available', () => {
+        const json = JSON.stringify([
+            { name: 'agent-tower', transport: 'stdio', enabled: true },
+            { name: 'injected-mcp', transport: 'stdio', enabled: true },
+        ]);
+        const binDir = createFakeCodex('detect-cli', json);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            const result = detectDeclaredMcpServers(['-c', 'mcp_servers.injected-mcp.command="x"']);
+            expect(result).toEqual(new Set(['agent-tower', 'injected-mcp']));
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('falls back to config.toml when CLI is unavailable', () => {
+        const configPath = path.join(tmpDir, 'fallback.toml');
+        fs.writeFileSync(configPath, `
+[mcp_servers.agent-tower]
+command = "echo"
+`);
+        const origPath = process.env.PATH;
+        process.env.PATH = '/nonexistent-path-only';
+        try {
+            const result = detectDeclaredMcpServers([], configPath);
+            expect(result).toEqual(new Set(['agent-tower']));
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('falls back to config.toml when CLI output has bad schema', () => {
+        const binDir = createFakeCodex('detect-bad-schema', '{"not": "array"}');
+        const configPath = path.join(tmpDir, 'fallback-schema.toml');
+        fs.writeFileSync(configPath, `
+[mcp_servers.agent-tower]
+command = "echo"
+[mcp_servers.agent-tower-dev]
+command = "npx"
+`);
+        const origPath = process.env.PATH;
+        process.env.PATH = `${binDir}:${origPath}`;
+        try {
+            const result = detectDeclaredMcpServers([], configPath);
+            expect(result).toEqual(new Set(['agent-tower', 'agent-tower-dev']));
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+    it('returns empty set when both CLI and config.toml fail', () => {
+        const origPath = process.env.PATH;
+        process.env.PATH = '/nonexistent-path-only';
+        try {
+            const result = detectDeclaredMcpServers([], path.join(tmpDir, 'no-such-file.toml'));
+            expect(result).toEqual(new Set());
+        }
+        finally {
+            process.env.PATH = origPath;
+        }
+    });
+});
+// ─── buildAgentTowerMcpEnvConfigOverrides ────────────────────────
+describe('buildAgentTowerMcpEnvConfigOverrides', () => {
+    it('generates overrides only for declared MCP servers (both present)', () => {
         const env = ExecutionEnv.default('/tmp/worktree').merge({
             AGENT_TOWER_SESSION_ID: 'session-1',
             AGENT_TOWER_INVOCATION_ID: 'invocation-1',
             AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
             AGENT_TOWER_MEMBER_ID: 'member-1',
         });
-        expect(buildAgentTowerMcpEnvConfigOverrides(env)).toEqual([
+        const declared = new Set(['agent-tower', 'agent-tower-dev']);
+        expect(buildAgentTowerMcpEnvConfigOverrides(env, declared)).toEqual([
             '-c',
             'mcp_servers.agent-tower.env.AGENT_TOWER_SESSION_ID="session-1"',
             '-c',
@@ -28,9 +340,37 @@ describe('CodexExecutor TeamRun MCP env overrides', () => {
             'mcp_servers.agent-tower-dev.env.AGENT_TOWER_MEMBER_ID="member-1"',
         ]);
     });
+    it('generates overrides only for agent-tower when agent-tower-dev is not declared', () => {
+        const env = ExecutionEnv.default('/tmp/worktree').merge({
+            AGENT_TOWER_SESSION_ID: 'session-1',
+            AGENT_TOWER_INVOCATION_ID: 'invocation-1',
+            AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
+            AGENT_TOWER_MEMBER_ID: 'member-1',
+        });
+        const declared = new Set(['agent-tower']);
+        expect(buildAgentTowerMcpEnvConfigOverrides(env, declared)).toEqual([
+            '-c',
+            'mcp_servers.agent-tower.env.AGENT_TOWER_SESSION_ID="session-1"',
+            '-c',
+            'mcp_servers.agent-tower.env.AGENT_TOWER_INVOCATION_ID="invocation-1"',
+            '-c',
+            'mcp_servers.agent-tower.env.AGENT_TOWER_TEAM_RUN_ID="team-run-1"',
+            '-c',
+            'mcp_servers.agent-tower.env.AGENT_TOWER_MEMBER_ID="member-1"',
+        ]);
+    });
+    it('returns empty array when no MCP servers are declared', () => {
+        const env = ExecutionEnv.default('/tmp/worktree').merge({
+            AGENT_TOWER_SESSION_ID: 'session-1',
+            AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
+        });
+        const declared = new Set();
+        expect(buildAgentTowerMcpEnvConfigOverrides(env, declared)).toEqual([]);
+    });
     it('omits MCP identity overrides for non-TeamRun sessions', () => {
         const env = ExecutionEnv.default('/tmp/worktree');
-        expect(buildAgentTowerMcpEnvConfigOverrides(env)).toEqual([]);
+        const declared = new Set(['agent-tower', 'agent-tower-dev']);
+        expect(buildAgentTowerMcpEnvConfigOverrides(env, declared)).toEqual([]);
     });
     it('only projects TeamRun identity env keys', () => {
         const env = ExecutionEnv.default('/tmp/worktree').merge({
@@ -38,7 +378,8 @@ describe('CodexExecutor TeamRun MCP env overrides', () => {
             AGENT_TOWER_URL: 'http://127.0.0.1:42232',
             OPENAI_API_KEY: 'provider-secret',
         });
-        expect(buildAgentTowerMcpEnvConfigOverrides(env)).toEqual([
+        const declared = new Set(['agent-tower', 'agent-tower-dev']);
+        expect(buildAgentTowerMcpEnvConfigOverrides(env, declared)).toEqual([
             '-c',
             'mcp_servers.agent-tower.env.AGENT_TOWER_TEAM_RUN_ID="team-run-1"',
             '-c',

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

@@ -1 +1 @@
-{"version":3,"file":"codex.executor.test.js","sourceRoot":"","sources":["../../../src/executors/__tests__/codex.executor.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,QAAQ,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACvD,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC;YACtD,sBAAsB,EAAE,WAAW;YACnC,yBAAyB,EAAE,cAAc;YACzC,uBAAuB,EAAE,YAAY;YACrC,qBAAqB,EAAE,UAAU;SAClC,CAAC,CAAC;QAEH,MAAM,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;YACxD,IAAI;YACJ,gEAAgE;YAChE,IAAI;YACJ,sEAAsE;YACtE,IAAI;YACJ,kEAAkE;YAClE,IAAI;YACJ,8DAA8D;YAC9D,IAAI;YACJ,oEAAoE;YACpE,IAAI;YACJ,0EAA0E;YAC1E,IAAI;YACJ,sEAAsE;YACtE,IAAI;YACJ,kEAAkE;SACnE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAElD,MAAM,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC;YACtD,uBAAuB,EAAE,YAAY;YACrC,eAAe,EAAE,wBAAwB;YACzC,cAAc,EAAE,iBAAiB;SAClC,CAAC,CAAC;QAEH,MAAM,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;YACxD,IAAI;YACJ,kEAAkE;YAClE,IAAI;YACJ,sEAAsE;SACvE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"codex.executor.test.js","sourceRoot":"","sources":["../../../src/executors/__tests__/codex.executor.test.ts"],"names":[],"mappings":"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"}

package/dist/executors/codex.executor.d.ts

@@ -5,7 +5,24 @@
 import { AgentType } from '../types/index.js';
 import { BaseExecutor, AvailabilityInfo, AgentCapability, ExecutorSpawnConfig, SpawnedChild } from './base.executor.js';
 import { CommandBuilder, CmdOverrides } from './command-builder.js';
-export declare function buildAgentTowerMcpEnvConfigOverrides(env: ExecutorSpawnConfig['env']): string[];
+/**
+ * 读取 Codex config.toml 中实际声明的 mcp_servers 顶层 key。
+ * 文件不存在、读取失败或解析失败时返回空集合（不抛错）。
+ */
+export declare function getCodexDeclaredMcpServerNames(configPath?: string): Set<string>;
+/**
+ * 通过 `codex mcp list --json` 查询 Codex 运行时实际可见的 MCP server 名称。
+ * 传入 provider settings 展平后的 `-c` 参数，确保 settings 注入的 MCP 也在列表中。
+ * CLI 不存在、超时、exit 非 0、JSON 异常时返回 null 表示需要 fallback。
+ */
+export declare function queryCodexMcpServerNames(configOverrideArgs?: string[]): Set<string> | null;
+/**
+ * 检测 Codex 已声明的 MCP server 名称。
+ * 主路径：`codex mcp list --json`（能反映 config + `-c` 注入的完整 MCP 视图）。
+ * Fallback：直接读取 config.toml（CLI 不可用时）。
+ */
+export declare function detectDeclaredMcpServers(configOverrideArgs?: string[], fallbackConfigPath?: string): Set<string>;
+export declare function buildAgentTowerMcpEnvConfigOverrides(env: ExecutorSpawnConfig['env'], declaredMcpServers: Set<string>): string[];
 /**
  * Codex CLI 配置
  */

package/dist/executors/codex.executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.executor.d.ts","sourceRoot":"","sources":["../../src/executors/codex.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAwDpF,wBAAgB,oCAAoC,CAAC,GAAG,EAAE,mBAAmB,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAa9F;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,eAAe;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AASD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,CAAC,SAAS,mBAAmB;IACrC,QAAQ,CAAC,WAAW,WAAW;IAE/B,OAAO,CAAC,MAAM,CAAc;gBAEhB,MAAM,GAAE,WAAgB;IAMpC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAqCtD;;OAEG;IACH,eAAe,IAAI,eAAe,EAAE;IAIpC;;OAEG;IACH,uBAAuB,IAAI,MAAM,GAAG,IAAI;IAIxC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAmB5B;;OAEG;IACH,SAAS,CAAC,mBAAmB,IAAI,cAAc;IA4B/C;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IA2B/D;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAkCxB;;OAEG;IACH,OAAO,CAAC,aAAa;CAMtB"}
+{"version":3,"file":"codex.executor.d.ts","sourceRoot":"","sources":["../../src/executors/codex.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AA4DpF;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAa/E;AAID;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,kBAAkB,GAAE,MAAM,EAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAmB9F;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,kBAAkB,GAAE,MAAM,EAAO,EACjC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,GAAG,CAAC,MAAM,CAAC,CAIb;AAED,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAC/B,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC9B,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,eAAe;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AASD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,CAAC,SAAS,mBAAmB;IACrC,QAAQ,CAAC,WAAW,WAAW;IAE/B,OAAO,CAAC,MAAM,CAAc;gBAEhB,MAAM,GAAE,WAAgB;IAMpC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAqCtD;;OAEG;IACH,eAAe,IAAI,eAAe,EAAE;IAIpC;;OAEG;IACH,uBAAuB,IAAI,MAAM,GAAG,IAAI;IAIxC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAmB5B;;OAEG;IACH,SAAS,CAAC,mBAAmB,IAAI,cAAc;IA4B/C;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IAgC/D;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAuCxB;;OAEG;IACH,OAAO,CAAC,aAAa;CAMtB"}