@agentmeshhq/agent 0.2.0 → 0.3.0
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/README.md +39 -0
- package/dist/__tests__/context-template.test.d.ts +4 -0
- package/dist/__tests__/context-template.test.js +233 -0
- package/dist/__tests__/context-template.test.js.map +1 -0
- package/dist/__tests__/loader.test.js +140 -28
- package/dist/__tests__/loader.test.js.map +1 -1
- package/dist/__tests__/no-respawn.test.d.ts +1 -0
- package/dist/__tests__/no-respawn.test.js +254 -0
- package/dist/__tests__/no-respawn.test.js.map +1 -0
- package/dist/__tests__/onboard.test.d.ts +5 -0
- package/dist/__tests__/onboard.test.js +341 -0
- package/dist/__tests__/onboard.test.js.map +1 -0
- package/dist/__tests__/orphan-process.test.d.ts +11 -0
- package/dist/__tests__/orphan-process.test.js +286 -0
- package/dist/__tests__/orphan-process.test.js.map +1 -0
- package/dist/__tests__/runner.test.js +16 -0
- package/dist/__tests__/runner.test.js.map +1 -1
- package/dist/__tests__/shared-resource-guards.test.d.ts +7 -0
- package/dist/__tests__/shared-resource-guards.test.js +260 -0
- package/dist/__tests__/shared-resource-guards.test.js.map +1 -0
- package/dist/__tests__/watchdog.test.js +138 -12
- package/dist/__tests__/watchdog.test.js.map +1 -1
- package/dist/cli/status.js +11 -0
- package/dist/cli/status.js.map +1 -1
- package/dist/cli/stop.js +7 -2
- package/dist/cli/stop.js.map +1 -1
- package/dist/config/loader.d.ts +0 -4
- package/dist/config/loader.js +102 -42
- package/dist/config/loader.js.map +1 -1
- package/dist/config/schema.d.ts +6 -4
- package/dist/core/daemon/assignment-message.d.ts +12 -0
- package/dist/core/daemon/assignment-message.js +36 -0
- package/dist/core/daemon/assignment-message.js.map +1 -0
- package/dist/core/daemon/bootstrap.d.ts +35 -0
- package/dist/core/daemon/bootstrap.js +52 -0
- package/dist/core/daemon/bootstrap.js.map +1 -0
- package/dist/core/daemon/context-template.d.ts +11 -0
- package/dist/core/daemon/context-template.js +144 -0
- package/dist/core/daemon/context-template.js.map +1 -0
- package/dist/core/daemon/crash-log.d.ts +14 -0
- package/dist/core/daemon/crash-log.js +23 -0
- package/dist/core/daemon/crash-log.js.map +1 -0
- package/dist/core/daemon/git-auth.d.ts +18 -0
- package/dist/core/daemon/git-auth.js +88 -0
- package/dist/core/daemon/git-auth.js.map +1 -0
- package/dist/core/daemon/health-policy.d.ts +17 -0
- package/dist/core/daemon/health-policy.js +24 -0
- package/dist/core/daemon/health-policy.js.map +1 -0
- package/dist/core/daemon/sandbox-config.d.ts +9 -0
- package/dist/core/daemon/sandbox-config.js +17 -0
- package/dist/core/daemon/sandbox-config.js.map +1 -0
- package/dist/core/daemon/state.d.ts +33 -0
- package/dist/core/daemon/state.js +78 -0
- package/dist/core/daemon/state.js.map +1 -0
- package/dist/core/daemon/tmux-session.d.ts +17 -0
- package/dist/core/daemon/tmux-session.js +34 -0
- package/dist/core/daemon/tmux-session.js.map +1 -0
- package/dist/core/daemon/workspace.d.ts +23 -0
- package/dist/core/daemon/workspace.js +90 -0
- package/dist/core/daemon/workspace.js.map +1 -0
- package/dist/core/daemon.d.ts +9 -12
- package/dist/core/daemon.js +293 -393
- package/dist/core/daemon.js.map +1 -1
- package/dist/core/injector.d.ts +5 -1
- package/dist/core/injector.js +83 -0
- package/dist/core/injector.js.map +1 -1
- package/dist/core/registry.d.ts +62 -0
- package/dist/core/registry.js +18 -0
- package/dist/core/registry.js.map +1 -1
- package/dist/core/runner/build.d.ts +9 -0
- package/dist/core/runner/build.js +53 -0
- package/dist/core/runner/build.js.map +1 -0
- package/dist/core/runner/detect.d.ts +5 -0
- package/dist/core/runner/detect.js +14 -0
- package/dist/core/runner/detect.js.map +1 -0
- package/dist/core/runner/index.d.ts +5 -0
- package/dist/core/runner/index.js +5 -0
- package/dist/core/runner/index.js.map +1 -0
- package/dist/core/runner/model.d.ts +5 -0
- package/dist/core/runner/model.js +7 -0
- package/dist/core/runner/model.js.map +1 -0
- package/dist/core/runner/opencode-models.d.ts +15 -0
- package/dist/core/runner/opencode-models.js +70 -0
- package/dist/core/runner/opencode-models.js.map +1 -0
- package/dist/core/runner/types.d.ts +19 -0
- package/dist/core/runner/types.js +8 -0
- package/dist/core/runner/types.js.map +1 -0
- package/dist/core/runner.d.ts +5 -47
- package/dist/core/runner.js +5 -167
- package/dist/core/runner.js.map +1 -1
- package/dist/core/tmux-runtime.d.ts +13 -0
- package/dist/core/tmux-runtime.js +72 -0
- package/dist/core/tmux-runtime.js.map +1 -0
- package/dist/core/tmux.d.ts +7 -1
- package/dist/core/tmux.js +75 -45
- package/dist/core/tmux.js.map +1 -1
- package/dist/core/watchdog.d.ts +18 -1
- package/dist/core/watchdog.js +78 -29
- package/dist/core/watchdog.js.map +1 -1
- package/package.json +24 -4
- package/src/__tests__/context.test.ts +0 -464
- package/src/__tests__/injector.test.ts +0 -29
- package/src/__tests__/jwt.test.ts +0 -112
- package/src/__tests__/loader.test.ts +0 -239
- package/src/__tests__/runner.test.ts +0 -104
- package/src/__tests__/sandbox.test.ts +0 -435
- package/src/__tests__/watchdog.test.ts +0 -368
- package/src/cli/attach.ts +0 -22
- package/src/cli/build.ts +0 -145
- package/src/cli/config.ts +0 -148
- package/src/cli/context.ts +0 -231
- package/src/cli/deploy.ts +0 -155
- package/src/cli/index.ts +0 -376
- package/src/cli/init.ts +0 -75
- package/src/cli/list.ts +0 -70
- package/src/cli/local.ts +0 -183
- package/src/cli/logs.ts +0 -64
- package/src/cli/migrate.ts +0 -212
- package/src/cli/nudge.ts +0 -81
- package/src/cli/restart.ts +0 -59
- package/src/cli/slack.ts +0 -70
- package/src/cli/start.ts +0 -118
- package/src/cli/status.ts +0 -91
- package/src/cli/stop.ts +0 -48
- package/src/cli/test.ts +0 -143
- package/src/cli/token.ts +0 -188
- package/src/cli/whoami.ts +0 -142
- package/src/config/loader.ts +0 -121
- package/src/config/schema.ts +0 -68
- package/src/context/handoff.ts +0 -122
- package/src/context/index.ts +0 -8
- package/src/context/schema.ts +0 -111
- package/src/context/storage.ts +0 -197
- package/src/core/daemon.ts +0 -1317
- package/src/core/heartbeat.ts +0 -129
- package/src/core/injector.ts +0 -292
- package/src/core/registry.ts +0 -159
- package/src/core/runner.ts +0 -225
- package/src/core/sandbox.ts +0 -547
- package/src/core/session-id.ts +0 -111
- package/src/core/tmux.ts +0 -405
- package/src/core/watchdog.ts +0 -238
- package/src/core/websocket.ts +0 -94
- package/src/index.ts +0 -10
- package/src/utils/jwt.ts +0 -87
- package/tsconfig.json +0 -8
- package/vitest.config.ts +0 -12
|
@@ -0,0 +1,286 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for orphaned process prevention (P0 fix for the daemon process leak).
|
|
3
|
+
*
|
|
4
|
+
* Covers:
|
|
5
|
+
* - killProcessTree: SIGTERM → SIGKILL escalation
|
|
6
|
+
* - getTmuxPanePid: reads PID from tmux pane
|
|
7
|
+
* - getProcessTree: recursive child enumeration
|
|
8
|
+
* - captureAgentChildPids: captures all PIDs for a given agent
|
|
9
|
+
* - destroySession: kills child PIDs before killing tmux session
|
|
10
|
+
*/
|
|
11
|
+
import { execSync } from "node:child_process";
|
|
12
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
13
|
+
import { captureAgentChildPids, getProcessTree, getTmuxPanePid } from "../core/daemon/state.js";
|
|
14
|
+
import { destroySession, killProcessTree } from "../core/tmux.js";
|
|
15
|
+
// ─── Mocks ────────────────────────────────────────────────────────────────────
|
|
16
|
+
vi.mock("node:child_process", () => ({
|
|
17
|
+
execSync: vi.fn(),
|
|
18
|
+
execFileSync: vi.fn(),
|
|
19
|
+
spawnSync: vi.fn(),
|
|
20
|
+
}));
|
|
21
|
+
vi.mock("../core/tmux-runtime.js", () => ({
|
|
22
|
+
buildInteractiveCommand: vi.fn().mockReturnValue("opencode"),
|
|
23
|
+
detectRunnerCommandKind: vi.fn().mockReturnValue("opencode"),
|
|
24
|
+
prepareOpenCodeRuntime: vi.fn().mockReturnValue("/tmp/test-runtime"),
|
|
25
|
+
}));
|
|
26
|
+
// Helper to mock process.kill without type gymnastics
|
|
27
|
+
function mockProcessKill(impl) {
|
|
28
|
+
return vi.spyOn(process, "kill").mockImplementation(impl);
|
|
29
|
+
}
|
|
30
|
+
const mockExecSync = vi.mocked(execSync);
|
|
31
|
+
// ─── killProcessTree ──────────────────────────────────────────────────────────
|
|
32
|
+
describe("killProcessTree", () => {
|
|
33
|
+
let killSpy;
|
|
34
|
+
beforeEach(() => {
|
|
35
|
+
killSpy = mockProcessKill(() => true);
|
|
36
|
+
vi.useFakeTimers();
|
|
37
|
+
});
|
|
38
|
+
afterEach(() => {
|
|
39
|
+
killSpy.mockRestore();
|
|
40
|
+
vi.useRealTimers();
|
|
41
|
+
});
|
|
42
|
+
it("returns true immediately if pids list is empty", () => {
|
|
43
|
+
const result = killProcessTree([]);
|
|
44
|
+
expect(result).toBe(true);
|
|
45
|
+
expect(killSpy).not.toHaveBeenCalled();
|
|
46
|
+
});
|
|
47
|
+
it("sends SIGTERM to all provided PIDs", () => {
|
|
48
|
+
// Track whether SIGTERM has been sent to each PID
|
|
49
|
+
const terminatedPids = new Set();
|
|
50
|
+
killSpy.mockImplementation((_pid, sig) => {
|
|
51
|
+
if (sig === "SIGTERM") {
|
|
52
|
+
terminatedPids.add(_pid);
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
if (sig === 0) {
|
|
56
|
+
// Alive until SIGTERM has been sent
|
|
57
|
+
if (terminatedPids.has(_pid))
|
|
58
|
+
throw new Error("no such process");
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
61
|
+
return true;
|
|
62
|
+
});
|
|
63
|
+
mockExecSync.mockReturnValue("");
|
|
64
|
+
killProcessTree([1234, 5678]);
|
|
65
|
+
expect(killSpy).toHaveBeenCalledWith(1234, "SIGTERM");
|
|
66
|
+
expect(killSpy).toHaveBeenCalledWith(5678, "SIGTERM");
|
|
67
|
+
});
|
|
68
|
+
it("escalates to SIGKILL after timeout when processes remain alive", () => {
|
|
69
|
+
// Process stays alive through SIGTERM, only dies after SIGKILL check
|
|
70
|
+
let killedWithSigkill = false;
|
|
71
|
+
killSpy.mockImplementation((_pid, sig) => {
|
|
72
|
+
if (sig === "SIGKILL") {
|
|
73
|
+
killedWithSigkill = true;
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
if (sig === 0) {
|
|
77
|
+
// Stay alive until SIGKILL has been sent
|
|
78
|
+
if (killedWithSigkill)
|
|
79
|
+
throw new Error("no such process");
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
return true;
|
|
83
|
+
});
|
|
84
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
85
|
+
if (cmd === "sleep 0.1")
|
|
86
|
+
vi.advanceTimersByTime(100);
|
|
87
|
+
return "";
|
|
88
|
+
});
|
|
89
|
+
killProcessTree([1234], 200);
|
|
90
|
+
expect(killSpy).toHaveBeenCalledWith(1234, "SIGTERM");
|
|
91
|
+
expect(killSpy).toHaveBeenCalledWith(1234, "SIGKILL");
|
|
92
|
+
});
|
|
93
|
+
it("does not SIGKILL when processes exit gracefully before timeout", () => {
|
|
94
|
+
let sigkillCalled = false;
|
|
95
|
+
let terminatedPid = null;
|
|
96
|
+
killSpy.mockImplementation((_pid, sig) => {
|
|
97
|
+
if (sig === "SIGKILL") {
|
|
98
|
+
sigkillCalled = true;
|
|
99
|
+
return true;
|
|
100
|
+
}
|
|
101
|
+
if (sig === "SIGTERM") {
|
|
102
|
+
terminatedPid = _pid;
|
|
103
|
+
return true;
|
|
104
|
+
}
|
|
105
|
+
if (sig === 0) {
|
|
106
|
+
// Dead after SIGTERM
|
|
107
|
+
if (terminatedPid === _pid)
|
|
108
|
+
throw new Error("no such process");
|
|
109
|
+
return true;
|
|
110
|
+
}
|
|
111
|
+
return true;
|
|
112
|
+
});
|
|
113
|
+
mockExecSync.mockReturnValue("");
|
|
114
|
+
killProcessTree([1234]);
|
|
115
|
+
expect(sigkillCalled).toBe(false);
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
// ─── getTmuxPanePid ────────────────────────────────────────────────────────────
|
|
119
|
+
describe("getTmuxPanePid", () => {
|
|
120
|
+
beforeEach(() => {
|
|
121
|
+
vi.clearAllMocks();
|
|
122
|
+
});
|
|
123
|
+
it("returns parsed PID from tmux list-panes output", () => {
|
|
124
|
+
mockExecSync.mockReturnValue("42000\n");
|
|
125
|
+
const pid = getTmuxPanePid("agentmesh-test-agent");
|
|
126
|
+
expect(pid).toBe(42000);
|
|
127
|
+
});
|
|
128
|
+
it("returns null when tmux command fails", () => {
|
|
129
|
+
mockExecSync.mockImplementation(() => {
|
|
130
|
+
throw new Error("no server running");
|
|
131
|
+
});
|
|
132
|
+
const pid = getTmuxPanePid("agentmesh-nonexistent");
|
|
133
|
+
expect(pid).toBeNull();
|
|
134
|
+
});
|
|
135
|
+
it("returns null when output is not a valid number", () => {
|
|
136
|
+
mockExecSync.mockReturnValue("not-a-pid\n");
|
|
137
|
+
const pid = getTmuxPanePid("agentmesh-test-agent");
|
|
138
|
+
expect(pid).toBeNull();
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
// ─── getProcessTree ────────────────────────────────────────────────────────────
|
|
142
|
+
describe("getProcessTree", () => {
|
|
143
|
+
beforeEach(() => {
|
|
144
|
+
vi.clearAllMocks();
|
|
145
|
+
});
|
|
146
|
+
it("returns direct children of a process", () => {
|
|
147
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
148
|
+
const c = cmd;
|
|
149
|
+
if (c.includes("pgrep -P 1000"))
|
|
150
|
+
return "1001\n1002\n";
|
|
151
|
+
return "";
|
|
152
|
+
});
|
|
153
|
+
const tree = getProcessTree(1000);
|
|
154
|
+
expect(tree).toContain(1001);
|
|
155
|
+
expect(tree).toContain(1002);
|
|
156
|
+
});
|
|
157
|
+
it("recursively includes grandchildren", () => {
|
|
158
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
159
|
+
const c = cmd;
|
|
160
|
+
if (c.includes("pgrep -P 1000"))
|
|
161
|
+
return "1001\n";
|
|
162
|
+
if (c.includes("pgrep -P 1001"))
|
|
163
|
+
return "1002\n";
|
|
164
|
+
return "";
|
|
165
|
+
});
|
|
166
|
+
const tree = getProcessTree(1000);
|
|
167
|
+
expect(tree).toContain(1001);
|
|
168
|
+
expect(tree).toContain(1002);
|
|
169
|
+
});
|
|
170
|
+
it("returns empty array when process has no children", () => {
|
|
171
|
+
mockExecSync.mockReturnValue("");
|
|
172
|
+
const tree = getProcessTree(9999);
|
|
173
|
+
expect(tree).toEqual([]);
|
|
174
|
+
});
|
|
175
|
+
it("returns empty array when pgrep fails", () => {
|
|
176
|
+
mockExecSync.mockImplementation(() => {
|
|
177
|
+
throw new Error("pgrep: no matching processes");
|
|
178
|
+
});
|
|
179
|
+
const tree = getProcessTree(9999);
|
|
180
|
+
expect(tree).toEqual([]);
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
// ─── captureAgentChildPids ─────────────────────────────────────────────────────
|
|
184
|
+
describe("captureAgentChildPids", () => {
|
|
185
|
+
beforeEach(() => {
|
|
186
|
+
vi.clearAllMocks();
|
|
187
|
+
});
|
|
188
|
+
it("returns empty array when tmux session has no pane PID", () => {
|
|
189
|
+
mockExecSync.mockImplementation(() => {
|
|
190
|
+
throw new Error("no server");
|
|
191
|
+
});
|
|
192
|
+
const pids = captureAgentChildPids("test-agent");
|
|
193
|
+
expect(pids).toEqual([]);
|
|
194
|
+
});
|
|
195
|
+
it("returns pane PID and all descendants", () => {
|
|
196
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
197
|
+
const c = cmd;
|
|
198
|
+
if (c.includes("list-panes"))
|
|
199
|
+
return "5000\n";
|
|
200
|
+
if (c.includes("pgrep -P 5000"))
|
|
201
|
+
return "5001\n5002\n";
|
|
202
|
+
return "";
|
|
203
|
+
});
|
|
204
|
+
const pids = captureAgentChildPids("test-agent");
|
|
205
|
+
expect(pids).toContain(5000);
|
|
206
|
+
expect(pids).toContain(5001);
|
|
207
|
+
expect(pids).toContain(5002);
|
|
208
|
+
});
|
|
209
|
+
it("deduplicates PIDs", () => {
|
|
210
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
211
|
+
const c = cmd;
|
|
212
|
+
if (c.includes("list-panes"))
|
|
213
|
+
return "5000\n";
|
|
214
|
+
if (c.includes("pgrep -P 5000"))
|
|
215
|
+
return "5001\n5001\n"; // duplicate
|
|
216
|
+
return "";
|
|
217
|
+
});
|
|
218
|
+
const pids = captureAgentChildPids("test-agent");
|
|
219
|
+
const uniquePids = [...new Set(pids)];
|
|
220
|
+
expect(pids.length).toBe(uniquePids.length);
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
// ─── destroySession with childPids ────────────────────────────────────────────
|
|
224
|
+
describe("destroySession with childPids", () => {
|
|
225
|
+
let killSpy;
|
|
226
|
+
beforeEach(() => {
|
|
227
|
+
killSpy = mockProcessKill(() => true);
|
|
228
|
+
vi.clearAllMocks();
|
|
229
|
+
});
|
|
230
|
+
afterEach(() => {
|
|
231
|
+
killSpy.mockRestore();
|
|
232
|
+
});
|
|
233
|
+
it("kills child PIDs before killing the tmux session", () => {
|
|
234
|
+
const callOrder = [];
|
|
235
|
+
const terminatedPids = new Set();
|
|
236
|
+
killSpy.mockImplementation((_pid, sig) => {
|
|
237
|
+
if (sig === "SIGTERM") {
|
|
238
|
+
callOrder.push(`kill-${_pid}`);
|
|
239
|
+
terminatedPids.add(_pid);
|
|
240
|
+
return true;
|
|
241
|
+
}
|
|
242
|
+
if (sig === 0) {
|
|
243
|
+
if (terminatedPids.has(_pid))
|
|
244
|
+
throw new Error("dead");
|
|
245
|
+
return true;
|
|
246
|
+
}
|
|
247
|
+
return true;
|
|
248
|
+
});
|
|
249
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
250
|
+
const c = cmd;
|
|
251
|
+
if (c.includes("has-session"))
|
|
252
|
+
return "";
|
|
253
|
+
if (c.includes("kill-session"))
|
|
254
|
+
callOrder.push("tmux-kill");
|
|
255
|
+
return "";
|
|
256
|
+
});
|
|
257
|
+
destroySession("test-agent", [1234, 5678]);
|
|
258
|
+
const childKillIndex = callOrder.findIndex((c) => c.startsWith("kill-"));
|
|
259
|
+
const tmuxKillIndex = callOrder.indexOf("tmux-kill");
|
|
260
|
+
expect(childKillIndex).toBeGreaterThanOrEqual(0);
|
|
261
|
+
expect(tmuxKillIndex).toBeGreaterThan(childKillIndex);
|
|
262
|
+
});
|
|
263
|
+
it("still destroys tmux session when no childPids provided", () => {
|
|
264
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
265
|
+
const c = cmd;
|
|
266
|
+
if (c.includes("has-session"))
|
|
267
|
+
return "";
|
|
268
|
+
return "";
|
|
269
|
+
});
|
|
270
|
+
destroySession("test-agent");
|
|
271
|
+
expect(mockExecSync).toHaveBeenCalledWith(expect.stringContaining("kill-session"));
|
|
272
|
+
expect(killSpy).not.toHaveBeenCalled();
|
|
273
|
+
});
|
|
274
|
+
it("still destroys tmux session when childPids is empty array", () => {
|
|
275
|
+
mockExecSync.mockImplementation((cmd) => {
|
|
276
|
+
const c = cmd;
|
|
277
|
+
if (c.includes("has-session"))
|
|
278
|
+
return "";
|
|
279
|
+
return "";
|
|
280
|
+
});
|
|
281
|
+
destroySession("test-agent", []);
|
|
282
|
+
expect(mockExecSync).toHaveBeenCalledWith(expect.stringContaining("kill-session"));
|
|
283
|
+
expect(killSpy).not.toHaveBeenCalled();
|
|
284
|
+
});
|
|
285
|
+
});
|
|
286
|
+
//# sourceMappingURL=orphan-process.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"orphan-process.test.js","sourceRoot":"","sources":["../../src/__tests__/orphan-process.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,11 @@ describe("Runner Module", () => {
|
|
|
12
12
|
expect(detectRunner("claude --some-flag")).toBe("claude");
|
|
13
13
|
expect(detectRunner("CLAUDE")).toBe("claude");
|
|
14
14
|
});
|
|
15
|
+
it("should detect codex runner", () => {
|
|
16
|
+
expect(detectRunner("codex")).toBe("codex");
|
|
17
|
+
expect(detectRunner("codex --some-flag")).toBe("codex");
|
|
18
|
+
expect(detectRunner("CODEX")).toBe("codex");
|
|
19
|
+
});
|
|
15
20
|
it("should detect custom runner for unknown commands", () => {
|
|
16
21
|
expect(detectRunner("aider")).toBe("custom");
|
|
17
22
|
expect(detectRunner("cursor")).toBe("custom");
|
|
@@ -75,11 +80,22 @@ describe("Runner Module", () => {
|
|
|
75
80
|
expect(config.model).toBe("gpt-4");
|
|
76
81
|
expect(Object.keys(config.env)).toHaveLength(0);
|
|
77
82
|
});
|
|
83
|
+
it("should build config for codex with CODEX_MODEL env", () => {
|
|
84
|
+
const config = buildRunnerConfig({
|
|
85
|
+
cliModel: "openai/gpt-5-codex",
|
|
86
|
+
defaultModel: "anthropic/claude-sonnet-4-5",
|
|
87
|
+
command: "codex",
|
|
88
|
+
});
|
|
89
|
+
expect(config.type).toBe("codex");
|
|
90
|
+
expect(config.model).toBe("openai/gpt-5-codex");
|
|
91
|
+
expect(config.env.CODEX_MODEL).toBe("openai/gpt-5-codex");
|
|
92
|
+
});
|
|
78
93
|
});
|
|
79
94
|
describe("getRunnerDisplayName", () => {
|
|
80
95
|
it("should return correct display names", () => {
|
|
81
96
|
expect(getRunnerDisplayName("opencode")).toBe("OpenCode");
|
|
82
97
|
expect(getRunnerDisplayName("claude")).toBe("Claude CLI");
|
|
98
|
+
expect(getRunnerDisplayName("codex")).toBe("Codex CLI");
|
|
83
99
|
expect(getRunnerDisplayName("custom")).toBe("Custom");
|
|
84
100
|
});
|
|
85
101
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.test.js","sourceRoot":"","sources":["../../src/__tests__/runner.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.test.js","sourceRoot":"","sources":["../../src/__tests__/runner.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared Resource Guards Tests
|
|
3
|
+
*
|
|
4
|
+
* Tests for workdir conflict detection, serve port collision detection,
|
|
5
|
+
* HQ workdir per-agent expansion, and servePort state persistence.
|
|
6
|
+
*/
|
|
7
|
+
import path from "node:path";
|
|
8
|
+
import { describe, expect, it } from "vitest";
|
|
9
|
+
// These tests exercise the guard logic used in daemon.ts without
|
|
10
|
+
// instantiating the full daemon. We replicate the inline checks.
|
|
11
|
+
describe("Workdir conflict guard", () => {
|
|
12
|
+
function findWorkdirConflict(agents, agentName, workdir, isRunning) {
|
|
13
|
+
const resolvedWorkdir = path.resolve(workdir);
|
|
14
|
+
return agents.find((a) => a.name !== agentName &&
|
|
15
|
+
a.workdir &&
|
|
16
|
+
path.resolve(a.workdir) === resolvedWorkdir &&
|
|
17
|
+
a.pid > 0 &&
|
|
18
|
+
isRunning(a.pid));
|
|
19
|
+
}
|
|
20
|
+
it("detects conflict when another running agent uses same workdir", () => {
|
|
21
|
+
const agents = [
|
|
22
|
+
{
|
|
23
|
+
name: "agent-1",
|
|
24
|
+
agentId: "id-1",
|
|
25
|
+
pid: 1001,
|
|
26
|
+
tmuxSession: "s1",
|
|
27
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
28
|
+
workdir: "/Users/dev/project",
|
|
29
|
+
},
|
|
30
|
+
];
|
|
31
|
+
const conflict = findWorkdirConflict(agents, "agent-2", "/Users/dev/project", () => true);
|
|
32
|
+
expect(conflict).toBeDefined();
|
|
33
|
+
expect(conflict.name).toBe("agent-1");
|
|
34
|
+
});
|
|
35
|
+
it("no conflict when same agent name (self-check)", () => {
|
|
36
|
+
const agents = [
|
|
37
|
+
{
|
|
38
|
+
name: "agent-1",
|
|
39
|
+
agentId: "id-1",
|
|
40
|
+
pid: 1001,
|
|
41
|
+
tmuxSession: "s1",
|
|
42
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
43
|
+
workdir: "/Users/dev/project",
|
|
44
|
+
},
|
|
45
|
+
];
|
|
46
|
+
const conflict = findWorkdirConflict(agents, "agent-1", "/Users/dev/project", () => true);
|
|
47
|
+
expect(conflict).toBeUndefined();
|
|
48
|
+
});
|
|
49
|
+
it("no conflict when other agent process is dead", () => {
|
|
50
|
+
const agents = [
|
|
51
|
+
{
|
|
52
|
+
name: "agent-1",
|
|
53
|
+
agentId: "id-1",
|
|
54
|
+
pid: 1001,
|
|
55
|
+
tmuxSession: "s1",
|
|
56
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
57
|
+
workdir: "/Users/dev/project",
|
|
58
|
+
},
|
|
59
|
+
];
|
|
60
|
+
const conflict = findWorkdirConflict(agents, "agent-2", "/Users/dev/project", () => false);
|
|
61
|
+
expect(conflict).toBeUndefined();
|
|
62
|
+
});
|
|
63
|
+
it("no conflict when workdirs differ", () => {
|
|
64
|
+
const agents = [
|
|
65
|
+
{
|
|
66
|
+
name: "agent-1",
|
|
67
|
+
agentId: "id-1",
|
|
68
|
+
pid: 1001,
|
|
69
|
+
tmuxSession: "s1",
|
|
70
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
71
|
+
workdir: "/Users/dev/project-agent-1",
|
|
72
|
+
},
|
|
73
|
+
];
|
|
74
|
+
const conflict = findWorkdirConflict(agents, "agent-2", "/Users/dev/project-agent-2", () => true);
|
|
75
|
+
expect(conflict).toBeUndefined();
|
|
76
|
+
});
|
|
77
|
+
it("no conflict when other agent has no workdir", () => {
|
|
78
|
+
const agents = [
|
|
79
|
+
{
|
|
80
|
+
name: "agent-1",
|
|
81
|
+
agentId: "id-1",
|
|
82
|
+
pid: 1001,
|
|
83
|
+
tmuxSession: "s1",
|
|
84
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
85
|
+
},
|
|
86
|
+
];
|
|
87
|
+
const conflict = findWorkdirConflict(agents, "agent-2", "/Users/dev/project", () => true);
|
|
88
|
+
expect(conflict).toBeUndefined();
|
|
89
|
+
});
|
|
90
|
+
it("resolves relative paths correctly", () => {
|
|
91
|
+
const agents = [
|
|
92
|
+
{
|
|
93
|
+
name: "agent-1",
|
|
94
|
+
agentId: "id-1",
|
|
95
|
+
pid: 1001,
|
|
96
|
+
tmuxSession: "s1",
|
|
97
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
98
|
+
workdir: path.resolve("./project"),
|
|
99
|
+
},
|
|
100
|
+
];
|
|
101
|
+
const conflict = findWorkdirConflict(agents, "agent-2", "./project", () => true);
|
|
102
|
+
expect(conflict).toBeDefined();
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
describe("Serve port collision guard", () => {
|
|
106
|
+
function findPortConflict(agents, agentName, servePort, isRunning) {
|
|
107
|
+
return agents.find((a) => a.name !== agentName &&
|
|
108
|
+
a.servePort === servePort &&
|
|
109
|
+
a.pid > 0 &&
|
|
110
|
+
isRunning(a.pid));
|
|
111
|
+
}
|
|
112
|
+
it("detects port collision with running agent", () => {
|
|
113
|
+
const agents = [
|
|
114
|
+
{
|
|
115
|
+
name: "serve-agent-1",
|
|
116
|
+
agentId: "id-1",
|
|
117
|
+
pid: 2001,
|
|
118
|
+
tmuxSession: "serve:3001",
|
|
119
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
120
|
+
servePort: 3001,
|
|
121
|
+
},
|
|
122
|
+
];
|
|
123
|
+
const conflict = findPortConflict(agents, "serve-agent-2", 3001, () => true);
|
|
124
|
+
expect(conflict).toBeDefined();
|
|
125
|
+
expect(conflict.name).toBe("serve-agent-1");
|
|
126
|
+
});
|
|
127
|
+
it("no collision when same agent (self-check)", () => {
|
|
128
|
+
const agents = [
|
|
129
|
+
{
|
|
130
|
+
name: "serve-agent-1",
|
|
131
|
+
agentId: "id-1",
|
|
132
|
+
pid: 2001,
|
|
133
|
+
tmuxSession: "serve:3001",
|
|
134
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
135
|
+
servePort: 3001,
|
|
136
|
+
},
|
|
137
|
+
];
|
|
138
|
+
const conflict = findPortConflict(agents, "serve-agent-1", 3001, () => true);
|
|
139
|
+
expect(conflict).toBeUndefined();
|
|
140
|
+
});
|
|
141
|
+
it("no collision when other agent process is dead", () => {
|
|
142
|
+
const agents = [
|
|
143
|
+
{
|
|
144
|
+
name: "serve-agent-1",
|
|
145
|
+
agentId: "id-1",
|
|
146
|
+
pid: 2001,
|
|
147
|
+
tmuxSession: "serve:3001",
|
|
148
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
149
|
+
servePort: 3001,
|
|
150
|
+
},
|
|
151
|
+
];
|
|
152
|
+
const conflict = findPortConflict(agents, "serve-agent-2", 3001, () => false);
|
|
153
|
+
expect(conflict).toBeUndefined();
|
|
154
|
+
});
|
|
155
|
+
it("no collision when ports differ", () => {
|
|
156
|
+
const agents = [
|
|
157
|
+
{
|
|
158
|
+
name: "serve-agent-1",
|
|
159
|
+
agentId: "id-1",
|
|
160
|
+
pid: 2001,
|
|
161
|
+
tmuxSession: "serve:3001",
|
|
162
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
163
|
+
servePort: 3001,
|
|
164
|
+
},
|
|
165
|
+
];
|
|
166
|
+
const conflict = findPortConflict(agents, "serve-agent-2", 3002, () => true);
|
|
167
|
+
expect(conflict).toBeUndefined();
|
|
168
|
+
});
|
|
169
|
+
it("no collision when other agent has no servePort", () => {
|
|
170
|
+
const agents = [
|
|
171
|
+
{
|
|
172
|
+
name: "tmux-agent",
|
|
173
|
+
agentId: "id-1",
|
|
174
|
+
pid: 2001,
|
|
175
|
+
tmuxSession: "agentmesh-tmux-agent",
|
|
176
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
177
|
+
},
|
|
178
|
+
];
|
|
179
|
+
const conflict = findPortConflict(agents, "serve-agent-2", 3001, () => true);
|
|
180
|
+
expect(conflict).toBeUndefined();
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
describe("HQ workdir per-agent expansion", () => {
|
|
184
|
+
it("appends agent name as sibling directory", () => {
|
|
185
|
+
const baseWorkdir = "/Users/raju/Dev/agentmesh";
|
|
186
|
+
const agentName = "atlas-dev-1";
|
|
187
|
+
const uniqueWorkdir = path.join(path.dirname(baseWorkdir), `${path.basename(baseWorkdir)}-${agentName}`);
|
|
188
|
+
expect(uniqueWorkdir).toBe("/Users/raju/Dev/agentmesh-atlas-dev-1");
|
|
189
|
+
});
|
|
190
|
+
it("produces unique paths for different agents", () => {
|
|
191
|
+
const baseWorkdir = "/Users/raju/Dev/agentmesh";
|
|
192
|
+
const workdir1 = path.join(path.dirname(baseWorkdir), `${path.basename(baseWorkdir)}-agent-1`);
|
|
193
|
+
const workdir2 = path.join(path.dirname(baseWorkdir), `${path.basename(baseWorkdir)}-agent-2`);
|
|
194
|
+
expect(workdir1).not.toBe(workdir2);
|
|
195
|
+
expect(workdir1).toBe("/Users/raju/Dev/agentmesh-agent-1");
|
|
196
|
+
expect(workdir2).toBe("/Users/raju/Dev/agentmesh-agent-2");
|
|
197
|
+
});
|
|
198
|
+
it("handles nested paths correctly", () => {
|
|
199
|
+
const baseWorkdir = "/home/user/projects/my-app";
|
|
200
|
+
const agentName = "worker";
|
|
201
|
+
const uniqueWorkdir = path.join(path.dirname(baseWorkdir), `${path.basename(baseWorkdir)}-${agentName}`);
|
|
202
|
+
expect(uniqueWorkdir).toBe("/home/user/projects/my-app-worker");
|
|
203
|
+
});
|
|
204
|
+
it("handles trailing slash in base workdir", () => {
|
|
205
|
+
// path.basename and path.dirname handle trailing slashes correctly on POSIX
|
|
206
|
+
const baseWorkdir = "/Users/raju/Dev/agentmesh";
|
|
207
|
+
const agentName = "test";
|
|
208
|
+
const uniqueWorkdir = path.join(path.dirname(baseWorkdir), `${path.basename(baseWorkdir)}-${agentName}`);
|
|
209
|
+
expect(uniqueWorkdir).toBe("/Users/raju/Dev/agentmesh-test");
|
|
210
|
+
});
|
|
211
|
+
});
|
|
212
|
+
describe("servePort in AgentState", () => {
|
|
213
|
+
it("servePort field is included in state", () => {
|
|
214
|
+
const agent = {
|
|
215
|
+
name: "serve-agent",
|
|
216
|
+
agentId: "id-1",
|
|
217
|
+
pid: 3001,
|
|
218
|
+
tmuxSession: "serve:3001",
|
|
219
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
220
|
+
servePort: 3001,
|
|
221
|
+
};
|
|
222
|
+
expect(agent.servePort).toBe(3001);
|
|
223
|
+
});
|
|
224
|
+
it("servePort is optional (undefined for tmux agents)", () => {
|
|
225
|
+
const agent = {
|
|
226
|
+
name: "tmux-agent",
|
|
227
|
+
agentId: "id-2",
|
|
228
|
+
pid: 4001,
|
|
229
|
+
tmuxSession: "agentmesh-tmux-agent",
|
|
230
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
231
|
+
};
|
|
232
|
+
expect(agent.servePort).toBeUndefined();
|
|
233
|
+
});
|
|
234
|
+
it("servePort serializes correctly in state JSON", () => {
|
|
235
|
+
const state = {
|
|
236
|
+
agents: [
|
|
237
|
+
{
|
|
238
|
+
name: "serve-agent",
|
|
239
|
+
agentId: "id-1",
|
|
240
|
+
pid: 3001,
|
|
241
|
+
tmuxSession: "serve:3001",
|
|
242
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
243
|
+
servePort: 3001,
|
|
244
|
+
},
|
|
245
|
+
{
|
|
246
|
+
name: "tmux-agent",
|
|
247
|
+
agentId: "id-2",
|
|
248
|
+
pid: 4001,
|
|
249
|
+
tmuxSession: "agentmesh-tmux",
|
|
250
|
+
startedAt: "2024-01-01T00:00:00Z",
|
|
251
|
+
},
|
|
252
|
+
],
|
|
253
|
+
};
|
|
254
|
+
const json = JSON.stringify(state);
|
|
255
|
+
const parsed = JSON.parse(json);
|
|
256
|
+
expect(parsed.agents[0].servePort).toBe(3001);
|
|
257
|
+
expect(parsed.agents[1].servePort).toBeUndefined();
|
|
258
|
+
});
|
|
259
|
+
});
|
|
260
|
+
//# sourceMappingURL=shared-resource-guards.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-resource-guards.test.js","sourceRoot":"","sources":["../../src/__tests__/shared-resource-guards.test.ts"],"names":[],"mappings":"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"}
|