@prestyj/cli 4.3.205 → 4.3.209
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/cli.js +48 -33
- package/dist/cli.js.map +1 -1
- package/dist/core/compaction/compactor.d.ts.map +1 -1
- package/dist/core/compaction/compactor.js +6 -0
- package/dist/core/compaction/compactor.js.map +1 -1
- package/dist/core/compaction/compactor.test.js +16 -0
- package/dist/core/compaction/compactor.test.js.map +1 -1
- package/dist/core/goal-controller.d.ts +57 -0
- package/dist/core/goal-controller.d.ts.map +1 -0
- package/dist/core/goal-controller.js +285 -0
- package/dist/core/goal-controller.js.map +1 -0
- package/dist/core/goal-controller.test.d.ts +2 -0
- package/dist/core/goal-controller.test.d.ts.map +1 -0
- package/dist/core/goal-controller.test.js +419 -0
- package/dist/core/goal-controller.test.js.map +1 -0
- package/dist/core/goal-lifecycle-smoke.test.d.ts +2 -0
- package/dist/core/goal-lifecycle-smoke.test.d.ts.map +1 -0
- package/dist/core/goal-lifecycle-smoke.test.js +207 -0
- package/dist/core/goal-lifecycle-smoke.test.js.map +1 -0
- package/dist/core/goal-store.d.ts +164 -0
- package/dist/core/goal-store.d.ts.map +1 -0
- package/dist/core/goal-store.js +721 -0
- package/dist/core/goal-store.js.map +1 -0
- package/dist/core/goal-store.test.d.ts +2 -0
- package/dist/core/goal-store.test.d.ts.map +1 -0
- package/dist/core/goal-store.test.js +341 -0
- package/dist/core/goal-store.test.js.map +1 -0
- package/dist/core/goal-verifier.d.ts +17 -0
- package/dist/core/goal-verifier.d.ts.map +1 -0
- package/dist/core/goal-verifier.js +84 -0
- package/dist/core/goal-verifier.js.map +1 -0
- package/dist/core/goal-verifier.test.d.ts +2 -0
- package/dist/core/goal-verifier.test.d.ts.map +1 -0
- package/dist/core/goal-verifier.test.js +88 -0
- package/dist/core/goal-verifier.test.js.map +1 -0
- package/dist/core/goal-worker-dev-server-lifecycle.test.d.ts +2 -0
- package/dist/core/goal-worker-dev-server-lifecycle.test.d.ts.map +1 -0
- package/dist/core/goal-worker-dev-server-lifecycle.test.js +68 -0
- package/dist/core/goal-worker-dev-server-lifecycle.test.js.map +1 -0
- package/dist/core/goal-worker.d.ts +51 -0
- package/dist/core/goal-worker.d.ts.map +1 -0
- package/dist/core/goal-worker.js +339 -0
- package/dist/core/goal-worker.js.map +1 -0
- package/dist/core/goal-worker.test.d.ts +2 -0
- package/dist/core/goal-worker.test.d.ts.map +1 -0
- package/dist/core/goal-worker.test.js +224 -0
- package/dist/core/goal-worker.test.js.map +1 -0
- package/dist/core/model-registry.test.js +51 -1
- package/dist/core/model-registry.test.js.map +1 -1
- package/dist/core/process-manager-dev-server-repro.test.d.ts +2 -0
- package/dist/core/process-manager-dev-server-repro.test.d.ts.map +1 -0
- package/dist/core/process-manager-dev-server-repro.test.js +136 -0
- package/dist/core/process-manager-dev-server-repro.test.js.map +1 -0
- package/dist/core/process-manager.d.ts +9 -0
- package/dist/core/process-manager.d.ts.map +1 -1
- package/dist/core/process-manager.js +22 -8
- package/dist/core/process-manager.js.map +1 -1
- package/dist/core/prompt-commands.d.ts.map +1 -1
- package/dist/core/prompt-commands.js +52 -0
- package/dist/core/prompt-commands.js.map +1 -1
- package/dist/core/prompt-commands.test.js +24 -0
- package/dist/core/prompt-commands.test.js.map +1 -1
- package/dist/core/repomap.js +8 -1
- package/dist/core/repomap.js.map +1 -1
- package/dist/core/repomap.test.js +32 -0
- package/dist/core/repomap.test.js.map +1 -1
- package/dist/interactive.d.ts.map +1 -1
- package/dist/interactive.js +20 -11
- package/dist/interactive.js.map +1 -1
- package/dist/system-prompt.d.ts.map +1 -1
- package/dist/system-prompt.js +18 -40
- package/dist/system-prompt.js.map +1 -1
- package/dist/system-prompt.test.js +124 -1
- package/dist/system-prompt.test.js.map +1 -1
- package/dist/tools/bash.d.ts.map +1 -1
- package/dist/tools/bash.js +2 -51
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/edit-diff.d.ts.map +1 -1
- package/dist/tools/edit-diff.js +71 -32
- package/dist/tools/edit-diff.js.map +1 -1
- package/dist/tools/edit-diff.test.js +14 -0
- package/dist/tools/edit-diff.test.js.map +1 -1
- package/dist/tools/edit.d.ts.map +1 -1
- package/dist/tools/edit.js +38 -18
- package/dist/tools/edit.js.map +1 -1
- package/dist/tools/edit.test.js +56 -6
- package/dist/tools/edit.test.js.map +1 -1
- package/dist/tools/goals.d.ts +110 -0
- package/dist/tools/goals.d.ts.map +1 -0
- package/dist/tools/goals.js +500 -0
- package/dist/tools/goals.js.map +1 -0
- package/dist/tools/goals.test.d.ts +2 -0
- package/dist/tools/goals.test.d.ts.map +1 -0
- package/dist/tools/goals.test.js +431 -0
- package/dist/tools/goals.test.js.map +1 -0
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +22 -5
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/grep.test.d.ts +2 -0
- package/dist/tools/grep.test.d.ts.map +1 -0
- package/dist/tools/grep.test.js +20 -0
- package/dist/tools/grep.test.js.map +1 -0
- package/dist/tools/index.d.ts +1 -0
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +3 -0
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/safe-env.d.ts +2 -0
- package/dist/tools/safe-env.d.ts.map +1 -0
- package/dist/tools/safe-env.js +52 -0
- package/dist/tools/safe-env.js.map +1 -0
- package/dist/tools/source-path.js +1 -1
- package/dist/tools/web-fetch.d.ts +5 -0
- package/dist/tools/web-fetch.d.ts.map +1 -1
- package/dist/tools/web-fetch.js +12 -1
- package/dist/tools/web-fetch.js.map +1 -1
- package/dist/tools/web-fetch.test.js +9 -0
- package/dist/tools/web-fetch.test.js.map +1 -1
- package/dist/ui/App.d.ts +73 -4
- package/dist/ui/App.d.ts.map +1 -1
- package/dist/ui/App.js +1087 -184
- package/dist/ui/App.js.map +1 -1
- package/dist/ui/app-state-persistence.test.d.ts +2 -0
- package/dist/ui/app-state-persistence.test.d.ts.map +1 -0
- package/dist/ui/app-state-persistence.test.js +186 -0
- package/dist/ui/app-state-persistence.test.js.map +1 -0
- package/dist/ui/components/BackgroundTasksBar.d.ts +16 -1
- package/dist/ui/components/BackgroundTasksBar.d.ts.map +1 -1
- package/dist/ui/components/BackgroundTasksBar.js +15 -2
- package/dist/ui/components/BackgroundTasksBar.js.map +1 -1
- package/dist/ui/components/Banner.d.ts +2 -1
- package/dist/ui/components/Banner.d.ts.map +1 -1
- package/dist/ui/components/Banner.js +3 -3
- package/dist/ui/components/Banner.js.map +1 -1
- package/dist/ui/components/GoalOverlay.d.ts +74 -0
- package/dist/ui/components/GoalOverlay.d.ts.map +1 -0
- package/dist/ui/components/GoalOverlay.js +675 -0
- package/dist/ui/components/GoalOverlay.js.map +1 -0
- package/dist/ui/components/GoalStatusBar.d.ts +24 -0
- package/dist/ui/components/GoalStatusBar.d.ts.map +1 -0
- package/dist/ui/components/GoalStatusBar.js +113 -0
- package/dist/ui/components/GoalStatusBar.js.map +1 -0
- package/dist/ui/components/InputArea.d.ts +2 -1
- package/dist/ui/components/InputArea.d.ts.map +1 -1
- package/dist/ui/components/InputArea.js +44 -2
- package/dist/ui/components/InputArea.js.map +1 -1
- package/dist/ui/components/InputArea.test.d.ts +2 -0
- package/dist/ui/components/InputArea.test.d.ts.map +1 -0
- package/dist/ui/components/InputArea.test.js +79 -0
- package/dist/ui/components/InputArea.test.js.map +1 -0
- package/dist/ui/components/ToolExecution.d.ts.map +1 -1
- package/dist/ui/components/ToolExecution.js +27 -2
- package/dist/ui/components/ToolExecution.js.map +1 -1
- package/dist/ui/footer-status-layout.test.d.ts +2 -0
- package/dist/ui/footer-status-layout.test.d.ts.map +1 -0
- package/dist/ui/footer-status-layout.test.js +56 -0
- package/dist/ui/footer-status-layout.test.js.map +1 -0
- package/dist/ui/goal-events.d.ts +107 -0
- package/dist/ui/goal-events.d.ts.map +1 -0
- package/dist/ui/goal-events.js +323 -0
- package/dist/ui/goal-events.js.map +1 -0
- package/dist/ui/goal-events.test.d.ts +2 -0
- package/dist/ui/goal-events.test.d.ts.map +1 -0
- package/dist/ui/goal-events.test.js +312 -0
- package/dist/ui/goal-events.test.js.map +1 -0
- package/dist/ui/goal-overlay.test.d.ts +2 -0
- package/dist/ui/goal-overlay.test.d.ts.map +1 -0
- package/dist/ui/goal-overlay.test.js +306 -0
- package/dist/ui/goal-overlay.test.js.map +1 -0
- package/dist/ui/goal-status-bar.test.d.ts +2 -0
- package/dist/ui/goal-status-bar.test.d.ts.map +1 -0
- package/dist/ui/goal-status-bar.test.js +143 -0
- package/dist/ui/goal-status-bar.test.js.map +1 -0
- package/dist/ui/hooks/useAgentLoop.d.ts +3 -1
- package/dist/ui/hooks/useAgentLoop.d.ts.map +1 -1
- package/dist/ui/hooks/useAgentLoop.js +10 -2
- package/dist/ui/hooks/useAgentLoop.js.map +1 -1
- package/dist/ui/live-item-flush.test.js +48 -0
- package/dist/ui/live-item-flush.test.js.map +1 -1
- package/dist/ui/render.d.ts +18 -4
- package/dist/ui/render.d.ts.map +1 -1
- package/dist/ui/render.js +13 -3
- package/dist/ui/render.js.map +1 -1
- package/dist/ui/scroll-stabilization.test.d.ts +2 -0
- package/dist/ui/scroll-stabilization.test.d.ts.map +1 -0
- package/dist/ui/scroll-stabilization.test.js +70 -0
- package/dist/ui/scroll-stabilization.test.js.map +1 -0
- package/dist/ui/slash-command-images.test.d.ts +2 -0
- package/dist/ui/slash-command-images.test.d.ts.map +1 -0
- package/dist/ui/slash-command-images.test.js +57 -0
- package/dist/ui/slash-command-images.test.js.map +1 -0
- package/package.json +6 -5
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { EventEmitter } from "node:events";
|
|
3
|
+
import { PassThrough } from "node:stream";
|
|
4
|
+
import fs from "node:fs/promises";
|
|
5
|
+
import os from "node:os";
|
|
6
|
+
import path from "node:path";
|
|
7
|
+
import { getGoalRun, updateGoalTask, upsertGoalRun } from "./goal-store.js";
|
|
8
|
+
const spawnMock = vi.hoisted(() => vi.fn());
|
|
9
|
+
const killProcessTreeMock = vi.hoisted(() => vi.fn());
|
|
10
|
+
vi.mock("node:child_process", () => ({ spawn: spawnMock }));
|
|
11
|
+
vi.mock("../utils/process.js", () => ({ killProcessTree: killProcessTreeMock }));
|
|
12
|
+
class FakeChild extends EventEmitter {
|
|
13
|
+
stdout = new PassThrough();
|
|
14
|
+
stderr = new PassThrough();
|
|
15
|
+
pid = 4242;
|
|
16
|
+
kill = vi.fn();
|
|
17
|
+
}
|
|
18
|
+
let tmpBase;
|
|
19
|
+
let tmpProject;
|
|
20
|
+
let child;
|
|
21
|
+
async function flushUntil(assertion) {
|
|
22
|
+
let lastError;
|
|
23
|
+
for (let i = 0; i < 50; i += 1) {
|
|
24
|
+
await new Promise((resolve) => setTimeout(resolve, 1));
|
|
25
|
+
try {
|
|
26
|
+
await assertion();
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
catch (error) {
|
|
30
|
+
lastError = error;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
throw lastError;
|
|
34
|
+
}
|
|
35
|
+
async function seedGoal() {
|
|
36
|
+
await upsertGoalRun(tmpProject, {
|
|
37
|
+
id: "goal-a",
|
|
38
|
+
title: "Worker harness",
|
|
39
|
+
goal: "Exercise worker exits",
|
|
40
|
+
status: "ready",
|
|
41
|
+
successCriteria: ["worker covered"],
|
|
42
|
+
prerequisites: [],
|
|
43
|
+
harness: [],
|
|
44
|
+
tasks: [],
|
|
45
|
+
evidence: [],
|
|
46
|
+
blockers: [],
|
|
47
|
+
});
|
|
48
|
+
await updateGoalTask(tmpProject, "goal-a", "task-a", {
|
|
49
|
+
id: "task-a",
|
|
50
|
+
title: "Run worker",
|
|
51
|
+
prompt: "Do work",
|
|
52
|
+
status: "pending",
|
|
53
|
+
attempts: 0,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
async function start(onComplete = vi.fn()) {
|
|
57
|
+
const mod = await import("./goal-worker.js");
|
|
58
|
+
const record = await mod.startGoalWorker({
|
|
59
|
+
cwd: tmpProject,
|
|
60
|
+
provider: "anthropic",
|
|
61
|
+
model: "claude-test",
|
|
62
|
+
goalRunId: "goal-a",
|
|
63
|
+
goalTaskId: "task-a",
|
|
64
|
+
prompt: "Do deterministic work",
|
|
65
|
+
onComplete,
|
|
66
|
+
});
|
|
67
|
+
return { mod, record, onComplete };
|
|
68
|
+
}
|
|
69
|
+
beforeEach(async () => {
|
|
70
|
+
tmpBase = await fs.mkdtemp(path.join(os.tmpdir(), "goal-worker-test-base-"));
|
|
71
|
+
tmpProject = await fs.mkdtemp(path.join(os.tmpdir(), "goal-worker-test-project-"));
|
|
72
|
+
process.env.GG_GOALS_BASE = tmpBase;
|
|
73
|
+
child = new FakeChild();
|
|
74
|
+
spawnMock.mockReturnValue(child);
|
|
75
|
+
killProcessTreeMock.mockReset();
|
|
76
|
+
process.argv[1] = "/tmp/fake-ezcoder-cli.js";
|
|
77
|
+
await seedGoal();
|
|
78
|
+
});
|
|
79
|
+
afterEach(async () => {
|
|
80
|
+
const mod = await import("./goal-worker.js");
|
|
81
|
+
mod.shutdownGoalWorkers(tmpProject);
|
|
82
|
+
vi.clearAllMocks();
|
|
83
|
+
delete process.env.GG_GOALS_BASE;
|
|
84
|
+
await fs.rm(tmpBase, { recursive: true, force: true });
|
|
85
|
+
await fs.rm(tmpProject, { recursive: true, force: true });
|
|
86
|
+
});
|
|
87
|
+
describe("goal worker failure propagation", () => {
|
|
88
|
+
it("prompts workers with explicit durable Goal context before claiming verification", async () => {
|
|
89
|
+
await start();
|
|
90
|
+
const args = spawnMock.mock.calls[0]?.[1];
|
|
91
|
+
const systemPromptIndex = args.indexOf("--system-prompt") + 1;
|
|
92
|
+
const prompt = args[systemPromptIndex];
|
|
93
|
+
expect(prompt).toContain(`cwd=${tmpProject}`);
|
|
94
|
+
expect(prompt).toContain("run_id=goal-a");
|
|
95
|
+
expect(prompt).toContain("task_id=task-a");
|
|
96
|
+
expect(prompt).toContain("create needed scripts/fixtures/harnesses");
|
|
97
|
+
expect(prompt).toContain("source_path/docs/kencode real-code research when relevant");
|
|
98
|
+
expect(prompt).toContain("command/file evidence");
|
|
99
|
+
expect(prompt).toContain('goals({ action: "evidence" | "task", run_id: "goal-a", task_id: "task-a"');
|
|
100
|
+
});
|
|
101
|
+
it("exports a testable worker system prompt/context helper", async () => {
|
|
102
|
+
const mod = await import("./goal-worker.js");
|
|
103
|
+
const prompt = mod.buildGoalWorkerSystemPrompt({
|
|
104
|
+
cwd: "/repo",
|
|
105
|
+
goalRunId: "goal-123",
|
|
106
|
+
goalTaskId: "task-456",
|
|
107
|
+
taskTitle: "Implement typed handoff",
|
|
108
|
+
});
|
|
109
|
+
expect(prompt).toContain("cwd=/repo");
|
|
110
|
+
expect(prompt).toContain("run_id=goal-123");
|
|
111
|
+
expect(prompt).toContain("task_id=task-456");
|
|
112
|
+
expect(prompt).toContain("Implement typed handoff");
|
|
113
|
+
expect(prompt).toContain("Do not mark the whole goal complete");
|
|
114
|
+
});
|
|
115
|
+
it("marks the task done, persists evidence, and notifies callbacks/subscribers for worker success", async () => {
|
|
116
|
+
const { mod, record, onComplete } = await start();
|
|
117
|
+
const listener = vi.fn();
|
|
118
|
+
const unsubscribe = mod.subscribeGoalWorkerCompletions(listener, tmpProject);
|
|
119
|
+
child.stdout.write(JSON.stringify({ type: "text_delta", text: "implemented" }) + "\n");
|
|
120
|
+
child.stdout.write(JSON.stringify({
|
|
121
|
+
type: "tool_call_start",
|
|
122
|
+
toolCallId: "tool-a",
|
|
123
|
+
name: "bash",
|
|
124
|
+
args: { command: "pnpm test" },
|
|
125
|
+
}) + "\n");
|
|
126
|
+
child.stdout.write(JSON.stringify({ type: "tool_call_end", toolCallId: "tool-a", isError: false }) + "\n");
|
|
127
|
+
child.emit("close", 0);
|
|
128
|
+
await flushUntil(() => expect(onComplete).toHaveBeenCalled());
|
|
129
|
+
const run = await getGoalRun(tmpProject, "goal-a");
|
|
130
|
+
expect(record.status).toBe("done");
|
|
131
|
+
expect(run?.activeWorkerId).toBeUndefined();
|
|
132
|
+
expect(run?.tasks[0]).toMatchObject({
|
|
133
|
+
status: "done",
|
|
134
|
+
workerId: record.id,
|
|
135
|
+
lastSummary: expect.stringContaining("implemented"),
|
|
136
|
+
});
|
|
137
|
+
expect(run?.evidence.some((item) => item.label === `Worker ${record.id} done` && item.content?.includes("implemented"))).toBe(true);
|
|
138
|
+
expect(onComplete).toHaveBeenCalledWith(expect.objectContaining({
|
|
139
|
+
status: "done",
|
|
140
|
+
exitCode: 0,
|
|
141
|
+
toolsUsed: [{ name: "bash", ok: true }],
|
|
142
|
+
}));
|
|
143
|
+
expect(listener).toHaveBeenCalledWith(expect.objectContaining({
|
|
144
|
+
worker: expect.objectContaining({ id: record.id, goalRunId: "goal-a" }),
|
|
145
|
+
status: "done",
|
|
146
|
+
exitCode: 0,
|
|
147
|
+
}));
|
|
148
|
+
unsubscribe();
|
|
149
|
+
});
|
|
150
|
+
it("replays a pending completion to the next subscriber after a remount gap", async () => {
|
|
151
|
+
const { mod, record } = await start();
|
|
152
|
+
child.stdout.write(JSON.stringify({ type: "text_delta", text: "finished during remount" }) + "\n");
|
|
153
|
+
child.emit("close", 0);
|
|
154
|
+
await flushUntil(() => expect(record.status).toBe("done"));
|
|
155
|
+
const listener = vi.fn();
|
|
156
|
+
const unsubscribe = mod.subscribeGoalWorkerCompletions(listener, tmpProject);
|
|
157
|
+
await flushUntil(() => expect(listener).toHaveBeenCalledWith(expect.objectContaining({
|
|
158
|
+
worker: expect.objectContaining({ id: record.id, cwd: tmpProject }),
|
|
159
|
+
summary: expect.stringContaining("finished during remount"),
|
|
160
|
+
status: "done",
|
|
161
|
+
})));
|
|
162
|
+
unsubscribe();
|
|
163
|
+
});
|
|
164
|
+
it("marks the task failed and persists stderr evidence for worker non-zero exit", async () => {
|
|
165
|
+
const { record, onComplete } = await start();
|
|
166
|
+
child.stderr.write("boom from stderr");
|
|
167
|
+
child.emit("close", 1);
|
|
168
|
+
await flushUntil(() => expect(onComplete).toHaveBeenCalled());
|
|
169
|
+
const run = await getGoalRun(tmpProject, "goal-a");
|
|
170
|
+
expect(record.status).toBe("failed");
|
|
171
|
+
expect(run?.tasks[0]).toMatchObject({
|
|
172
|
+
status: "failed",
|
|
173
|
+
workerId: record.id,
|
|
174
|
+
lastSummary: expect.stringContaining("boom from stderr"),
|
|
175
|
+
});
|
|
176
|
+
expect(run?.evidence.some((item) => item.label === `Worker ${record.id} failed` && item.content?.includes("boom"))).toBe(true);
|
|
177
|
+
expect(onComplete).toHaveBeenCalledWith(expect.objectContaining({ status: "failed", exitCode: 1 }));
|
|
178
|
+
});
|
|
179
|
+
it("records spawn crashes as failed task evidence and notifies the orchestrator continuation path", async () => {
|
|
180
|
+
const { mod, record, onComplete } = await start();
|
|
181
|
+
const listener = vi.fn();
|
|
182
|
+
const unsubscribe = mod.subscribeGoalWorkerCompletions(listener, tmpProject);
|
|
183
|
+
child.emit("error", new Error("spawn exploded"));
|
|
184
|
+
await flushUntil(async () => {
|
|
185
|
+
const next = await getGoalRun(tmpProject, "goal-a");
|
|
186
|
+
expect(next?.tasks[0]?.status).toBe("failed");
|
|
187
|
+
expect(next?.evidence.some((item) => item.label === `Worker ${record.id} spawn failed`)).toBe(true);
|
|
188
|
+
expect(onComplete).toHaveBeenCalled();
|
|
189
|
+
});
|
|
190
|
+
const run = await getGoalRun(tmpProject, "goal-a");
|
|
191
|
+
expect(record.status).toBe("failed");
|
|
192
|
+
expect(run?.tasks[0]).toMatchObject({
|
|
193
|
+
status: "failed",
|
|
194
|
+
lastSummary: "Failed to spawn Goal worker: spawn exploded",
|
|
195
|
+
});
|
|
196
|
+
expect(run?.evidence.some((item) => item.label === `Worker ${record.id} spawn failed` && item.content === "spawn exploded")).toBe(true);
|
|
197
|
+
expect(onComplete).toHaveBeenCalledWith(expect.objectContaining({ status: "failed", exitCode: 1, reason: "spawn_error" }));
|
|
198
|
+
expect(listener).toHaveBeenCalledWith(expect.objectContaining({
|
|
199
|
+
worker: expect.objectContaining({ id: record.id, cwd: tmpProject }),
|
|
200
|
+
status: "failed",
|
|
201
|
+
exitCode: 1,
|
|
202
|
+
reason: "spawn_error",
|
|
203
|
+
}));
|
|
204
|
+
unsubscribe();
|
|
205
|
+
});
|
|
206
|
+
it("manual stop blocks the task, clears the active worker, and ignores later close completion", async () => {
|
|
207
|
+
const { mod, record, onComplete } = await start();
|
|
208
|
+
const result = await mod.stopGoalWorker(record.id);
|
|
209
|
+
child.emit("close", 0);
|
|
210
|
+
await flushUntil(() => expect(record.status).toBe("stopped"));
|
|
211
|
+
const run = await getGoalRun(tmpProject, "goal-a");
|
|
212
|
+
expect(result).toBe(`Goal worker ${record.id} stopped.`);
|
|
213
|
+
expect(record.status).toBe("stopped");
|
|
214
|
+
expect(killProcessTreeMock).toHaveBeenCalledWith(4242);
|
|
215
|
+
expect(run?.activeWorkerId).toBeUndefined();
|
|
216
|
+
expect(run?.tasks[0]).toMatchObject({
|
|
217
|
+
status: "blocked",
|
|
218
|
+
lastSummary: "Worker stopped by user.",
|
|
219
|
+
});
|
|
220
|
+
expect(run?.evidence.some((item) => item.kind === "summary" && item.label === `Worker ${record.id} stopped`)).toBe(true);
|
|
221
|
+
expect(onComplete).not.toHaveBeenCalled();
|
|
222
|
+
});
|
|
223
|
+
});
|
|
224
|
+
//# sourceMappingURL=goal-worker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"goal-worker.test.js","sourceRoot":"","sources":["../../src/core/goal-worker.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,55 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { getContextWindow, getDefaultModel, getModelsForProvider, usesOpenAICodexTransport, } from "./model-registry.js";
|
|
2
|
+
import { MODELS, getContextWindow, getDefaultModel, getModelsForProvider, usesOpenAICodexTransport, } from "./model-registry.js";
|
|
3
|
+
const PROVIDERS = [
|
|
4
|
+
"anthropic",
|
|
5
|
+
"openai",
|
|
6
|
+
"gemini",
|
|
7
|
+
"moonshot",
|
|
8
|
+
"glm",
|
|
9
|
+
"minimax",
|
|
10
|
+
"xiaomi",
|
|
11
|
+
"deepseek",
|
|
12
|
+
"openrouter",
|
|
13
|
+
];
|
|
14
|
+
const THINKING_LEVELS = ["low", "medium", "high", "xhigh"];
|
|
15
|
+
const COST_TIERS = ["low", "medium", "high"];
|
|
16
|
+
describe("model registry invariants", () => {
|
|
17
|
+
it("has unique ids and coherent required metadata for every entry", () => {
|
|
18
|
+
const ids = new Set();
|
|
19
|
+
for (const model of MODELS) {
|
|
20
|
+
expect(ids.has(model.id), `${model.id} is duplicated`).toBe(false);
|
|
21
|
+
ids.add(model.id);
|
|
22
|
+
expect(model.id, `${model.id} id`).toEqual(expect.any(String));
|
|
23
|
+
expect(model.name, `${model.id} name`).toEqual(expect.any(String));
|
|
24
|
+
expect(PROVIDERS, `${model.id} provider`).toContain(model.provider);
|
|
25
|
+
expect(model.contextWindow, `${model.id} contextWindow`).toBeGreaterThan(0);
|
|
26
|
+
expect(Number.isInteger(model.contextWindow), `${model.id} contextWindow integer`).toBe(true);
|
|
27
|
+
expect(model.maxOutputTokens, `${model.id} maxOutputTokens`).toBeGreaterThan(0);
|
|
28
|
+
expect(Number.isInteger(model.maxOutputTokens), `${model.id} maxOutputTokens integer`).toBe(true);
|
|
29
|
+
expect(model.maxOutputTokens, `${model.id} maxOutputTokens <= contextWindow`).toBeLessThanOrEqual(model.contextWindow);
|
|
30
|
+
expect(typeof model.supportsThinking, `${model.id} supportsThinking`).toBe("boolean");
|
|
31
|
+
expect(typeof model.supportsImages, `${model.id} supportsImages`).toBe("boolean");
|
|
32
|
+
expect(COST_TIERS, `${model.id} costTier`).toContain(model.costTier);
|
|
33
|
+
expect(THINKING_LEVELS, `${model.id} maxThinkingLevel`).toContain(model.maxThinkingLevel);
|
|
34
|
+
if (!model.supportsThinking) {
|
|
35
|
+
expect(model.maxThinkingLevel, `${model.id} non-thinking max level`).toBe("low");
|
|
36
|
+
}
|
|
37
|
+
if (model.codexContextWindow !== undefined) {
|
|
38
|
+
expect(model.provider, `${model.id} codexContextWindow provider`).toBe("openai");
|
|
39
|
+
expect(model.codexContextWindow, `${model.id} codexContextWindow`).toBeGreaterThan(0);
|
|
40
|
+
expect(Number.isInteger(model.codexContextWindow), `${model.id} codexContextWindow integer`).toBe(true);
|
|
41
|
+
expect(model.codexContextWindow, `${model.id} codexContextWindow <= contextWindow`).toBeLessThanOrEqual(model.contextWindow);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
it("returns a registered default model for every provider", () => {
|
|
46
|
+
for (const provider of PROVIDERS) {
|
|
47
|
+
const defaultModel = getDefaultModel(provider);
|
|
48
|
+
expect(defaultModel.provider, `${provider} default provider`).toBe(provider);
|
|
49
|
+
expect(MODELS, `${provider} default registered`).toContain(defaultModel);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
});
|
|
3
53
|
describe("model registry context windows", () => {
|
|
4
54
|
it("uses the public API context window for OpenAI API-key requests", () => {
|
|
5
55
|
expect(getContextWindow("gpt-5.5", { provider: "openai" })).toBe(1_050_000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-registry.test.js","sourceRoot":"","sources":["../../src/core/model-registry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACpB,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAE7B,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,QAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;QAEvE,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,wBAAwB,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/F,MAAM,CACJ,gBAAgB,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CACxF,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC;YAC9C,EAAE,EAAE,+BAA+B;YACnC,IAAI,EAAE,+BAA+B;YACrC,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACtE,+BAA+B;YAC/B,kBAAkB;SACnB,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CACpF,SAAS,CACV,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"model-registry.test.js","sourceRoot":"","sources":["../../src/core/model-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-manager-dev-server-repro.test.d.ts","sourceRoot":"","sources":["../../src/core/process-manager-dev-server-repro.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { ProcessManager } from "./process-manager.js";
|
|
6
|
+
async function waitForOutput(manager, id, predicate) {
|
|
7
|
+
let combined = "";
|
|
8
|
+
for (let i = 0; i < 50; i += 1) {
|
|
9
|
+
const result = await manager.readOutput(id);
|
|
10
|
+
combined += result.output;
|
|
11
|
+
if (predicate(combined))
|
|
12
|
+
return combined;
|
|
13
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
14
|
+
}
|
|
15
|
+
throw new Error(`Timed out waiting for output. Saw:\n${combined}`);
|
|
16
|
+
}
|
|
17
|
+
async function waitForProcessExit(pid) {
|
|
18
|
+
for (let i = 0; i < 50; i += 1) {
|
|
19
|
+
if (!isProcessAlive(pid))
|
|
20
|
+
return;
|
|
21
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
22
|
+
}
|
|
23
|
+
throw new Error(`Process ${pid} was still alive after shutdown.`);
|
|
24
|
+
}
|
|
25
|
+
function isProcessAlive(pid) {
|
|
26
|
+
try {
|
|
27
|
+
process.kill(pid, 0);
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
function parseGrandchildPid(output) {
|
|
35
|
+
const match = output.match(/GRANDCHILD_READY (\d+)/);
|
|
36
|
+
if (!match)
|
|
37
|
+
throw new Error(`No grandchild pid in output:\n${output}`);
|
|
38
|
+
return Number(match[1]);
|
|
39
|
+
}
|
|
40
|
+
describe("ProcessManager dev-server lifecycle repro", () => {
|
|
41
|
+
let manager;
|
|
42
|
+
afterEach(() => {
|
|
43
|
+
manager?.shutdownAll();
|
|
44
|
+
});
|
|
45
|
+
it("scrubs unsafe inherited environment for background commands", async () => {
|
|
46
|
+
const oldSecret = process.env.GG_TEST_SHOULD_NOT_LEAK;
|
|
47
|
+
process.env.GG_TEST_SHOULD_NOT_LEAK = "super-secret";
|
|
48
|
+
manager = new ProcessManager();
|
|
49
|
+
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "gg-bg-env-"));
|
|
50
|
+
try {
|
|
51
|
+
const started = await manager.start(`${JSON.stringify(process.execPath)} -e "console.log(process.env.GG_TEST_SHOULD_NOT_LEAK || 'scrubbed')"`, tmpDir);
|
|
52
|
+
const output = await waitForOutput(manager, started.id, (text) => text.includes("scrubbed"));
|
|
53
|
+
expect(output).toContain("scrubbed");
|
|
54
|
+
expect(output).not.toContain("super-secret");
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
if (oldSecret === undefined)
|
|
58
|
+
delete process.env.GG_TEST_SHOULD_NOT_LEAK;
|
|
59
|
+
else
|
|
60
|
+
process.env.GG_TEST_SHOULD_NOT_LEAK = oldSecret;
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
it("uses taskkill for Windows process-tree shutdown fallback", async () => {
|
|
64
|
+
const taskkill = vi.fn();
|
|
65
|
+
manager = new ProcessManager({
|
|
66
|
+
platform: "win32",
|
|
67
|
+
kill: vi.fn(() => {
|
|
68
|
+
throw new Error("force fallback");
|
|
69
|
+
}),
|
|
70
|
+
spawnSync: taskkill,
|
|
71
|
+
});
|
|
72
|
+
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "gg-win-taskkill-"));
|
|
73
|
+
const started = await manager.start(`${JSON.stringify(process.execPath)} -e "setInterval(()=>{},1000)"`, tmpDir);
|
|
74
|
+
const stopped = await manager.stop(started.id);
|
|
75
|
+
expect(stopped).toBe(`Process ${started.id} already exited`);
|
|
76
|
+
manager.shutdownAll();
|
|
77
|
+
expect(taskkill).toHaveBeenCalledWith("taskkill", ["/pid", String(started.pid), "/T", "/F"], {
|
|
78
|
+
stdio: "ignore",
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
it("starts, reads, and stops a long-running Node HTTP server through the worker background path", async () => {
|
|
82
|
+
manager = new ProcessManager();
|
|
83
|
+
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "gg-dev-server-repro-"));
|
|
84
|
+
const fixture = path.join(tmpDir, "dev-server.mjs");
|
|
85
|
+
await fs.writeFile(fixture, `import http from 'node:http';\n` +
|
|
86
|
+
`const server = http.createServer((_req, res) => res.end('ok'));\n` +
|
|
87
|
+
`server.listen(0, '127.0.0.1', () => {\n` +
|
|
88
|
+
` const address = server.address();\n` +
|
|
89
|
+
` console.log('DEV_SERVER_READY ' + address.port);\n` +
|
|
90
|
+
`});\n` +
|
|
91
|
+
`const interval = setInterval(() => console.log('DEV_SERVER_TICK'), 250);\n` +
|
|
92
|
+
`process.on('SIGTERM', () => {\n` +
|
|
93
|
+
` console.log('DEV_SERVER_SIGTERM');\n` +
|
|
94
|
+
` clearInterval(interval);\n` +
|
|
95
|
+
` server.close(() => process.exit(0));\n` +
|
|
96
|
+
`});\n`);
|
|
97
|
+
const started = await manager.start(`${process.execPath} ${fixture}`, tmpDir);
|
|
98
|
+
expect(started.pid).toBeGreaterThan(0);
|
|
99
|
+
expect(started.logFile).toMatch(/\.log$/);
|
|
100
|
+
const initial = await waitForOutput(manager, started.id, (output) => output.includes("DEV_SERVER_READY"));
|
|
101
|
+
expect(initial).toContain("DEV_SERVER_READY");
|
|
102
|
+
const fromStart = await manager.readOutput(started.id, true);
|
|
103
|
+
expect(fromStart.isRunning).toBe(true);
|
|
104
|
+
expect(fromStart.exitCode).toBeNull();
|
|
105
|
+
expect(fromStart.output).toContain("DEV_SERVER_READY");
|
|
106
|
+
const stopped = await manager.stop(started.id);
|
|
107
|
+
expect(stopped).toBe(`Process ${started.id} stopped`);
|
|
108
|
+
const final = await manager.readOutput(started.id, true);
|
|
109
|
+
expect(final.isRunning).toBe(false);
|
|
110
|
+
expect(final.exitCode).not.toBeNull();
|
|
111
|
+
expect(final.output).toContain("DEV_SERVER_SIGTERM");
|
|
112
|
+
}, 15_000);
|
|
113
|
+
const posixIt = process.platform === "win32" ? it.skip : it;
|
|
114
|
+
posixIt("kills the whole detached process group on POSIX/WSL shutdown", async () => {
|
|
115
|
+
manager = new ProcessManager();
|
|
116
|
+
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "gg-posix-process-group-"));
|
|
117
|
+
const childFixture = path.join(tmpDir, "grandchild.mjs");
|
|
118
|
+
const parentFixture = path.join(tmpDir, "parent.mjs");
|
|
119
|
+
await fs.writeFile(childFixture, `console.log('GRANDCHILD_READY ' + process.pid);\n` + `setInterval(() => {}, 1000);\n`);
|
|
120
|
+
await fs.writeFile(parentFixture, `import { spawn } from 'node:child_process';\n` +
|
|
121
|
+
`const child = spawn(process.execPath, [${JSON.stringify(childFixture)}], { stdio: ['ignore', 'inherit', 'inherit'] });\n` +
|
|
122
|
+
`console.log('PARENT_READY ' + process.pid + ' child=' + child.pid);\n` +
|
|
123
|
+
`setInterval(() => {}, 1000);\n`);
|
|
124
|
+
const started = await manager.start(`${JSON.stringify(process.execPath)} ${JSON.stringify(parentFixture)}`, tmpDir);
|
|
125
|
+
const output = await waitForOutput(manager, started.id, (text) => text.includes("GRANDCHILD_READY"));
|
|
126
|
+
const grandchildPid = parseGrandchildPid(output);
|
|
127
|
+
expect(isProcessAlive(grandchildPid)).toBe(true);
|
|
128
|
+
manager.shutdownAll();
|
|
129
|
+
await waitForProcessExit(grandchildPid);
|
|
130
|
+
const final = await manager.readOutput(started.id, true);
|
|
131
|
+
expect(final.isRunning).toBe(false);
|
|
132
|
+
expect(final.output).toContain("PARENT_READY");
|
|
133
|
+
expect(final.output).toContain("GRANDCHILD_READY");
|
|
134
|
+
}, 15_000);
|
|
135
|
+
});
|
|
136
|
+
//# sourceMappingURL=process-manager-dev-server-repro.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-manager-dev-server-repro.test.js","sourceRoot":"","sources":["../../src/core/process-manager-dev-server-repro.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { spawnSync } from "node:child_process";
|
|
1
2
|
export interface BackgroundProcess {
|
|
2
3
|
id: string;
|
|
3
4
|
pid: number;
|
|
@@ -18,9 +19,17 @@ export interface ReadOutputResult {
|
|
|
18
19
|
exitCode: number | null;
|
|
19
20
|
output: string;
|
|
20
21
|
}
|
|
22
|
+
export interface ProcessManagerOps {
|
|
23
|
+
platform?: NodeJS.Platform;
|
|
24
|
+
kill?: typeof process.kill;
|
|
25
|
+
killProcessTree?: (pid: number) => void;
|
|
26
|
+
spawnSync?: typeof spawnSync;
|
|
27
|
+
}
|
|
21
28
|
export declare class ProcessManager {
|
|
29
|
+
private readonly ops;
|
|
22
30
|
private processes;
|
|
23
31
|
private children;
|
|
32
|
+
constructor(ops?: ProcessManagerOps);
|
|
24
33
|
start(command: string, cwd: string): Promise<StartResult>;
|
|
25
34
|
readOutput(id: string, fromStart?: boolean): Promise<ReadOutputResult>;
|
|
26
35
|
stop(id: string): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-manager.d.ts","sourceRoot":"","sources":["../../src/core/process-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-manager.d.ts","sourceRoot":"","sources":["../../src/core/process-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAAqB,MAAM,oBAAoB,CAAC;AASzE,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,OAAO,CAAC,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;CAC9B;AAYD,qBAAa,cAAc;IAIb,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHhC,OAAO,CAAC,SAAS,CAAwC;IACzD,OAAO,CAAC,QAAQ,CAAmC;gBAEtB,GAAG,GAAE,iBAAsB;IAElD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAwCzD,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAgCtE,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoCvC,IAAI,IAAI,iBAAiB,EAAE;IAW3B,WAAW,IAAI,IAAI;CASpB"}
|
|
@@ -1,14 +1,28 @@
|
|
|
1
|
-
import { spawn } from "node:child_process";
|
|
1
|
+
import { spawn, spawnSync } from "node:child_process";
|
|
2
2
|
import fs from "node:fs";
|
|
3
3
|
import fsp from "node:fs/promises";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import os from "node:os";
|
|
6
6
|
import crypto from "node:crypto";
|
|
7
7
|
import { killProcessTree } from "../utils/process.js";
|
|
8
|
+
import { getSafeToolEnv } from "../tools/safe-env.js";
|
|
8
9
|
const BG_DIR = path.join(os.homedir(), ".ezcoder", "bg");
|
|
10
|
+
function stopProcessTree(pid, ops = {}) {
|
|
11
|
+
if ((ops.platform ?? process.platform) === "win32") {
|
|
12
|
+
(ops.spawnSync ?? spawnSync)("taskkill", ["/pid", String(pid), "/T", "/F"], {
|
|
13
|
+
stdio: "ignore",
|
|
14
|
+
});
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
(ops.killProcessTree ?? killProcessTree)(pid);
|
|
18
|
+
}
|
|
9
19
|
export class ProcessManager {
|
|
20
|
+
ops;
|
|
10
21
|
processes = new Map();
|
|
11
22
|
children = new Map();
|
|
23
|
+
constructor(ops = {}) {
|
|
24
|
+
this.ops = ops;
|
|
25
|
+
}
|
|
12
26
|
async start(command, cwd) {
|
|
13
27
|
await fsp.mkdir(BG_DIR, { recursive: true });
|
|
14
28
|
const id = crypto.randomUUID().slice(0, 8);
|
|
@@ -18,7 +32,7 @@ export class ProcessManager {
|
|
|
18
32
|
cwd,
|
|
19
33
|
detached: true,
|
|
20
34
|
stdio: ["ignore", fd, fd],
|
|
21
|
-
env:
|
|
35
|
+
env: getSafeToolEnv(),
|
|
22
36
|
});
|
|
23
37
|
fs.closeSync(fd);
|
|
24
38
|
const pid = child.pid;
|
|
@@ -79,11 +93,11 @@ export class ProcessManager {
|
|
|
79
93
|
}
|
|
80
94
|
// SIGTERM first
|
|
81
95
|
try {
|
|
82
|
-
process.kill(-proc.pid, "SIGTERM");
|
|
96
|
+
(this.ops.kill ?? process.kill)(-proc.pid, "SIGTERM");
|
|
83
97
|
}
|
|
84
98
|
catch {
|
|
85
99
|
try {
|
|
86
|
-
process.kill(proc.pid, "SIGTERM");
|
|
100
|
+
(this.ops.kill ?? process.kill)(proc.pid, "SIGTERM");
|
|
87
101
|
}
|
|
88
102
|
catch {
|
|
89
103
|
return `Process ${id} already exited`;
|
|
@@ -98,7 +112,7 @@ export class ProcessManager {
|
|
|
98
112
|
});
|
|
99
113
|
});
|
|
100
114
|
if (!exited) {
|
|
101
|
-
|
|
115
|
+
stopProcessTree(proc.pid, this.ops);
|
|
102
116
|
}
|
|
103
117
|
return `Process ${id} stopped`;
|
|
104
118
|
}
|
|
@@ -115,11 +129,11 @@ export class ProcessManager {
|
|
|
115
129
|
shutdownAll() {
|
|
116
130
|
for (const [id, proc] of this.processes) {
|
|
117
131
|
if (this.children.has(id)) {
|
|
118
|
-
|
|
132
|
+
stopProcessTree(proc.pid, this.ops);
|
|
133
|
+
proc.exitCode = proc.exitCode ?? 1;
|
|
134
|
+
this.children.delete(id);
|
|
119
135
|
}
|
|
120
136
|
}
|
|
121
|
-
this.processes.clear();
|
|
122
|
-
this.children.clear();
|
|
123
137
|
}
|
|
124
138
|
}
|
|
125
139
|
//# sourceMappingURL=process-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-manager.js","sourceRoot":"","sources":["../../src/core/process-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-manager.js","sourceRoot":"","sources":["../../src/core/process-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-commands.d.ts","sourceRoot":"","sources":["../../src/core/prompt-commands.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,eAAe,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"prompt-commands.d.ts","sourceRoot":"","sources":["../../src/core/prompt-commands.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,eAAe,EAAE,aAAa,EA+5C1C,CAAC;AAEF,gDAAgD;AAChD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAExE"}
|