@agentteams/runner 0.0.84-dev.208 → 0.0.85
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/api-client.d.ts +2 -2
- package/dist/api-client.js +66 -66
- package/dist/api-client.js.map +1 -1
- package/dist/api-client.test.js +54 -63
- package/dist/api-client.test.js.map +1 -1
- package/dist/autostart.js +81 -81
- package/dist/autostart.js.map +1 -1
- package/dist/autostart.test.js +35 -35
- package/dist/autostart.test.js.map +1 -1
- package/dist/commands/cleanup.js +4 -4
- package/dist/commands/init.js +14 -14
- package/dist/commands/restart.js +3 -3
- package/dist/commands/start.js +10 -10
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/status.js +7 -7
- package/dist/commands/stop.js +7 -7
- package/dist/commands/uninstall.js +6 -6
- package/dist/commands/update.d.ts +4 -4
- package/dist/commands/update.js +22 -20
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/update.test.js +42 -38
- package/dist/commands/update.test.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.js +12 -12
- package/dist/config.test.js +61 -61
- package/dist/config.test.js.map +1 -1
- package/dist/daemon-control.d.ts +5 -5
- package/dist/daemon-control.js +22 -21
- package/dist/daemon-control.js.map +1 -1
- package/dist/daemon-control.test.js +29 -29
- package/dist/executable.d.ts +3 -3
- package/dist/executable.js +49 -46
- package/dist/executable.js.map +1 -1
- package/dist/executable.test.js +62 -62
- package/dist/executable.test.js.map +1 -1
- package/dist/handlers/trigger-handler.d.ts +6 -6
- package/dist/handlers/trigger-handler.js +124 -118
- package/dist/handlers/trigger-handler.js.map +1 -1
- package/dist/handlers/trigger-handler.test.js +365 -373
- package/dist/handlers/trigger-handler.test.js.map +1 -1
- package/dist/index.js +25 -25
- package/dist/logger.js +1 -1
- package/dist/pid.js +6 -6
- package/dist/poller.d.ts +7 -7
- package/dist/poller.js +53 -54
- package/dist/poller.js.map +1 -1
- package/dist/poller.test.js +181 -209
- package/dist/poller.test.js.map +1 -1
- package/dist/runners/amp.d.ts +1 -1
- package/dist/runners/amp.js +81 -74
- package/dist/runners/amp.js.map +1 -1
- package/dist/runners/antigravity.d.ts +3 -3
- package/dist/runners/antigravity.js +127 -116
- package/dist/runners/antigravity.js.map +1 -1
- package/dist/runners/antigravity.replay.test.js +25 -25
- package/dist/runners/antigravity.replay.test.js.map +1 -1
- package/dist/runners/antigravity.test.js +98 -98
- package/dist/runners/antigravity.test.js.map +1 -1
- package/dist/runners/claude-code.d.ts +1 -1
- package/dist/runners/claude-code.js +84 -85
- package/dist/runners/claude-code.js.map +1 -1
- package/dist/runners/claude-code.test.js +40 -37
- package/dist/runners/claude-code.test.js.map +1 -1
- package/dist/runners/codex.d.ts +1 -1
- package/dist/runners/codex.js +96 -87
- package/dist/runners/codex.js.map +1 -1
- package/dist/runners/codex.test.js +68 -68
- package/dist/runners/codex.test.js.map +1 -1
- package/dist/runners/index.d.ts +1 -1
- package/dist/runners/index.js +10 -10
- package/dist/runners/index.test.js +16 -16
- package/dist/runners/log-reporter.d.ts +2 -2
- package/dist/runners/log-reporter.js +10 -10
- package/dist/runners/log-reporter.test.js +70 -70
- package/dist/runners/log-reporter.test.js.map +1 -1
- package/dist/runners/opencode.d.ts +1 -1
- package/dist/runners/opencode.js +75 -68
- package/dist/runners/opencode.js.map +1 -1
- package/dist/runners/process-control.d.ts +1 -1
- package/dist/runners/process-control.js +11 -13
- package/dist/runners/process-control.js.map +1 -1
- package/dist/runners/stream-json-parser.d.ts +1 -1
- package/dist/runners/stream-json-parser.js +67 -70
- package/dist/runners/stream-json-parser.js.map +1 -1
- package/dist/runners/stream-json-parser.replay.test.js +17 -17
- package/dist/runners/stream-json-parser.replay.test.js.map +1 -1
- package/dist/runners/stream-json-parser.test.js +78 -76
- package/dist/runners/stream-json-parser.test.js.map +1 -1
- package/dist/types.d.ts +4 -4
- package/dist/utils/auth-path-store.js +7 -7
- package/dist/utils/auth-path-store.test.js +29 -24
- package/dist/utils/auth-path-store.test.js.map +1 -1
- package/dist/utils/auto-update.d.ts +4 -4
- package/dist/utils/auto-update.js +28 -30
- package/dist/utils/auto-update.js.map +1 -1
- package/dist/utils/auto-update.test.js +30 -30
- package/dist/utils/convention-evaluator.d.ts +1 -1
- package/dist/utils/convention-evaluator.js +21 -22
- package/dist/utils/convention-evaluator.js.map +1 -1
- package/dist/utils/convention-evaluator.test.js +110 -120
- package/dist/utils/convention-evaluator.test.js.map +1 -1
- package/dist/utils/convention-sync.d.ts +3 -3
- package/dist/utils/convention-sync.js +10 -10
- package/dist/utils/convention-sync.test.js +25 -39
- package/dist/utils/convention-sync.test.js.map +1 -1
- package/dist/utils/git-worktree.js +18 -20
- package/dist/utils/git-worktree.js.map +1 -1
- package/dist/utils/git-worktree.test.js +98 -98
- package/dist/utils/git-worktree.test.js.map +1 -1
- package/dist/utils/origin-issue-safeguard.js +30 -35
- package/dist/utils/origin-issue-safeguard.js.map +1 -1
- package/dist/utils/power-save-blocker.d.ts +4 -4
- package/dist/utils/power-save-blocker.js +33 -33
- package/dist/utils/power-save-blocker.test.js +37 -37
- package/dist/utils/power-save-blocker.test.js.map +1 -1
- package/dist/utils/runner-cleanup.d.ts +3 -3
- package/dist/utils/runner-cleanup.js +13 -13
- package/dist/utils/runner-cleanup.test.js +35 -35
- package/dist/utils/runner-history.js +3 -3
- package/dist/utils/runner-history.test.js +17 -17
- package/package.json +1 -4
- package/readme.md +10 -10
package/dist/runners/opencode.js
CHANGED
|
@@ -1,29 +1,29 @@
|
|
|
1
|
-
import { createWriteStream } from
|
|
2
|
-
import { spawn } from
|
|
3
|
-
import { mkdir } from
|
|
4
|
-
import { platform } from
|
|
5
|
-
import { dirname, join } from
|
|
6
|
-
import { describeExecutableResolution, resolveExecutablePathWithPreference, spawnExecutable } from
|
|
7
|
-
import { logger } from
|
|
8
|
-
import { setupCloseWatchdog, terminateRunnerChild } from
|
|
1
|
+
import { createWriteStream } from "node:fs";
|
|
2
|
+
import { spawn } from "node:child_process";
|
|
3
|
+
import { mkdir } from "node:fs/promises";
|
|
4
|
+
import { platform } from "node:os";
|
|
5
|
+
import { dirname, join } from "node:path";
|
|
6
|
+
import { describeExecutableResolution, resolveExecutablePathWithPreference, spawnExecutable } from "../executable.js";
|
|
7
|
+
import { logger } from "../logger.js";
|
|
8
|
+
import { setupCloseWatchdog, terminateRunnerChild } from "./process-control.js";
|
|
9
9
|
const PROMPT_PREVIEW_MAX = 500;
|
|
10
10
|
const OUTPUT_PREVIEW_MAX = 400;
|
|
11
11
|
const OUTPUT_CAPTURE_MAX = 200_000;
|
|
12
12
|
const toPowerShellEncodedCommand = (resolvedExecutablePath, prompt, model) => {
|
|
13
|
-
const modelSegment = model ? ` '--model' '${model.replaceAll("'", "''")}'` :
|
|
13
|
+
const modelSegment = model ? ` '--model' '${model.replaceAll("'", "''")}'` : "";
|
|
14
14
|
const scriptContent = [
|
|
15
15
|
"$ErrorActionPreference = 'Stop'",
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
"$utf8NoBom = [System.Text.UTF8Encoding]::new($false)",
|
|
17
|
+
"[Console]::InputEncoding = $utf8NoBom",
|
|
18
|
+
"[Console]::OutputEncoding = $utf8NoBom",
|
|
19
|
+
"$OutputEncoding = $utf8NoBom",
|
|
20
|
+
"chcp 65001 > $null",
|
|
21
21
|
`$promptText = @'`,
|
|
22
22
|
`${prompt.replaceAll("'@", "'@")}`,
|
|
23
23
|
`'@`,
|
|
24
|
-
`$promptText | & '${resolvedExecutablePath.replaceAll("'", "''")}' 'run'${modelSegment}
|
|
25
|
-
].join(
|
|
26
|
-
return Buffer.from(scriptContent,
|
|
24
|
+
`$promptText | & '${resolvedExecutablePath.replaceAll("'", "''")}' 'run'${modelSegment}`
|
|
25
|
+
].join("\r\n");
|
|
26
|
+
return Buffer.from(scriptContent, "utf16le").toString("base64");
|
|
27
27
|
};
|
|
28
28
|
const toPromptPreview = (prompt) => {
|
|
29
29
|
if (prompt.length <= PROMPT_PREVIEW_MAX) {
|
|
@@ -32,7 +32,7 @@ const toPromptPreview = (prompt) => {
|
|
|
32
32
|
return `${prompt.slice(0, PROMPT_PREVIEW_MAX)}...`;
|
|
33
33
|
};
|
|
34
34
|
const toOutputPreview = (chunk) => {
|
|
35
|
-
const text = (typeof chunk ===
|
|
35
|
+
const text = (typeof chunk === "string" ? chunk : String(chunk)).trim();
|
|
36
36
|
if (text.length <= OUTPUT_PREVIEW_MAX) {
|
|
37
37
|
return text;
|
|
38
38
|
}
|
|
@@ -40,21 +40,21 @@ const toOutputPreview = (chunk) => {
|
|
|
40
40
|
};
|
|
41
41
|
export class OpenCodeRunner {
|
|
42
42
|
runnerCmd;
|
|
43
|
-
constructor(runnerCmd =
|
|
43
|
+
constructor(runnerCmd = "opencode") {
|
|
44
44
|
this.runnerCmd = runnerCmd;
|
|
45
45
|
}
|
|
46
46
|
async run(opts) {
|
|
47
47
|
if (!opts.authPath || opts.authPath.trim().length === 0) {
|
|
48
|
-
logger.error(
|
|
48
|
+
logger.error("authPath is missing for trigger");
|
|
49
49
|
return {
|
|
50
50
|
exitCode: 1,
|
|
51
|
-
errorMessage:
|
|
51
|
+
errorMessage: "authPath is missing for trigger"
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
const cwd = opts.authPath;
|
|
55
|
-
const logPath = join(cwd,
|
|
55
|
+
const logPath = join(cwd, ".agentteams", "runner", "log", `${opts.triggerId}.log`);
|
|
56
56
|
await mkdir(dirname(logPath), { recursive: true });
|
|
57
|
-
const isWindows = platform() ===
|
|
57
|
+
const isWindows = platform() === "win32";
|
|
58
58
|
const resolvedExecutablePath = isWindows
|
|
59
59
|
? resolveExecutablePathWithPreference(this.runnerCmd, [`${this.runnerCmd}.cmd`, this.runnerCmd])
|
|
60
60
|
: resolveExecutablePathWithPreference(this.runnerCmd, [this.runnerCmd]);
|
|
@@ -62,9 +62,9 @@ export class OpenCodeRunner {
|
|
|
62
62
|
? toPowerShellEncodedCommand(resolvedExecutablePath, opts.prompt, opts.model)
|
|
63
63
|
: null;
|
|
64
64
|
const executableInfo = describeExecutableResolution(this.runnerCmd, {
|
|
65
|
-
platform: () => (isWindows ?
|
|
65
|
+
platform: () => (isWindows ? "win32" : platform())
|
|
66
66
|
});
|
|
67
|
-
logger.info(
|
|
67
|
+
logger.info("Runner prompt", {
|
|
68
68
|
triggerId: opts.triggerId,
|
|
69
69
|
promptLength: opts.prompt.length,
|
|
70
70
|
promptPreview: toPromptPreview(opts.prompt),
|
|
@@ -73,47 +73,54 @@ export class OpenCodeRunner {
|
|
|
73
73
|
platform: executableInfo.platform,
|
|
74
74
|
shell: executableInfo.shell,
|
|
75
75
|
detached: isWindows ? false : true,
|
|
76
|
-
windowsWrapper: isWindows ?
|
|
76
|
+
windowsWrapper: isWindows ? "powershell.exe -EncodedCommand" : null
|
|
77
77
|
});
|
|
78
|
-
const modelArgs = opts.model ? [
|
|
78
|
+
const modelArgs = opts.model ? ["--model", opts.model] : [];
|
|
79
79
|
const child = isWindows
|
|
80
|
-
? spawn(
|
|
80
|
+
? spawn("powershell.exe", [
|
|
81
|
+
"-NoLogo",
|
|
82
|
+
"-NonInteractive",
|
|
83
|
+
"-ExecutionPolicy",
|
|
84
|
+
"Bypass",
|
|
85
|
+
"-EncodedCommand",
|
|
86
|
+
windowsEncodedCommand ?? ""
|
|
87
|
+
], {
|
|
81
88
|
cwd,
|
|
82
89
|
detached: false,
|
|
83
90
|
shell: false,
|
|
84
91
|
windowsHide: true,
|
|
85
|
-
stdio: [
|
|
92
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
86
93
|
env: {
|
|
87
94
|
...process.env,
|
|
88
95
|
AGENTTEAMS_API_KEY: opts.apiKey,
|
|
89
96
|
AGENTTEAMS_API_URL: opts.apiUrl,
|
|
90
97
|
AGENTTEAMS_TEAM_ID: opts.teamId,
|
|
91
98
|
AGENTTEAMS_PROJECT_ID: opts.projectId,
|
|
92
|
-
AGENTTEAMS_AGENT_NAME: opts.agentConfigId
|
|
93
|
-
}
|
|
99
|
+
AGENTTEAMS_AGENT_NAME: opts.agentConfigId
|
|
100
|
+
}
|
|
94
101
|
})
|
|
95
|
-
: spawnExecutable(this.runnerCmd, [
|
|
102
|
+
: spawnExecutable(this.runnerCmd, ["run", ...modelArgs, opts.prompt], {
|
|
96
103
|
cwd,
|
|
97
104
|
detached: true,
|
|
98
|
-
stdio: [
|
|
105
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
99
106
|
env: {
|
|
100
107
|
...process.env,
|
|
101
108
|
AGENTTEAMS_API_KEY: opts.apiKey,
|
|
102
109
|
AGENTTEAMS_API_URL: opts.apiUrl,
|
|
103
110
|
AGENTTEAMS_TEAM_ID: opts.teamId,
|
|
104
111
|
AGENTTEAMS_PROJECT_ID: opts.projectId,
|
|
105
|
-
AGENTTEAMS_AGENT_NAME: opts.agentConfigId
|
|
106
|
-
}
|
|
112
|
+
AGENTTEAMS_AGENT_NAME: opts.agentConfigId
|
|
113
|
+
}
|
|
107
114
|
});
|
|
108
|
-
const logStream = createWriteStream(logPath, { flags:
|
|
109
|
-
logStream.on(
|
|
110
|
-
logger.warn(
|
|
115
|
+
const logStream = createWriteStream(logPath, { flags: "a" });
|
|
116
|
+
logStream.on("error", (err) => {
|
|
117
|
+
logger.warn("Runner log stream error", { triggerId: opts.triggerId, error: err.message });
|
|
111
118
|
});
|
|
112
119
|
child.stdout?.pipe(logStream);
|
|
113
120
|
child.stderr?.pipe(logStream);
|
|
114
|
-
let lastOutput =
|
|
115
|
-
let lastErrorOutput =
|
|
116
|
-
let outputText =
|
|
121
|
+
let lastOutput = "";
|
|
122
|
+
let lastErrorOutput = "";
|
|
123
|
+
let outputText = "";
|
|
117
124
|
const appendOutputText = (chunk) => {
|
|
118
125
|
if (outputText.length >= OUTPUT_CAPTURE_MAX) {
|
|
119
126
|
return;
|
|
@@ -121,40 +128,40 @@ export class OpenCodeRunner {
|
|
|
121
128
|
outputText += chunk.slice(0, OUTPUT_CAPTURE_MAX - outputText.length);
|
|
122
129
|
};
|
|
123
130
|
const idleTimer = { reset: () => { } };
|
|
124
|
-
child.stdout?.on(
|
|
125
|
-
const rawOutput = Buffer.isBuffer(chunk) ? chunk.toString(
|
|
131
|
+
child.stdout?.on("data", (chunk) => {
|
|
132
|
+
const rawOutput = Buffer.isBuffer(chunk) ? chunk.toString("utf8") : String(chunk);
|
|
126
133
|
appendOutputText(rawOutput);
|
|
127
134
|
const output = toOutputPreview(rawOutput);
|
|
128
135
|
if (output.length > 0) {
|
|
129
136
|
lastOutput = output;
|
|
130
137
|
idleTimer.reset();
|
|
131
138
|
opts.onStdoutChunk?.(output);
|
|
132
|
-
logger.info(
|
|
139
|
+
logger.info("Runner stdout", {
|
|
133
140
|
triggerId: opts.triggerId,
|
|
134
141
|
pid: child.pid,
|
|
135
|
-
output
|
|
142
|
+
output
|
|
136
143
|
});
|
|
137
144
|
}
|
|
138
145
|
});
|
|
139
|
-
child.stderr?.on(
|
|
140
|
-
const output = toOutputPreview(Buffer.isBuffer(chunk) ? chunk.toString(
|
|
146
|
+
child.stderr?.on("data", (chunk) => {
|
|
147
|
+
const output = toOutputPreview(Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk);
|
|
141
148
|
if (output.length > 0) {
|
|
142
149
|
lastOutput = output;
|
|
143
150
|
lastErrorOutput = output;
|
|
144
151
|
idleTimer.reset();
|
|
145
152
|
opts.onStderrChunk?.(output);
|
|
146
|
-
logger.warn(
|
|
153
|
+
logger.warn("Runner stderr", {
|
|
147
154
|
triggerId: opts.triggerId,
|
|
148
155
|
pid: child.pid,
|
|
149
|
-
output
|
|
156
|
+
output
|
|
150
157
|
});
|
|
151
158
|
}
|
|
152
159
|
});
|
|
153
|
-
logger.info(
|
|
160
|
+
logger.info("Runner started", {
|
|
154
161
|
triggerId: opts.triggerId,
|
|
155
162
|
cwd,
|
|
156
163
|
logPath,
|
|
157
|
-
pid: child.pid
|
|
164
|
+
pid: child.pid
|
|
158
165
|
});
|
|
159
166
|
return await new Promise((resolve) => {
|
|
160
167
|
let finished = false;
|
|
@@ -169,11 +176,11 @@ export class OpenCodeRunner {
|
|
|
169
176
|
idleTimeoutId = setTimeout(() => {
|
|
170
177
|
idleTimedOut = true;
|
|
171
178
|
timedOut = true;
|
|
172
|
-
logger.warn(
|
|
179
|
+
logger.warn("Runner idle timeout reached; no output for configured idle period", {
|
|
173
180
|
triggerId: opts.triggerId,
|
|
174
|
-
idleTimeoutMs: opts.idleTimeoutMs
|
|
181
|
+
idleTimeoutMs: opts.idleTimeoutMs
|
|
175
182
|
});
|
|
176
|
-
terminateRunnerChild(child, isWindows, opts.triggerId,
|
|
183
|
+
terminateRunnerChild(child, isWindows, opts.triggerId, "timeout");
|
|
177
184
|
}, opts.idleTimeoutMs);
|
|
178
185
|
};
|
|
179
186
|
idleTimer.reset = () => {
|
|
@@ -191,47 +198,47 @@ export class OpenCodeRunner {
|
|
|
191
198
|
idleTimer.reset = () => { };
|
|
192
199
|
logStream.end();
|
|
193
200
|
if (opts.signal) {
|
|
194
|
-
opts.signal.removeEventListener(
|
|
201
|
+
opts.signal.removeEventListener("abort", handleAbort);
|
|
195
202
|
}
|
|
196
203
|
};
|
|
197
204
|
const handleAbort = () => {
|
|
198
205
|
cancelled = true;
|
|
199
|
-
terminateRunnerChild(child, isWindows, opts.triggerId,
|
|
206
|
+
terminateRunnerChild(child, isWindows, opts.triggerId, "cancel");
|
|
200
207
|
};
|
|
201
208
|
const timeoutId = setTimeout(() => {
|
|
202
209
|
timedOut = true;
|
|
203
|
-
terminateRunnerChild(child, isWindows, opts.triggerId,
|
|
210
|
+
terminateRunnerChild(child, isWindows, opts.triggerId, "timeout");
|
|
204
211
|
}, opts.timeoutMs);
|
|
205
212
|
if (opts.signal?.aborted) {
|
|
206
213
|
handleAbort();
|
|
207
214
|
}
|
|
208
215
|
else if (opts.signal) {
|
|
209
|
-
opts.signal.addEventListener(
|
|
216
|
+
opts.signal.addEventListener("abort", handleAbort, { once: true });
|
|
210
217
|
}
|
|
211
|
-
child.on(
|
|
218
|
+
child.on("error", (error) => {
|
|
212
219
|
clearTimeout(timeoutId);
|
|
213
220
|
cleanup();
|
|
214
|
-
logger.error(
|
|
221
|
+
logger.error("Runner process launch failed", {
|
|
215
222
|
triggerId: opts.triggerId,
|
|
216
|
-
error: error.message
|
|
223
|
+
error: error.message
|
|
217
224
|
});
|
|
218
225
|
resolve({
|
|
219
226
|
exitCode: 1,
|
|
220
227
|
lastOutput,
|
|
221
228
|
outputText: outputText.trim() || undefined,
|
|
222
|
-
errorMessage: error.message
|
|
229
|
+
errorMessage: error.message
|
|
223
230
|
});
|
|
224
231
|
});
|
|
225
232
|
const closeWatchdog = setupCloseWatchdog(child, opts.triggerId);
|
|
226
|
-
child.on(
|
|
233
|
+
child.on("close", (code) => {
|
|
227
234
|
closeWatchdog.cancel();
|
|
228
235
|
clearTimeout(timeoutId);
|
|
229
236
|
cleanup();
|
|
230
|
-
logger.info(
|
|
237
|
+
logger.info("Runner process closed", {
|
|
231
238
|
triggerId: opts.triggerId,
|
|
232
239
|
pid: child.pid,
|
|
233
240
|
exitCode: code,
|
|
234
|
-
timedOut
|
|
241
|
+
timedOut
|
|
235
242
|
});
|
|
236
243
|
if (timedOut) {
|
|
237
244
|
resolve({
|
|
@@ -240,7 +247,7 @@ export class OpenCodeRunner {
|
|
|
240
247
|
outputText: outputText.trim() || undefined,
|
|
241
248
|
errorMessage: idleTimedOut
|
|
242
249
|
? `Runner idle timed out after ${Math.round(opts.idleTimeoutMs / 60_000)}m of no output`
|
|
243
|
-
: `Runner fail-safe timed out after ${Math.round(opts.timeoutMs / 3_600_000)}h
|
|
250
|
+
: `Runner fail-safe timed out after ${Math.round(opts.timeoutMs / 3_600_000)}h`
|
|
244
251
|
});
|
|
245
252
|
return;
|
|
246
253
|
}
|
|
@@ -250,7 +257,7 @@ export class OpenCodeRunner {
|
|
|
250
257
|
cancelled: true,
|
|
251
258
|
lastOutput,
|
|
252
259
|
outputText: outputText.trim() || undefined,
|
|
253
|
-
errorMessage:
|
|
260
|
+
errorMessage: "Runner cancelled by user"
|
|
254
261
|
});
|
|
255
262
|
return;
|
|
256
263
|
}
|
|
@@ -258,7 +265,7 @@ export class OpenCodeRunner {
|
|
|
258
265
|
exitCode: code ?? 1,
|
|
259
266
|
lastOutput,
|
|
260
267
|
outputText: outputText.trim() || undefined,
|
|
261
|
-
errorMessage: code === 0 ? undefined : lastErrorOutput || lastOutput || `Runner exited with code ${code ?? 1}
|
|
268
|
+
errorMessage: code === 0 ? undefined : (lastErrorOutput || lastOutput || `Runner exited with code ${code ?? 1}`)
|
|
262
269
|
});
|
|
263
270
|
});
|
|
264
271
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/runners/opencode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/runners/opencode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type spawn } from
|
|
1
|
+
import { type spawn } from "node:child_process";
|
|
2
2
|
type ChildProcess = ReturnType<typeof spawn>;
|
|
3
3
|
export declare const terminateRunnerChild: (child: ChildProcess, isWindows: boolean, triggerId: string, reason: "timeout" | "cancel") => void;
|
|
4
4
|
export declare const setupCloseWatchdog: (child: ChildProcess, triggerId: string) => {
|
|
@@ -1,23 +1,21 @@
|
|
|
1
|
-
import { execFileSync } from
|
|
2
|
-
import { logger } from
|
|
1
|
+
import { execFileSync } from "node:child_process";
|
|
2
|
+
import { logger } from "../logger.js";
|
|
3
3
|
const FORCE_KILL_AFTER_MS = 10_000;
|
|
4
4
|
const FORCE_CLOSE_AFTER_EXIT_MS = 5_000;
|
|
5
5
|
export const terminateRunnerChild = (child, isWindows, triggerId, reason) => {
|
|
6
6
|
if (!child.pid) {
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
|
-
logger.warn(reason ===
|
|
10
|
-
? 'Runner cancellation requested; sending SIGTERM'
|
|
11
|
-
: 'Runner fail-safe timeout reached; sending SIGTERM', {
|
|
9
|
+
logger.warn(reason === "cancel" ? "Runner cancellation requested; sending SIGTERM" : "Runner fail-safe timeout reached; sending SIGTERM", {
|
|
12
10
|
triggerId,
|
|
13
|
-
pid: child.pid
|
|
11
|
+
pid: child.pid
|
|
14
12
|
});
|
|
15
13
|
try {
|
|
16
14
|
if (isWindows) {
|
|
17
|
-
execFileSync(
|
|
15
|
+
execFileSync("taskkill", ["/F", "/T", "/PID", String(child.pid)], { stdio: "ignore", windowsHide: true });
|
|
18
16
|
}
|
|
19
17
|
else {
|
|
20
|
-
process.kill(-child.pid,
|
|
18
|
+
process.kill(-child.pid, "SIGTERM");
|
|
21
19
|
}
|
|
22
20
|
}
|
|
23
21
|
catch {
|
|
@@ -27,7 +25,7 @@ export const terminateRunnerChild = (child, isWindows, triggerId, reason) => {
|
|
|
27
25
|
setTimeout(() => {
|
|
28
26
|
try {
|
|
29
27
|
if (child.pid) {
|
|
30
|
-
process.kill(-child.pid,
|
|
28
|
+
process.kill(-child.pid, "SIGKILL");
|
|
31
29
|
}
|
|
32
30
|
}
|
|
33
31
|
catch {
|
|
@@ -42,15 +40,15 @@ export const terminateRunnerChild = (child, isWindows, triggerId, reason) => {
|
|
|
42
40
|
// exit 후 일정 시간 안에 close가 안 오면 stdio를 강제로 destroy해서 close를 유발한다.
|
|
43
41
|
export const setupCloseWatchdog = (child, triggerId) => {
|
|
44
42
|
let watchdog = null;
|
|
45
|
-
child.on(
|
|
43
|
+
child.on("exit", (code) => {
|
|
46
44
|
if (watchdog) {
|
|
47
45
|
return;
|
|
48
46
|
}
|
|
49
47
|
watchdog = setTimeout(() => {
|
|
50
|
-
logger.warn(
|
|
48
|
+
logger.warn("Runner exited but stdio pipes still open; forcing close", {
|
|
51
49
|
triggerId,
|
|
52
50
|
pid: child.pid,
|
|
53
|
-
exitCode: code
|
|
51
|
+
exitCode: code
|
|
54
52
|
});
|
|
55
53
|
child.stdout?.destroy();
|
|
56
54
|
child.stderr?.destroy();
|
|
@@ -62,7 +60,7 @@ export const setupCloseWatchdog = (child, triggerId) => {
|
|
|
62
60
|
clearTimeout(watchdog);
|
|
63
61
|
watchdog = null;
|
|
64
62
|
}
|
|
65
|
-
}
|
|
63
|
+
}
|
|
66
64
|
};
|
|
67
65
|
};
|
|
68
66
|
//# sourceMappingURL=process-control.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-control.js","sourceRoot":"","sources":["../../src/runners/process-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,mBAAmB,GAAG,MAAM,CAAC;AACnC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAIxC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAmB,EACnB,SAAkB,EAClB,SAAiB,EACjB,MAA4B,EACtB,EAAE;IACR,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IAED,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"process-control.js","sourceRoot":"","sources":["../../src/runners/process-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,mBAAmB,GAAG,MAAM,CAAC;AACnC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AAIxC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAmB,EACnB,SAAkB,EAClB,SAAiB,EACjB,MAA4B,EACtB,EAAE;IACR,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAC,mDAAmD,EAAE;QACxI,SAAS;QACT,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5G,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;IAED,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC;gBACH,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;oBACd,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC,EAAE,mBAAmB,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC,CAAC;AAEF,gDAAgD;AAChD,mDAAmD;AACnD,oDAAoD;AACpD,gEAAgE;AAChE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAmB,EACnB,SAAiB,EACO,EAAE;IAC1B,IAAI,QAAQ,GAA0B,IAAI,CAAC;IAE3C,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QACxB,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,yDAAyD,EAAE;gBACrE,SAAS;gBACT,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACxB,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC1B,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,GAAG,EAAE;YACX,IAAI,QAAQ,EAAE,CAAC;gBACb,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvB,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|