agent-tower 0.5.2-beta.2 → 0.5.2-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +9 -2
- package/dist/app.js.map +1 -1
- package/dist/app.test.js +67 -0
- package/dist/app.test.js.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/core/container.d.ts +2 -0
- package/dist/core/container.d.ts.map +1 -1
- package/dist/core/container.js +9 -1
- package/dist/core/container.js.map +1 -1
- package/dist/core/event-bus.d.ts +2 -1
- package/dist/core/event-bus.d.ts.map +1 -1
- package/dist/core/event-bus.js.map +1 -1
- package/dist/executors/__tests__/base.executor.test.d.ts +2 -0
- package/dist/executors/__tests__/base.executor.test.d.ts.map +1 -0
- package/dist/executors/__tests__/base.executor.test.js +264 -0
- package/dist/executors/__tests__/base.executor.test.js.map +1 -0
- package/dist/executors/__tests__/codex.executor.test.js +18 -1
- package/dist/executors/__tests__/codex.executor.test.js.map +1 -1
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +61 -33
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/codex.executor.d.ts.map +1 -1
- package/dist/executors/codex.executor.js +3 -4
- package/dist/executors/codex.executor.js.map +1 -1
- package/dist/executors/execution-env.d.ts +7 -1
- package/dist/executors/execution-env.d.ts.map +1 -1
- package/dist/executors/execution-env.js +41 -2
- package/dist/executors/execution-env.js.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/mcp/types.d.ts +6 -6
- package/dist/routes/__tests__/tasks.test.js +179 -0
- package/dist/routes/__tests__/tasks.test.js.map +1 -1
- package/dist/routes/git.d.ts.map +1 -1
- package/dist/routes/git.js +41 -1
- package/dist/routes/git.js.map +1 -1
- package/dist/routes/tasks.d.ts.map +1 -1
- package/dist/routes/tasks.js +10 -2
- package/dist/routes/tasks.js.map +1 -1
- package/dist/services/__tests__/project.service.test.js +85 -1
- package/dist/services/__tests__/project.service.test.js.map +1 -1
- package/dist/services/__tests__/session-manager.team-run.test.js +84 -1
- package/dist/services/__tests__/session-manager.team-run.test.js.map +1 -1
- package/dist/services/__tests__/task.service.test.js +190 -0
- package/dist/services/__tests__/task.service.test.js.map +1 -1
- package/dist/services/__tests__/team-reconciler.service.test.js +2 -2
- package/dist/services/__tests__/team-reconciler.service.test.js.map +1 -1
- package/dist/services/__tests__/team-run.service.test.js +75 -1
- package/dist/services/__tests__/team-run.service.test.js.map +1 -1
- package/dist/services/__tests__/team-scheduler.service.test.js +46 -5
- package/dist/services/__tests__/team-scheduler.service.test.js.map +1 -1
- package/dist/services/__tests__/workspace-git-watcher.service.test.d.ts +2 -0
- package/dist/services/__tests__/workspace-git-watcher.service.test.d.ts.map +1 -0
- package/dist/services/__tests__/workspace-git-watcher.service.test.js +148 -0
- package/dist/services/__tests__/workspace-git-watcher.service.test.js.map +1 -0
- package/dist/services/__tests__/workspace.service.test.js +43 -1
- package/dist/services/__tests__/workspace.service.test.js.map +1 -1
- package/dist/services/project.service.d.ts +28 -24
- package/dist/services/project.service.d.ts.map +1 -1
- package/dist/services/project.service.js +11 -0
- package/dist/services/project.service.js.map +1 -1
- package/dist/services/session-manager.d.ts +44 -43
- package/dist/services/session-manager.d.ts.map +1 -1
- package/dist/services/session-manager.js +19 -3
- package/dist/services/session-manager.js.map +1 -1
- package/dist/services/task-cleanup.service.d.ts +3 -1
- package/dist/services/task-cleanup.service.d.ts.map +1 -1
- package/dist/services/task-cleanup.service.js +6 -1
- package/dist/services/task-cleanup.service.js.map +1 -1
- package/dist/services/task.service.d.ts +96 -65
- package/dist/services/task.service.d.ts.map +1 -1
- package/dist/services/task.service.js +208 -15
- package/dist/services/task.service.js.map +1 -1
- package/dist/services/team-run.service.d.ts +2 -0
- package/dist/services/team-run.service.d.ts.map +1 -1
- package/dist/services/team-run.service.js +38 -9
- package/dist/services/team-run.service.js.map +1 -1
- package/dist/services/team-scheduler.service.d.ts.map +1 -1
- package/dist/services/team-scheduler.service.js +16 -4
- package/dist/services/team-scheduler.service.js.map +1 -1
- package/dist/services/workspace-git-watcher.service.d.ts +62 -0
- package/dist/services/workspace-git-watcher.service.d.ts.map +1 -0
- package/dist/services/workspace-git-watcher.service.js +427 -0
- package/dist/services/workspace-git-watcher.service.js.map +1 -0
- package/dist/services/workspace.service.d.ts +99 -108
- package/dist/services/workspace.service.d.ts.map +1 -1
- package/dist/services/workspace.service.js +43 -6
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/socket/events.d.ts +1 -1
- package/dist/socket/events.d.ts.map +1 -1
- package/dist/socket/events.js.map +1 -1
- package/dist/socket/socket-gateway.d.ts.map +1 -1
- package/dist/socket/socket-gateway.js +5 -1
- package/dist/socket/socket-gateway.js.map +1 -1
- package/dist/web/assets/AgentDemoPage-DRtgA1-w.js +1 -0
- package/dist/web/assets/{DemoPage-PD8AX5pI.js → DemoPage-8g4kqlV1.js} +3 -3
- package/dist/web/assets/GeneralSettingsPage-b2dViAif.js +1 -0
- package/dist/web/assets/{MemberAvatar-BDXmryjB.js → MemberAvatar-BuaKw8fE.js} +1 -1
- package/dist/web/assets/NotificationSettingsPage-DCtnFBrk.js +1 -0
- package/dist/web/assets/ProfileSettingsPage-Hplbudpu.js +3 -0
- package/dist/web/assets/ProjectKanbanPage-UJVkISeV.js +89 -0
- package/dist/web/assets/ProjectSettingsPage-CnG-6FVF.js +2 -0
- package/dist/web/assets/ProviderSettingsPage-B-u7Av-v.js +54 -0
- package/dist/web/assets/SettingsMasterDetail-C7L4KTOf.js +1 -0
- package/dist/web/assets/TeamSettingsPage-DCsq_ojZ.js +1 -0
- package/dist/web/assets/arrow-left-BSle2OYV.js +1 -0
- package/dist/web/assets/check-COf1UbPe.js +1 -0
- package/dist/web/assets/chevron-down-Dj8_pYCl.js +1 -0
- package/dist/web/assets/chevron-right-BUCnUjsN.js +1 -0
- package/dist/web/assets/{chevron-up-BEHjZ-SB.js → chevron-up-BhzmceCN.js} +1 -1
- package/dist/web/assets/{code-block-OCS4YCEC-6FHTyCN2.js → code-block-OCS4YCEC-C9ZDvx5q.js} +1 -1
- package/dist/web/assets/{confirm-dialog-B_wk_zqm.js → confirm-dialog-NY6uLJRk.js} +1 -1
- package/dist/web/assets/folder-picker-B5loyQsl.js +1 -0
- package/dist/web/assets/index-3iFMFw1l.css +1 -0
- package/dist/web/assets/index-DSFOeuuj.js +13 -0
- package/dist/web/assets/input-D67geHKZ.js +1 -0
- package/dist/web/assets/layers-Dl9LLqoY.js +1 -0
- package/dist/web/assets/loader-circle-CP1oxYjb.js +1 -0
- package/dist/web/assets/{mermaid-NOHMQCX5-fubZbKyF.js → mermaid-NOHMQCX5-C-bBE9vu.js} +4 -4
- package/dist/web/assets/message-square-Bwt_cqko.js +1 -0
- package/dist/web/assets/modal-0iwqEf_V.js +1 -0
- package/dist/web/assets/{pencil-uRBgB4qA.js → pencil-CAgGPSMf.js} +1 -1
- package/dist/web/assets/rotate-ccw-CnfGwAnp.js +1 -0
- package/dist/web/assets/{select-BMlH2AuL.js → select-C0X1iRxk.js} +1 -1
- package/dist/web/assets/switch-D_KOTssd.js +1 -0
- package/dist/web/assets/textarea-DS-Evqsv.js +1 -0
- package/dist/web/assets/{upload-B-Mpvu9j.js → upload-CTsJ3wDk.js} +1 -1
- package/dist/web/assets/{use-profiles-D6cZwU1R.js → use-profiles-CzdxiQuG.js} +1 -1
- package/dist/web/assets/{use-providers-DVP6emIi.js → use-providers-BdxKwaE3.js} +1 -1
- package/dist/web/favicon.ico +0 -0
- package/dist/web/index.html +4 -4
- package/node_modules/@agent-tower/shared/dist/socket/events.d.ts +9 -0
- package/node_modules/@agent-tower/shared/dist/socket/events.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/socket/events.js +1 -0
- package/node_modules/@agent-tower/shared/dist/socket/events.js.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.d.ts +21 -0
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.js.map +1 -1
- package/node_modules/@prisma/client/.prisma/client/edge.js +2 -2
- package/node_modules/@prisma/client/.prisma/client/index.js +2 -2
- package/package.json +1 -1
- package/dist/web/assets/AgentDemoPage-Co63rtls.js +0 -1
- package/dist/web/assets/GeneralSettingsPage-C5eiEeTZ.js +0 -1
- package/dist/web/assets/NotificationSettingsPage-BjjPan2M.js +0 -1
- package/dist/web/assets/ProfileSettingsPage-BRpeNq6u.js +0 -3
- package/dist/web/assets/ProjectKanbanPage-DUUu2EYy.js +0 -89
- package/dist/web/assets/ProjectSettingsPage-avctMKfk.js +0 -2
- package/dist/web/assets/ProviderSettingsPage-BIUYN2e0.js +0 -54
- package/dist/web/assets/SettingsSection-pLJ3msrT.js +0 -1
- package/dist/web/assets/TeamSettingsPage-BjKW9nT8.js +0 -1
- package/dist/web/assets/arrow-left-lFz8nyZM.js +0 -1
- package/dist/web/assets/button-BUA8P726.js +0 -1
- package/dist/web/assets/check-BYuuXc71.js +0 -1
- package/dist/web/assets/chevron-down-B931AgE2.js +0 -1
- package/dist/web/assets/chevron-right-F9i4wey6.js +0 -1
- package/dist/web/assets/circle-check-C7xXtl8B.js +0 -1
- package/dist/web/assets/folder-picker-BEHS3b2Q.js +0 -1
- package/dist/web/assets/index-DEQhT5sD.css +0 -1
- package/dist/web/assets/index-RxbHMWXV.js +0 -13
- package/dist/web/assets/loader-circle-stJcjnm-.js +0 -1
- package/dist/web/assets/message-square-C8lb-TDo.js +0 -1
- package/dist/web/assets/modal-UGrjU63G.js +0 -1
- package/dist/web/assets/rotate-ccw-CWaMrTz4.js +0 -1
package/dist/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAmBA,wBAAsB,QAAQ,
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAmBA,wBAAsB,QAAQ,qUA+E7B"}
|
package/dist/app.js
CHANGED
|
@@ -10,7 +10,7 @@ import { initializeSocket, closeSocket } from './socket/index.js';
|
|
|
10
10
|
import { WorkspaceService } from './services/workspace.service.js';
|
|
11
11
|
import { HibernationScheduler } from './services/hibernation-scheduler.js';
|
|
12
12
|
import { TunnelService } from './services/tunnel.service.js';
|
|
13
|
-
import { getTaskCleanupService } from './core/container.js';
|
|
13
|
+
import { getTaskCleanupService, getWorkspaceGitWatcherService } from './core/container.js';
|
|
14
14
|
import { tunnelAuthHook } from './middleware/tunnel-auth.js';
|
|
15
15
|
let hibernationScheduler = null;
|
|
16
16
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
@@ -19,6 +19,7 @@ export async function buildApp() {
|
|
|
19
19
|
logger: {
|
|
20
20
|
level: process.env.LOG_LEVEL || 'info',
|
|
21
21
|
},
|
|
22
|
+
bodyLimit: 10 * 1024 * 1024,
|
|
22
23
|
});
|
|
23
24
|
// 注册插件
|
|
24
25
|
await app.register(cors, {
|
|
@@ -60,11 +61,17 @@ export async function buildApp() {
|
|
|
60
61
|
hibernationScheduler.start();
|
|
61
62
|
// 启动任务删除后台资源清理 worker
|
|
62
63
|
getTaskCleanupService().start();
|
|
64
|
+
// 启动 workspace git 变化监听,补齐外部终端/IDE 手动 git 操作的实时刷新链路。
|
|
65
|
+
// 全量 watcher 初始化会扫描所有 ACTIVE worktree,不能阻塞 Fastify ready/listen。
|
|
66
|
+
void getWorkspaceGitWatcherService().start().catch((err) => {
|
|
67
|
+
app.log.warn(`Workspace git watcher startup failed: ${err instanceof Error ? err.message : err}`);
|
|
68
|
+
});
|
|
63
69
|
});
|
|
64
|
-
// 服务器关闭时清理 Socket.IO、Tunnel 和
|
|
70
|
+
// 服务器关闭时清理 Socket.IO、Tunnel、HibernationScheduler 和 watcher
|
|
65
71
|
app.addHook('onClose', async () => {
|
|
66
72
|
hibernationScheduler?.stop();
|
|
67
73
|
getTaskCleanupService().stop();
|
|
74
|
+
getWorkspaceGitWatcherService().stop();
|
|
68
75
|
TunnelService.stop();
|
|
69
76
|
await closeSocket();
|
|
70
77
|
});
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,IAAI,MAAM,eAAe,CAAC;AACjC,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/app.test.js
CHANGED
|
@@ -2,6 +2,10 @@ import * as fs from 'node:fs';
|
|
|
2
2
|
import * as os from 'node:os';
|
|
3
3
|
import * as path from 'node:path';
|
|
4
4
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
|
+
const taskCleanupStartMock = vi.fn();
|
|
6
|
+
const taskCleanupStopMock = vi.fn();
|
|
7
|
+
const workspaceGitWatcherStartMock = vi.fn(() => Promise.resolve());
|
|
8
|
+
const workspaceGitWatcherStopMock = vi.fn();
|
|
5
9
|
vi.mock('./routes/index.js', () => ({
|
|
6
10
|
registerRoutes: vi.fn(async () => { }),
|
|
7
11
|
}));
|
|
@@ -14,6 +18,16 @@ vi.mock('./services/workspace.service.js', () => ({
|
|
|
14
18
|
pruneAllWorktrees: vi.fn(() => Promise.resolve()),
|
|
15
19
|
},
|
|
16
20
|
}));
|
|
21
|
+
vi.mock('./core/container.js', () => ({
|
|
22
|
+
getTaskCleanupService: vi.fn(() => ({
|
|
23
|
+
start: taskCleanupStartMock,
|
|
24
|
+
stop: taskCleanupStopMock,
|
|
25
|
+
})),
|
|
26
|
+
getWorkspaceGitWatcherService: vi.fn(() => ({
|
|
27
|
+
start: workspaceGitWatcherStartMock,
|
|
28
|
+
stop: workspaceGitWatcherStopMock,
|
|
29
|
+
})),
|
|
30
|
+
}));
|
|
17
31
|
vi.mock('./services/tunnel.service.js', () => ({
|
|
18
32
|
TunnelService: {
|
|
19
33
|
isRunning: vi.fn(() => false),
|
|
@@ -29,6 +43,11 @@ let tempWebDir = '';
|
|
|
29
43
|
describe('buildApp static web hosting', () => {
|
|
30
44
|
beforeEach(() => {
|
|
31
45
|
tempWebDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-tower-web-'));
|
|
46
|
+
taskCleanupStartMock.mockClear();
|
|
47
|
+
taskCleanupStopMock.mockClear();
|
|
48
|
+
workspaceGitWatcherStartMock.mockReset();
|
|
49
|
+
workspaceGitWatcherStartMock.mockResolvedValue(undefined);
|
|
50
|
+
workspaceGitWatcherStopMock.mockClear();
|
|
32
51
|
});
|
|
33
52
|
afterEach(() => {
|
|
34
53
|
if (originalWebDir === undefined) {
|
|
@@ -72,4 +91,52 @@ describe('buildApp static web hosting', () => {
|
|
|
72
91
|
}
|
|
73
92
|
});
|
|
74
93
|
});
|
|
94
|
+
describe('buildApp startup services', () => {
|
|
95
|
+
beforeEach(() => {
|
|
96
|
+
delete process.env.AGENT_TOWER_WEB_DIR;
|
|
97
|
+
taskCleanupStartMock.mockClear();
|
|
98
|
+
taskCleanupStopMock.mockClear();
|
|
99
|
+
workspaceGitWatcherStartMock.mockReset();
|
|
100
|
+
workspaceGitWatcherStartMock.mockResolvedValue(undefined);
|
|
101
|
+
workspaceGitWatcherStopMock.mockClear();
|
|
102
|
+
});
|
|
103
|
+
afterEach(() => {
|
|
104
|
+
if (originalWebDir === undefined) {
|
|
105
|
+
delete process.env.AGENT_TOWER_WEB_DIR;
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
process.env.AGENT_TOWER_WEB_DIR = originalWebDir;
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
it('does not block Fastify ready on workspace git watcher startup', async () => {
|
|
112
|
+
let resolveWatcherStart;
|
|
113
|
+
workspaceGitWatcherStartMock.mockReturnValue(new Promise((resolve) => {
|
|
114
|
+
resolveWatcherStart = resolve;
|
|
115
|
+
}));
|
|
116
|
+
const app = await buildApp();
|
|
117
|
+
try {
|
|
118
|
+
await expect(app.ready()).resolves.toBe(app);
|
|
119
|
+
expect(workspaceGitWatcherStartMock).toHaveBeenCalledTimes(1);
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
resolveWatcherStart();
|
|
123
|
+
await app.close();
|
|
124
|
+
}
|
|
125
|
+
});
|
|
126
|
+
it('logs workspace git watcher startup failures without failing Fastify ready', async () => {
|
|
127
|
+
workspaceGitWatcherStartMock.mockRejectedValue(new Error('watcher failed'));
|
|
128
|
+
const app = await buildApp();
|
|
129
|
+
const warnSpy = vi.spyOn(app.log, 'warn');
|
|
130
|
+
try {
|
|
131
|
+
await expect(app.ready()).resolves.toBe(app);
|
|
132
|
+
await vi.waitFor(() => {
|
|
133
|
+
expect(warnSpy).toHaveBeenCalledWith('Workspace git watcher startup failed: watcher failed');
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
finally {
|
|
137
|
+
await app.close();
|
|
138
|
+
warnSpy.mockRestore();
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
});
|
|
75
142
|
//# sourceMappingURL=app.test.js.map
|
package/dist/app.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../src/app.test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAExE,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;CACtC,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;IACvC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;CACnC,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE,CAAC,CAAC;IAChD,gBAAgB,EAAE;QAChB,iBAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;KAClD;CACF,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7C,aAAa,EAAE;QACb,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;QAC7B,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;QAChC,mBAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;QACvC,iBAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;KACd;CACF,CAAC,CAAC,CAAA;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAA;AAEtD,IAAI,UAAU,GAAG,EAAE,CAAA;AAEnB,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../src/app.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -102,6 +102,8 @@ async function main() {
|
|
|
102
102
|
process.env.AGENT_TOWER_DATABASE_URL = `file:${dbPath}`;
|
|
103
103
|
process.env.AGENT_TOWER_DATA_DIR = dataDir;
|
|
104
104
|
process.env.AGENT_TOWER_WEB_DIR = 'web'; // 相对于 __dirname (dist/),即 dist/web/
|
|
105
|
+
process.env.AGENT_TOWER_PORT = String(port);
|
|
106
|
+
process.env.AGENT_TOWER_URL = `http://127.0.0.1:${port}`;
|
|
105
107
|
// 初始化数据库
|
|
106
108
|
const schemaPath = path.resolve(__dirname, '../prisma/schema.prisma');
|
|
107
109
|
ensureDatabase(dbPath, schemaPath);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/core/container.d.ts
CHANGED
|
@@ -3,11 +3,13 @@ import { SessionManager } from '../services/session-manager.js';
|
|
|
3
3
|
import { CommitMessageService } from '../services/commit-message.service.js';
|
|
4
4
|
import { NotificationService } from '../services/notifications/index.js';
|
|
5
5
|
import { TaskCleanupService } from '../services/task-cleanup.service.js';
|
|
6
|
+
import { WorkspaceGitWatcherService } from '../services/workspace-git-watcher.service.js';
|
|
6
7
|
import type { TerminalManager } from '../services/terminal-manager.js';
|
|
7
8
|
export declare function getEventBus(): EventBus;
|
|
8
9
|
export declare function getSessionManager(): SessionManager;
|
|
9
10
|
export declare function getCommitMessageService(): CommitMessageService;
|
|
10
11
|
export declare function getTaskCleanupService(): TaskCleanupService;
|
|
12
|
+
export declare function getWorkspaceGitWatcherService(): WorkspaceGitWatcherService;
|
|
11
13
|
export declare function getTerminalManager(): Promise<TerminalManager>;
|
|
12
14
|
export declare function getNotificationService(): NotificationService;
|
|
13
15
|
//# sourceMappingURL=container.d.ts.map
|
|
@@ -1 +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;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;
|
|
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;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAI1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAUvE,wBAAgB,WAAW,IAAI,QAAQ,CAKtC;AAED,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED,wBAAgB,uBAAuB,IAAI,oBAAoB,CAK9D;AAED,wBAAgB,qBAAqB,IAAI,kBAAkB,CAK1D;AAED,wBAAgB,6BAA6B,IAAI,0BAA0B,CAK1E;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAMnE;AAED,wBAAgB,sBAAsB,IAAI,mBAAmB,CA6B5D"}
|
package/dist/core/container.js
CHANGED
|
@@ -3,6 +3,7 @@ import { SessionManager } from '../services/session-manager.js';
|
|
|
3
3
|
import { CommitMessageService } from '../services/commit-message.service.js';
|
|
4
4
|
import { NotificationService } from '../services/notifications/index.js';
|
|
5
5
|
import { TaskCleanupService } from '../services/task-cleanup.service.js';
|
|
6
|
+
import { WorkspaceGitWatcherService } from '../services/workspace-git-watcher.service.js';
|
|
6
7
|
import { prisma } from '../utils/index.js';
|
|
7
8
|
let eventBus = null;
|
|
8
9
|
let sessionManager = null;
|
|
@@ -10,6 +11,7 @@ let terminalManager = null;
|
|
|
10
11
|
let commitMessageService = null;
|
|
11
12
|
let notificationService = null;
|
|
12
13
|
let taskCleanupService = null;
|
|
14
|
+
let workspaceGitWatcherService = null;
|
|
13
15
|
export function getEventBus() {
|
|
14
16
|
if (!eventBus) {
|
|
15
17
|
eventBus = new EventBus();
|
|
@@ -30,10 +32,16 @@ export function getCommitMessageService() {
|
|
|
30
32
|
}
|
|
31
33
|
export function getTaskCleanupService() {
|
|
32
34
|
if (!taskCleanupService) {
|
|
33
|
-
taskCleanupService = new TaskCleanupService(getSessionManager());
|
|
35
|
+
taskCleanupService = new TaskCleanupService(getSessionManager(), getWorkspaceGitWatcherService());
|
|
34
36
|
}
|
|
35
37
|
return taskCleanupService;
|
|
36
38
|
}
|
|
39
|
+
export function getWorkspaceGitWatcherService() {
|
|
40
|
+
if (!workspaceGitWatcherService) {
|
|
41
|
+
workspaceGitWatcherService = new WorkspaceGitWatcherService(getEventBus());
|
|
42
|
+
}
|
|
43
|
+
return workspaceGitWatcherService;
|
|
44
|
+
}
|
|
37
45
|
export async function getTerminalManager() {
|
|
38
46
|
if (!terminalManager) {
|
|
39
47
|
const { TerminalManager: TM } = await import('../services/terminal-manager.js');
|
|
@@ -1 +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,kBAAkB,EAAE,MAAM,qCAAqC,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;AAC3D,IAAI,kBAAkB,GAA8B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/core/container.ts"],"names":[],"mappings":"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"}
|
package/dist/core/event-bus.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { TeamRunInvalidatedPayload } from '@agent-tower/shared/socket';
|
|
1
|
+
import type { TeamRunInvalidatedPayload, WorkspaceGitChangedPayload } from '@agent-tower/shared/socket';
|
|
2
2
|
type EventMap = {
|
|
3
3
|
'session:stdout': {
|
|
4
4
|
sessionId: string;
|
|
@@ -63,6 +63,7 @@ type EventMap = {
|
|
|
63
63
|
taskId: string;
|
|
64
64
|
projectId: string;
|
|
65
65
|
};
|
|
66
|
+
'workspace:git_changed': WorkspaceGitChangedPayload;
|
|
66
67
|
'team-run:invalidated': TeamRunInvalidatedPayload;
|
|
67
68
|
};
|
|
68
69
|
type EventName = keyof EventMap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-bus.d.ts","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"event-bus.d.ts","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExG,KAAK,QAAQ,GAAG;IACd,gBAAgB,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,EAAE,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,cAAc,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,mBAAmB,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,iBAAiB,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,iBAAiB,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,mBAAmB,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,cAAc,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,cAAc,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAEtD,iBAAiB,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,eAAe,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE3D,0BAA0B,EAAE;QAC1B,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;QAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,kCAAkC,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;KAC9B,CAAC;IACF,sBAAsB,EAAE;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,uBAAuB,EAAE,0BAA0B,CAAC;IACpD,sBAAsB,EAAE,yBAAyB,CAAC;CACnD,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,QAAQ,CAAC;AAChC,KAAK,OAAO,CAAC,CAAC,SAAS,SAAS,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AAEnE;;GAEG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,SAAS,CAAyD;IAE1E,EAAE,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI;IAM5D,GAAG,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI;IAS7D,IAAI,CAAC,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;CAOhE;AAED,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"AA0CA;;GAEG;AACH,MAAM,OAAO,QAAQ;IACX,SAAS,GAAG,IAAI,GAAG,EAA8C,CAAC;IAE1E,EAAE,CAAsB,KAAQ,EAAE,OAAmB;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QACnD,GAAG,CAAC,GAAG,CAAC,OAAqC,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAsB,KAAQ,EAAE,OAAmB;QACpD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,GAAG,CAAC,MAAM,CAAC,OAAqC,CAAC,CAAC;QAClD,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,IAAI,CAAsB,KAAQ,EAAE,OAAoB;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,KAAK,MAAM,OAAO,IAAI,GAAG,EAAE,CAAC;YAC1B,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base.executor.test.d.ts","sourceRoot":"","sources":["../../../src/executors/__tests__/base.executor.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { existsSync, rmSync } from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { AgentType } from '../../types/index.js';
|
|
6
|
+
import { BaseExecutor } from '../base.executor.js';
|
|
7
|
+
import { CommandBuilder } from '../command-builder.js';
|
|
8
|
+
import { AGENT_SUBPROCESS_BLOCKED_ENV_KEYS, AGENT_TOWER_MCP_IDENTITY_ENV_KEYS, AGENT_TOWER_MCP_SERVICE_ENV_KEYS, ExecutionEnv, } from '../execution-env.js';
|
|
9
|
+
const spawnMock = vi.hoisted(() => vi.fn());
|
|
10
|
+
const whichMock = vi.hoisted(() => vi.fn(async (command) => `/bin/${command}`));
|
|
11
|
+
vi.mock('@shitiandmw/node-pty', () => ({
|
|
12
|
+
spawn: spawnMock,
|
|
13
|
+
}));
|
|
14
|
+
vi.mock('../../utils/index.js', () => ({
|
|
15
|
+
which: whichMock,
|
|
16
|
+
}));
|
|
17
|
+
class TestExecutor extends BaseExecutor {
|
|
18
|
+
agentType = AgentType.CLAUDE_CODE;
|
|
19
|
+
displayName = 'Test Executor';
|
|
20
|
+
buildCommandBuilder() {
|
|
21
|
+
return CommandBuilder.new('mock-agent');
|
|
22
|
+
}
|
|
23
|
+
async getAvailabilityInfo() {
|
|
24
|
+
return { type: 'INSTALLATION_FOUND' };
|
|
25
|
+
}
|
|
26
|
+
spawnForTest(commandParts, stdinData, env = ExecutionEnv.default(os.tmpdir())) {
|
|
27
|
+
return this.spawnWithStdin({
|
|
28
|
+
workingDir: os.tmpdir(),
|
|
29
|
+
prompt: '',
|
|
30
|
+
env,
|
|
31
|
+
}, commandParts, stdinData);
|
|
32
|
+
}
|
|
33
|
+
spawnInternalForTest(commandParts, env) {
|
|
34
|
+
return this.spawnInternal({
|
|
35
|
+
workingDir: os.tmpdir(),
|
|
36
|
+
prompt: 'prompt',
|
|
37
|
+
env,
|
|
38
|
+
}, commandParts);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
const tmpFileForNow = (now) => path.join(os.tmpdir(), `agent-tower-stdin-${now}.json`);
|
|
42
|
+
const envKeysToRestore = [
|
|
43
|
+
...AGENT_SUBPROCESS_BLOCKED_ENV_KEYS,
|
|
44
|
+
...AGENT_TOWER_MCP_IDENTITY_ENV_KEYS,
|
|
45
|
+
...AGENT_TOWER_MCP_SERVICE_ENV_KEYS,
|
|
46
|
+
'AGENT_TOWER_TEST_NORMAL_ENV',
|
|
47
|
+
];
|
|
48
|
+
function snapshotEnv(keys) {
|
|
49
|
+
const snapshot = {};
|
|
50
|
+
for (const key of keys) {
|
|
51
|
+
snapshot[key] = process.env[key];
|
|
52
|
+
}
|
|
53
|
+
return snapshot;
|
|
54
|
+
}
|
|
55
|
+
function restoreEnv(snapshot) {
|
|
56
|
+
for (const [key, value] of Object.entries(snapshot)) {
|
|
57
|
+
if (value === undefined) {
|
|
58
|
+
delete process.env[key];
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
process.env[key] = value;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
describe('ExecutionEnv.getFullEnv', () => {
|
|
66
|
+
const originalEnv = snapshotEnv(envKeysToRestore);
|
|
67
|
+
afterEach(() => {
|
|
68
|
+
restoreEnv(originalEnv);
|
|
69
|
+
});
|
|
70
|
+
it('filters Agent Tower service env while preserving normal and TeamRun/MCP env', () => {
|
|
71
|
+
process.env.DATABASE_URL = 'file:/prod/database-url.db';
|
|
72
|
+
process.env.AGENT_TOWER_DATABASE_URL = 'file:/prod/agent-tower.db';
|
|
73
|
+
process.env.AGENT_TOWER_DATA_DIR = '/prod/agent-tower-data';
|
|
74
|
+
process.env.AGENT_TOWER_WEB_DIR = '/prod/agent-tower-web';
|
|
75
|
+
process.env.DATA_DIR = '/prod/data-dir';
|
|
76
|
+
process.env.AGENT_TOWER_SESSION_ID = 'inherited-session';
|
|
77
|
+
process.env.AGENT_TOWER_INVOCATION_ID = 'inherited-invocation';
|
|
78
|
+
process.env.AGENT_TOWER_TEAM_RUN_ID = 'inherited-team-run';
|
|
79
|
+
process.env.AGENT_TOWER_MEMBER_ID = 'inherited-member';
|
|
80
|
+
process.env.AGENT_TOWER_URL = 'http://127.0.0.1:12580';
|
|
81
|
+
process.env.AGENT_TOWER_PORT = '12580';
|
|
82
|
+
process.env.AGENT_TOWER_TEST_NORMAL_ENV = 'keep-me';
|
|
83
|
+
const env = ExecutionEnv.default(os.tmpdir()).merge({
|
|
84
|
+
DATABASE_URL: 'file:/provider/database-url.db',
|
|
85
|
+
AGENT_TOWER_DATABASE_URL: 'file:/provider/agent-tower.db',
|
|
86
|
+
AGENT_TOWER_DATA_DIR: '/provider/agent-tower-data',
|
|
87
|
+
AGENT_TOWER_WEB_DIR: '/provider/agent-tower-web',
|
|
88
|
+
DATA_DIR: '/provider/data-dir',
|
|
89
|
+
AGENT_TOWER_SESSION_ID: 'session-1',
|
|
90
|
+
AGENT_TOWER_INVOCATION_ID: 'invocation-1',
|
|
91
|
+
AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
|
|
92
|
+
AGENT_TOWER_MEMBER_ID: 'member-1',
|
|
93
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:42232',
|
|
94
|
+
AGENT_TOWER_PORT: '42232',
|
|
95
|
+
PROVIDER_SAFE_ENV: 'provider-value',
|
|
96
|
+
});
|
|
97
|
+
const fullEnv = env.getFullEnv();
|
|
98
|
+
for (const key of AGENT_SUBPROCESS_BLOCKED_ENV_KEYS) {
|
|
99
|
+
expect(fullEnv).not.toHaveProperty(key);
|
|
100
|
+
}
|
|
101
|
+
expect(fullEnv).toMatchObject({
|
|
102
|
+
AGENT_TOWER_SESSION_ID: 'session-1',
|
|
103
|
+
AGENT_TOWER_INVOCATION_ID: 'invocation-1',
|
|
104
|
+
AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
|
|
105
|
+
AGENT_TOWER_MEMBER_ID: 'member-1',
|
|
106
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:42232',
|
|
107
|
+
AGENT_TOWER_PORT: '42232',
|
|
108
|
+
AGENT_TOWER_TEST_NORMAL_ENV: 'keep-me',
|
|
109
|
+
PROVIDER_SAFE_ENV: 'provider-value',
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
it('filters internal env from cmd override profiles without replacing explicit MCP env', () => {
|
|
113
|
+
const env = ExecutionEnv.default(os.tmpdir()).merge({
|
|
114
|
+
AGENT_TOWER_SESSION_ID: 'session-1',
|
|
115
|
+
AGENT_TOWER_INVOCATION_ID: 'invocation-1',
|
|
116
|
+
AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
|
|
117
|
+
AGENT_TOWER_MEMBER_ID: 'member-1',
|
|
118
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:42232',
|
|
119
|
+
AGENT_TOWER_PORT: '42232',
|
|
120
|
+
});
|
|
121
|
+
const profiledEnv = env.withProfile({
|
|
122
|
+
env: {
|
|
123
|
+
DATABASE_URL: 'file:/provider/database-url.db',
|
|
124
|
+
AGENT_TOWER_SESSION_ID: 'provider-session',
|
|
125
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:9999',
|
|
126
|
+
PROVIDER_SAFE_ENV: 'provider-value',
|
|
127
|
+
},
|
|
128
|
+
});
|
|
129
|
+
expect(profiledEnv.getFullEnv()).toMatchObject({
|
|
130
|
+
AGENT_TOWER_SESSION_ID: 'session-1',
|
|
131
|
+
AGENT_TOWER_INVOCATION_ID: 'invocation-1',
|
|
132
|
+
AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
|
|
133
|
+
AGENT_TOWER_MEMBER_ID: 'member-1',
|
|
134
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:42232',
|
|
135
|
+
AGENT_TOWER_PORT: '42232',
|
|
136
|
+
PROVIDER_SAFE_ENV: 'provider-value',
|
|
137
|
+
});
|
|
138
|
+
expect(profiledEnv.getFullEnv()).not.toHaveProperty('DATABASE_URL');
|
|
139
|
+
});
|
|
140
|
+
it('does not inherit parent TeamRun identity env without explicit injection', () => {
|
|
141
|
+
process.env.AGENT_TOWER_SESSION_ID = 'inherited-session';
|
|
142
|
+
process.env.AGENT_TOWER_INVOCATION_ID = 'inherited-invocation';
|
|
143
|
+
process.env.AGENT_TOWER_TEAM_RUN_ID = 'inherited-team-run';
|
|
144
|
+
process.env.AGENT_TOWER_MEMBER_ID = 'inherited-member';
|
|
145
|
+
const fullEnv = ExecutionEnv.default(os.tmpdir()).getFullEnv();
|
|
146
|
+
for (const key of AGENT_TOWER_MCP_IDENTITY_ENV_KEYS) {
|
|
147
|
+
expect(fullEnv).not.toHaveProperty(key);
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
describe('BaseExecutor.spawnWithStdin', () => {
|
|
152
|
+
let now = 0;
|
|
153
|
+
beforeEach(() => {
|
|
154
|
+
now += 1;
|
|
155
|
+
spawnMock.mockReset();
|
|
156
|
+
whichMock.mockClear();
|
|
157
|
+
vi.spyOn(Date, 'now').mockReturnValue(now);
|
|
158
|
+
rmSync(tmpFileForNow(now), { force: true });
|
|
159
|
+
vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
160
|
+
});
|
|
161
|
+
afterEach(() => {
|
|
162
|
+
vi.restoreAllMocks();
|
|
163
|
+
rmSync(tmpFileForNow(now), { force: true });
|
|
164
|
+
});
|
|
165
|
+
it('removes the stdin temp file when pty.spawn throws after writing it', async () => {
|
|
166
|
+
const error = new Error('spawn failed');
|
|
167
|
+
spawnMock.mockImplementationOnce(() => {
|
|
168
|
+
throw error;
|
|
169
|
+
});
|
|
170
|
+
const executor = new TestExecutor();
|
|
171
|
+
await expect(executor.spawnForTest({ program: 'mock-agent', args: [] }, '{"message":"hello"}'))
|
|
172
|
+
.rejects.toThrow(error);
|
|
173
|
+
expect(existsSync(tmpFileForNow(now))).toBe(false);
|
|
174
|
+
});
|
|
175
|
+
it('disposes data and exit listeners when the pty exits', async () => {
|
|
176
|
+
const dataDispose = vi.fn();
|
|
177
|
+
const exitDispose = vi.fn();
|
|
178
|
+
let onDataCallback;
|
|
179
|
+
let onExitCallback;
|
|
180
|
+
spawnMock.mockReturnValueOnce({
|
|
181
|
+
pid: 12345,
|
|
182
|
+
onData: vi.fn((callback) => {
|
|
183
|
+
onDataCallback = callback;
|
|
184
|
+
return { dispose: dataDispose };
|
|
185
|
+
}),
|
|
186
|
+
onExit: vi.fn((callback) => {
|
|
187
|
+
onExitCallback = callback;
|
|
188
|
+
return { dispose: exitDispose };
|
|
189
|
+
}),
|
|
190
|
+
kill: vi.fn(),
|
|
191
|
+
});
|
|
192
|
+
const executor = new TestExecutor();
|
|
193
|
+
const result = await executor.spawnForTest({ program: 'mock-agent', args: ['--json'] }, '{"message":"hello"}');
|
|
194
|
+
expect(result.pid).toBe(12345);
|
|
195
|
+
expect(onDataCallback).toBeDefined();
|
|
196
|
+
expect(onExitCallback).toBeDefined();
|
|
197
|
+
onDataCallback?.('x'.repeat(9000));
|
|
198
|
+
onExitCallback?.({ exitCode: 0 });
|
|
199
|
+
expect(dataDispose).toHaveBeenCalledTimes(1);
|
|
200
|
+
expect(exitDispose).toHaveBeenCalledTimes(1);
|
|
201
|
+
});
|
|
202
|
+
it('leaves the stdin temp file for the wrapper cleanup after successful spawn', async () => {
|
|
203
|
+
spawnMock.mockReturnValueOnce({
|
|
204
|
+
pid: 12345,
|
|
205
|
+
onData: vi.fn(() => ({ dispose: vi.fn() })),
|
|
206
|
+
onExit: vi.fn(() => ({ dispose: vi.fn() })),
|
|
207
|
+
kill: vi.fn(),
|
|
208
|
+
});
|
|
209
|
+
const executor = new TestExecutor();
|
|
210
|
+
await executor.spawnForTest({ program: 'mock-agent', args: [] }, '{"message":"hello"}');
|
|
211
|
+
expect(existsSync(tmpFileForNow(now))).toBe(true);
|
|
212
|
+
});
|
|
213
|
+
});
|
|
214
|
+
describe('BaseExecutor subprocess env', () => {
|
|
215
|
+
const originalEnv = snapshotEnv(envKeysToRestore);
|
|
216
|
+
beforeEach(() => {
|
|
217
|
+
spawnMock.mockReset();
|
|
218
|
+
whichMock.mockClear();
|
|
219
|
+
vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
|
|
220
|
+
});
|
|
221
|
+
afterEach(() => {
|
|
222
|
+
vi.restoreAllMocks();
|
|
223
|
+
restoreEnv(originalEnv);
|
|
224
|
+
});
|
|
225
|
+
it('passes a sanitized env to agent pty.spawn', async () => {
|
|
226
|
+
process.env.DATABASE_URL = 'file:/prod/database-url.db';
|
|
227
|
+
process.env.AGENT_TOWER_DATABASE_URL = 'file:/prod/agent-tower.db';
|
|
228
|
+
process.env.AGENT_TOWER_DATA_DIR = '/prod/agent-tower-data';
|
|
229
|
+
process.env.AGENT_TOWER_WEB_DIR = '/prod/agent-tower-web';
|
|
230
|
+
process.env.DATA_DIR = '/prod/data-dir';
|
|
231
|
+
process.env.AGENT_TOWER_SESSION_ID = 'inherited-session';
|
|
232
|
+
process.env.AGENT_TOWER_INVOCATION_ID = 'inherited-invocation';
|
|
233
|
+
process.env.AGENT_TOWER_TEAM_RUN_ID = 'inherited-team-run';
|
|
234
|
+
process.env.AGENT_TOWER_MEMBER_ID = 'inherited-member';
|
|
235
|
+
spawnMock.mockReturnValueOnce({
|
|
236
|
+
pid: 12345,
|
|
237
|
+
onData: vi.fn(() => ({ dispose: vi.fn() })),
|
|
238
|
+
onExit: vi.fn(() => ({ dispose: vi.fn() })),
|
|
239
|
+
kill: vi.fn(),
|
|
240
|
+
});
|
|
241
|
+
const env = ExecutionEnv.default(os.tmpdir()).merge({
|
|
242
|
+
AGENT_TOWER_SESSION_ID: 'session-1',
|
|
243
|
+
AGENT_TOWER_INVOCATION_ID: 'invocation-1',
|
|
244
|
+
AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
|
|
245
|
+
AGENT_TOWER_MEMBER_ID: 'member-1',
|
|
246
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:42232',
|
|
247
|
+
DATABASE_URL: 'file:/provider/database-url.db',
|
|
248
|
+
});
|
|
249
|
+
const executor = new TestExecutor();
|
|
250
|
+
await executor.spawnInternalForTest({ program: 'mock-agent', args: ['--json'] }, env);
|
|
251
|
+
const spawnOptions = spawnMock.mock.calls[0][2];
|
|
252
|
+
for (const key of AGENT_SUBPROCESS_BLOCKED_ENV_KEYS) {
|
|
253
|
+
expect(spawnOptions.env).not.toHaveProperty(key);
|
|
254
|
+
}
|
|
255
|
+
expect(spawnOptions.env).toMatchObject({
|
|
256
|
+
AGENT_TOWER_SESSION_ID: 'session-1',
|
|
257
|
+
AGENT_TOWER_INVOCATION_ID: 'invocation-1',
|
|
258
|
+
AGENT_TOWER_TEAM_RUN_ID: 'team-run-1',
|
|
259
|
+
AGENT_TOWER_MEMBER_ID: 'member-1',
|
|
260
|
+
AGENT_TOWER_URL: 'http://127.0.0.1:42232',
|
|
261
|
+
});
|
|
262
|
+
});
|
|
263
|
+
});
|
|
264
|
+
//# sourceMappingURL=base.executor.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base.executor.test.js","sourceRoot":"","sources":["../../../src/executors/__tests__/base.executor.test.ts"],"names":[],"mappings":"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"}
|