cueline 0.1.2 → 0.1.4
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/.claude-plugin/plugin.json +2 -2
- package/.codex-plugin/plugin.json +3 -3
- package/CHANGELOG.md +38 -0
- package/README.ja.md +65 -21
- package/README.ko.md +65 -21
- package/README.md +70 -23
- package/README.zh-CN.md +65 -21
- package/README.zh-TW.md +68 -22
- package/dist/src/api-contracts.d.ts +77 -0
- package/dist/src/api-contracts.js +2 -0
- package/dist/src/api-contracts.js.map +1 -0
- package/dist/src/api-controller-handoff.d.ts +6 -0
- package/dist/src/api-controller-handoff.js +253 -0
- package/dist/src/api-controller-handoff.js.map +1 -0
- package/dist/src/api-runtime-lifecycle.d.ts +22 -0
- package/dist/src/api-runtime-lifecycle.js +568 -0
- package/dist/src/api-runtime-lifecycle.js.map +1 -0
- package/dist/src/api.d.ts +9 -27
- package/dist/src/api.js +138 -42
- package/dist/src/api.js.map +1 -1
- package/dist/src/browser/browser-adapter.d.ts +11 -1
- package/dist/src/browser/codex-iab/bootstrap.d.ts +16 -0
- package/dist/src/browser/codex-iab/bootstrap.js +49 -0
- package/dist/src/browser/codex-iab/bootstrap.js.map +1 -1
- package/dist/src/browser/codex-iab/chatgpt-client.js +346 -120
- package/dist/src/browser/codex-iab/chatgpt-client.js.map +1 -1
- package/dist/src/browser/codex-iab/recovery-evidence.d.ts +6 -0
- package/dist/src/browser/codex-iab/recovery-evidence.js +37 -0
- package/dist/src/browser/codex-iab/recovery-evidence.js.map +1 -0
- package/dist/src/browser/codex-iab/submission-url.d.ts +2 -0
- package/dist/src/browser/codex-iab/submission-url.js +53 -0
- package/dist/src/browser/codex-iab/submission-url.js.map +1 -0
- package/dist/src/cli/main.js +305 -20
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/core/controller-abort.d.ts +1 -0
- package/dist/src/core/controller-abort.js +11 -0
- package/dist/src/core/controller-abort.js.map +1 -0
- package/dist/src/core/controller-command-execution.d.ts +9 -0
- package/dist/src/core/controller-command-execution.js +299 -0
- package/dist/src/core/controller-command-execution.js.map +1 -0
- package/dist/src/core/controller-loop.d.ts +3 -37
- package/dist/src/core/controller-loop.js +386 -291
- package/dist/src/core/controller-loop.js.map +1 -1
- package/dist/src/core/controller-turn.d.ts +16 -0
- package/dist/src/core/controller-turn.js +309 -0
- package/dist/src/core/controller-turn.js.map +1 -0
- package/dist/src/core/controller-types.d.ts +58 -0
- package/dist/src/core/controller-types.js +2 -0
- package/dist/src/core/controller-types.js.map +1 -0
- package/dist/src/core/persisted-run.d.ts +4 -0
- package/dist/src/core/persisted-run.js +19 -0
- package/dist/src/core/persisted-run.js.map +1 -0
- package/dist/src/core/process-liveness.d.ts +2 -0
- package/dist/src/core/process-liveness.js +44 -0
- package/dist/src/core/process-liveness.js.map +1 -0
- package/dist/src/core/run-status.d.ts +53 -0
- package/dist/src/core/run-status.js +224 -0
- package/dist/src/core/run-status.js.map +1 -0
- package/dist/src/core/state-machine.d.ts +17 -4
- package/dist/src/core/state-machine.js +170 -16
- package/dist/src/core/state-machine.js.map +1 -1
- package/dist/src/jobs/status.d.ts +7 -1
- package/dist/src/jobs/status.js.map +1 -1
- package/dist/src/jobs/supervisor.d.ts +2 -0
- package/dist/src/jobs/supervisor.js +47 -13
- package/dist/src/jobs/supervisor.js.map +1 -1
- package/dist/src/protocol/types.d.ts +1 -1
- package/dist/src/protocol/validate-command.js +18 -0
- package/dist/src/protocol/validate-command.js.map +1 -1
- package/dist/src/router/resolver.d.ts +2 -1
- package/dist/src/router/resolver.js +31 -13
- package/dist/src/router/resolver.js.map +1 -1
- package/dist/src/runners/process-runner.d.ts +2 -2
- package/dist/src/runners/process-runner.js +113 -9
- package/dist/src/runners/process-runner.js.map +1 -1
- package/dist/src/runners/runner-adapter.d.ts +9 -2
- package/dist/src/runners/runner-adapter.js.map +1 -1
- package/dist/src/state/atomic-write.js +17 -2
- package/dist/src/state/atomic-write.js.map +1 -1
- package/dist/src/state/cancellation.d.ts +42 -0
- package/dist/src/state/cancellation.js +168 -0
- package/dist/src/state/cancellation.js.map +1 -0
- package/dist/src/state/event-log.d.ts +17 -1
- package/dist/src/state/event-log.js +328 -18
- package/dist/src/state/event-log.js.map +1 -1
- package/dist/src/state/paths.d.ts +4 -0
- package/dist/src/state/paths.js +4 -0
- package/dist/src/state/paths.js.map +1 -1
- package/dist/src/state/runtime-lease.d.ts +53 -0
- package/dist/src/state/runtime-lease.js +727 -0
- package/dist/src/state/runtime-lease.js.map +1 -0
- package/dist/src/state/runtime-retirement.d.ts +16 -0
- package/dist/src/state/runtime-retirement.js +95 -0
- package/dist/src/state/runtime-retirement.js.map +1 -0
- package/dist/src/state/runtime-takeover-intent.d.ts +1 -0
- package/dist/src/state/runtime-takeover-intent.js +18 -0
- package/dist/src/state/runtime-takeover-intent.js.map +1 -0
- package/dist/src/state/store.d.ts +12 -1
- package/dist/src/state/store.js +246 -40
- package/dist/src/state/store.js.map +1 -1
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.js +1 -1
- package/docs/architecture.md +16 -11
- package/docs/assets/cueline-loop-en.svg +11 -10
- package/docs/assets/cueline-loop-ja.svg +11 -10
- package/docs/assets/cueline-loop-ko.svg +11 -10
- package/docs/assets/cueline-loop-zh-CN.svg +11 -10
- package/docs/assets/cueline-loop-zh-TW.svg +11 -10
- package/docs/compatibility.md +16 -8
- package/docs/controller-protocol.md +8 -4
- package/docs/runner-contract.md +26 -6
- package/docs/state-and-recovery.md +69 -16
- package/package.json +4 -3
- package/schemas/controller-observation.schema.json +1 -1
- package/scripts/validate-plugin.mjs +66 -0
- package/skills/cueline/SKILL.md +89 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-machine.js","sourceRoot":"","sources":["../../../src/core/state-machine.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"state-machine.js","sourceRoot":"","sources":["../../../src/core/state-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
+
import type { JobMode } from "../protocol/types.js";
|
|
1
2
|
import type { JobExecution, JobResult, JobResultStatus } from "../runners/runner-adapter.js";
|
|
2
|
-
export type JobStatusKind = "running" | JobResultStatus;
|
|
3
|
+
export type JobStatusKind = "pending" | "running" | JobResultStatus;
|
|
3
4
|
export interface JobStatus {
|
|
4
5
|
jobId: string;
|
|
6
|
+
runId?: string;
|
|
7
|
+
jobKey?: string;
|
|
8
|
+
lane?: string;
|
|
9
|
+
mode?: JobMode;
|
|
10
|
+
pid?: number;
|
|
5
11
|
execution: JobExecution;
|
|
6
12
|
status: JobStatusKind;
|
|
7
13
|
startedAt: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/jobs/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/jobs/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAqBnD,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,YAAY,CAAC,gBAAgB,EAAE,6CAA6C,EAAE;YACtF,OAAO,EAAE,EAAE,KAAK,EAAE;SACnB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,cAAc;IAChB,UAAU,CAAS;IAE5B,YAAY,aAAqB;QAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAiB;QAC3B,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,GAAG,MAAM,IAAI,aAAa,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;QACnE,MAAM,SAAS,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAa;QACtB,eAAe,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAc,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,IAAI,YAAY,CAAC,wBAAwB,EAAE,8BAA8B,KAAK,EAAE,EAAE;gBACtF,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,EAAE,KAAK,EAAE;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,eAAe,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC;IACrD,CAAC;CACF;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AACnG,CAAC"}
|
|
@@ -15,6 +15,8 @@ export declare class JobSupervisor {
|
|
|
15
15
|
private readonly options;
|
|
16
16
|
constructor(runner: RunnerAdapter, options: JobSupervisorOptions);
|
|
17
17
|
start(spec: RunnerSpec): Promise<JobStatus>;
|
|
18
|
+
cancel(jobId: string): boolean;
|
|
19
|
+
cancelAll(): number;
|
|
18
20
|
waitForCompletion(jobId: string): Promise<JobStatus>;
|
|
19
21
|
inspect(jobId: string): Promise<JobStatus>;
|
|
20
22
|
private completeOnce;
|
|
@@ -14,6 +14,7 @@ export class JobSupervisor {
|
|
|
14
14
|
options;
|
|
15
15
|
#locks;
|
|
16
16
|
#completions = new Map();
|
|
17
|
+
#cancellations = new Map();
|
|
17
18
|
constructor(runner, options) {
|
|
18
19
|
this.runner = runner;
|
|
19
20
|
this.options = options;
|
|
@@ -21,27 +22,52 @@ export class JobSupervisor {
|
|
|
21
22
|
}
|
|
22
23
|
async start(spec) {
|
|
23
24
|
const lock = this.#locks.acquire(spec.jobId);
|
|
24
|
-
const running = {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
const running = { current: {
|
|
26
|
+
jobId: spec.jobId,
|
|
27
|
+
...(spec.runId === undefined ? {} : { runId: spec.runId }),
|
|
28
|
+
...(spec.jobKey === undefined ? {} : { jobKey: spec.jobKey }),
|
|
29
|
+
...(spec.lane === undefined ? {} : { lane: spec.lane }),
|
|
30
|
+
mode: spec.mode,
|
|
31
|
+
execution: executionFor(spec),
|
|
32
|
+
status: "running",
|
|
33
|
+
startedAt: new Date().toISOString(),
|
|
34
|
+
} };
|
|
35
|
+
const cancellation = new AbortController();
|
|
36
|
+
this.#cancellations.set(spec.jobId, cancellation);
|
|
37
|
+
const signal = spec.signal === undefined
|
|
38
|
+
? cancellation.signal
|
|
39
|
+
: AbortSignal.any([spec.signal, cancellation.signal]);
|
|
30
40
|
try {
|
|
31
|
-
await this.options.statusStore.write(running);
|
|
41
|
+
await this.options.statusStore.write(running.current);
|
|
32
42
|
}
|
|
33
43
|
catch (error) {
|
|
44
|
+
this.#cancellations.delete(spec.jobId);
|
|
34
45
|
lock.release();
|
|
35
46
|
throw error;
|
|
36
47
|
}
|
|
37
|
-
const completion = this.completeOnce(spec, running, lock.release);
|
|
48
|
+
const completion = this.completeOnce({ ...spec, signal }, running, lock.release);
|
|
38
49
|
this.#completions.set(spec.jobId, completion);
|
|
39
50
|
if (spec.background === true) {
|
|
40
51
|
void completion.catch(() => undefined);
|
|
41
|
-
return running;
|
|
52
|
+
return running.current;
|
|
42
53
|
}
|
|
43
54
|
return completion;
|
|
44
55
|
}
|
|
56
|
+
cancel(jobId) {
|
|
57
|
+
const cancellation = this.#cancellations.get(jobId);
|
|
58
|
+
if (cancellation === undefined || cancellation.signal.aborted)
|
|
59
|
+
return false;
|
|
60
|
+
cancellation.abort();
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
cancelAll() {
|
|
64
|
+
let count = 0;
|
|
65
|
+
for (const jobId of this.#cancellations.keys()) {
|
|
66
|
+
if (this.cancel(jobId))
|
|
67
|
+
count += 1;
|
|
68
|
+
}
|
|
69
|
+
return count;
|
|
70
|
+
}
|
|
45
71
|
async waitForCompletion(jobId) {
|
|
46
72
|
const completion = this.#completions.get(jobId);
|
|
47
73
|
if (completion !== undefined) {
|
|
@@ -64,13 +90,20 @@ export class JobSupervisor {
|
|
|
64
90
|
async completeOnce(spec, running, release) {
|
|
65
91
|
let terminal;
|
|
66
92
|
try {
|
|
67
|
-
const result = await this.runner.run(spec
|
|
68
|
-
|
|
93
|
+
const result = await this.runner.run(spec, {
|
|
94
|
+
onSpawn: async (pid) => {
|
|
95
|
+
running.current = { ...running.current, pid };
|
|
96
|
+
await this.options.statusStore.write(running.current);
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
terminal = this.withResult(running.current, result);
|
|
69
100
|
}
|
|
70
101
|
catch (error) {
|
|
71
102
|
terminal = {
|
|
72
|
-
...running,
|
|
73
|
-
status: "
|
|
103
|
+
...running.current,
|
|
104
|
+
status: running.current.pid !== undefined && spec.mode === "work"
|
|
105
|
+
? "ambiguous"
|
|
106
|
+
: "failed",
|
|
74
107
|
finishedAt: new Date().toISOString(),
|
|
75
108
|
error: errorText(error),
|
|
76
109
|
};
|
|
@@ -81,6 +114,7 @@ export class JobSupervisor {
|
|
|
81
114
|
}
|
|
82
115
|
finally {
|
|
83
116
|
this.#completions.delete(spec.jobId);
|
|
117
|
+
this.#cancellations.delete(spec.jobId);
|
|
84
118
|
release();
|
|
85
119
|
}
|
|
86
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../../src/jobs/supervisor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAuD,MAAM,8BAA8B,CAAC;AACjH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAkB,MAAM,aAAa,CAAC;AAO7D,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,aAAa;
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../../src/jobs/supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export interface JobObservation {
|
|
|
51
51
|
job_id: string;
|
|
52
52
|
job_key: string;
|
|
53
53
|
required: boolean;
|
|
54
|
-
status: "pending" | "running" | "succeeded" | "failed" | "timed_out" | "ambiguous";
|
|
54
|
+
status: "pending" | "running" | "succeeded" | "failed" | "timed_out" | "cancelled" | "ambiguous";
|
|
55
55
|
output?: string;
|
|
56
56
|
error?: string;
|
|
57
57
|
}
|
|
@@ -2,6 +2,17 @@ import { CueLineError } from "../core/errors.js";
|
|
|
2
2
|
import { CUELINE_PROTOCOL, } from "./types.js";
|
|
3
3
|
const JOB_KEY_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
|
|
4
4
|
const LANE_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
|
|
5
|
+
const JOB_FIELDS = new Set([
|
|
6
|
+
"job_key",
|
|
7
|
+
"lane",
|
|
8
|
+
"mode",
|
|
9
|
+
"task",
|
|
10
|
+
"required",
|
|
11
|
+
"timeout_ms",
|
|
12
|
+
"runner",
|
|
13
|
+
"workdir",
|
|
14
|
+
"background",
|
|
15
|
+
]);
|
|
5
16
|
function isRecord(value) {
|
|
6
17
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
7
18
|
}
|
|
@@ -59,6 +70,13 @@ function validateJob(value) {
|
|
|
59
70
|
if (!isRecord(value)) {
|
|
60
71
|
return fail("Each dispatch job must be an object.");
|
|
61
72
|
}
|
|
73
|
+
const unknownField = Object.keys(value).find((key) => !JOB_FIELDS.has(key));
|
|
74
|
+
if (unknownField !== undefined) {
|
|
75
|
+
const correction = unknownField === "runner_id"
|
|
76
|
+
? " Use 'runner'; 'runner_id' is not part of the CueLine controller contract."
|
|
77
|
+
: "";
|
|
78
|
+
throw new CueLineError("CONTROL_JOB_FIELD_UNKNOWN", `Unsupported dispatch job field '${unknownField}'.${correction}`, { details: { field: unknownField } });
|
|
79
|
+
}
|
|
62
80
|
const jobKey = requiredString(value, "job_key");
|
|
63
81
|
if (!JOB_KEY_PATTERN.test(jobKey)) {
|
|
64
82
|
return fail("'job_key' contains unsupported characters.", { jobKey });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-command.js","sourceRoot":"","sources":["../../../src/protocol/validate-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EACL,gBAAgB,GASjB,MAAM,YAAY,CAAC;AAEpB,MAAM,eAAe,GAAG,mCAAmC,CAAC;AAC5D,MAAM,YAAY,GAAG,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-command.js","sourceRoot":"","sources":["../../../src/protocol/validate-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { ResolvedRoute, RouteAvailability, RoutingConfig } from "./types.js";
|
|
1
|
+
import type { LaneConfig, ResolvedRoute, RouteAvailability, RoutingConfig } from "./types.js";
|
|
2
|
+
export declare function validateRouteReference(lane: string, config: RoutingConfig, requestedCandidateId?: string): LaneConfig;
|
|
2
3
|
/**
|
|
3
4
|
* Chooses a candidate before any runner is invoked. This function never spawns
|
|
4
5
|
* a process and therefore cannot perform post-spawn fallback.
|
|
@@ -1,4 +1,31 @@
|
|
|
1
1
|
import { CueLineError } from "../core/errors.js";
|
|
2
|
+
export function validateRouteReference(lane, config, requestedCandidateId) {
|
|
3
|
+
const laneConfig = config.lanes[lane];
|
|
4
|
+
if (laneConfig === undefined) {
|
|
5
|
+
const runnerLanes = Object.entries(config.lanes)
|
|
6
|
+
.filter(([, candidateLane]) => candidateLane.candidates.some((candidate) => candidate.id === lane))
|
|
7
|
+
.map(([name]) => name);
|
|
8
|
+
const correction = runnerLanes.length === 0
|
|
9
|
+
? ""
|
|
10
|
+
: ` '${lane}' is a runner ID; use lane '${runnerLanes[0]}' with runner '${lane}'.`;
|
|
11
|
+
throw new CueLineError("ROUTE_LANE_UNKNOWN", `unknown routing lane: ${lane}.${correction}`, { details: { lane, ...(runnerLanes.length === 0 ? {} : { runner_lanes: runnerLanes }) } });
|
|
12
|
+
}
|
|
13
|
+
if (!laneConfig.enabled) {
|
|
14
|
+
throw new CueLineError("ROUTE_LANE_DISABLED", `routing lane is disabled: ${lane}`, {
|
|
15
|
+
details: { lane },
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
if (requestedCandidateId !== undefined) {
|
|
19
|
+
const candidate = laneConfig.candidates.find((entry) => entry.id === requestedCandidateId);
|
|
20
|
+
if (candidate === undefined) {
|
|
21
|
+
throw new CueLineError("ROUTE_RUNNER_UNKNOWN", `runner '${requestedCandidateId}' is not configured for lane: ${lane}`, { details: { lane, runner: requestedCandidateId } });
|
|
22
|
+
}
|
|
23
|
+
if (candidate.enabled === false) {
|
|
24
|
+
throw new CueLineError("ROUTE_RUNNER_DISABLED", `runner '${requestedCandidateId}' is disabled for lane: ${lane}`, { details: { lane, runner: requestedCandidateId } });
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return laneConfig;
|
|
28
|
+
}
|
|
2
29
|
function isAvailabilityChecker(value) {
|
|
3
30
|
return typeof value === "object" && value !== null && "isAvailable" in value;
|
|
4
31
|
}
|
|
@@ -16,23 +43,14 @@ function isAvailable(availability, candidate, lane) {
|
|
|
16
43
|
* a process and therefore cannot perform post-spawn fallback.
|
|
17
44
|
*/
|
|
18
45
|
export function resolveRoute(lane, config, availability, requestedCandidateId) {
|
|
19
|
-
const laneConfig = config
|
|
20
|
-
if (laneConfig === undefined) {
|
|
21
|
-
throw new CueLineError("ROUTE_LANE_UNKNOWN", `unknown routing lane: ${lane}`, { details: { lane } });
|
|
22
|
-
}
|
|
23
|
-
if (!laneConfig.enabled) {
|
|
24
|
-
throw new CueLineError("ROUTE_LANE_DISABLED", `routing lane is disabled: ${lane}`, {
|
|
25
|
-
details: { lane },
|
|
26
|
-
});
|
|
27
|
-
}
|
|
46
|
+
const laneConfig = validateRouteReference(lane, config, requestedCandidateId);
|
|
28
47
|
if (requestedCandidateId !== undefined) {
|
|
29
48
|
const candidateIndex = laneConfig.candidates.findIndex((candidate) => candidate.id === requestedCandidateId);
|
|
30
|
-
if (candidateIndex < 0)
|
|
31
|
-
throw new
|
|
32
|
-
}
|
|
49
|
+
if (candidateIndex < 0)
|
|
50
|
+
throw new Error("ROUTE_REFERENCE_VALIDATION_INCONSISTENT");
|
|
33
51
|
const candidate = laneConfig.candidates[candidateIndex];
|
|
34
52
|
if (candidate === undefined || candidate.enabled === false) {
|
|
35
|
-
throw new
|
|
53
|
+
throw new Error("ROUTE_REFERENCE_VALIDATION_INCONSISTENT");
|
|
36
54
|
}
|
|
37
55
|
if (!isAvailable(availability, candidate, lane)) {
|
|
38
56
|
throw new CueLineError("ROUTE_RUNNER_UNAVAILABLE", `runner '${requestedCandidateId}' is unavailable for lane: ${lane}`, { details: { lane, runner: requestedCandidateId } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/router/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/router/resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { JobResult, RunnerAdapter, RunnerSpec } from "./runner-adapter.js";
|
|
1
|
+
import type { JobResult, RunnerAdapter, RunnerRunHooks, RunnerSpec } from "./runner-adapter.js";
|
|
2
2
|
import { RunnerRegistry } from "./registry.js";
|
|
3
3
|
export interface ProcessRunnerOptions {
|
|
4
4
|
environment?: NodeJS.ProcessEnv;
|
|
@@ -11,5 +11,5 @@ export declare class ProcessRunner implements RunnerAdapter {
|
|
|
11
11
|
#private;
|
|
12
12
|
private readonly registry;
|
|
13
13
|
constructor(registry: RunnerRegistry, options?: ProcessRunnerOptions);
|
|
14
|
-
run(spec: RunnerSpec): Promise<JobResult>;
|
|
14
|
+
run(spec: RunnerSpec, hooks?: RunnerRunHooks): Promise<JobResult>;
|
|
15
15
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { CueLineError } from "../core/errors.js";
|
|
3
|
-
import { runtimeEnvironment } from "../core/runtime.js";
|
|
3
|
+
import { runtimeEnvironment, runtimePlatform } from "../core/runtime.js";
|
|
4
4
|
import { RunnerRegistry } from "./registry.js";
|
|
5
5
|
function combineOutput(stdout, stderr) {
|
|
6
6
|
if (stdout.length === 0) {
|
|
@@ -14,6 +14,41 @@ function combineOutput(stdout, stderr) {
|
|
|
14
14
|
function errorText(error) {
|
|
15
15
|
return error instanceof Error ? error.message : String(error);
|
|
16
16
|
}
|
|
17
|
+
function nativeProcess() {
|
|
18
|
+
return typeof process === "undefined" ? undefined : process;
|
|
19
|
+
}
|
|
20
|
+
const SUPPORTS_PROCESS_GROUPS = runtimePlatform() !== "win32" && typeof nativeProcess()?.kill === "function";
|
|
21
|
+
function terminateProcessTree(child, signal) {
|
|
22
|
+
if (SUPPORTS_PROCESS_GROUPS && child.pid !== undefined) {
|
|
23
|
+
try {
|
|
24
|
+
nativeProcess().kill(-child.pid, signal);
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
if (typeof error === "object" &&
|
|
29
|
+
error !== null &&
|
|
30
|
+
"code" in error &&
|
|
31
|
+
error.code === "ESRCH") {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
child.kill(signal);
|
|
37
|
+
}
|
|
38
|
+
function processTreeIsAlive(child) {
|
|
39
|
+
if (!SUPPORTS_PROCESS_GROUPS || child?.pid === undefined)
|
|
40
|
+
return false;
|
|
41
|
+
try {
|
|
42
|
+
nativeProcess().kill(-child.pid, 0);
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
return (typeof error === "object" &&
|
|
47
|
+
error !== null &&
|
|
48
|
+
"code" in error &&
|
|
49
|
+
error.code !== "ESRCH");
|
|
50
|
+
}
|
|
51
|
+
}
|
|
17
52
|
/**
|
|
18
53
|
* Executes exactly one registered argv. Candidate fallback belongs to the
|
|
19
54
|
* router and is intentionally unavailable here after a process starts.
|
|
@@ -25,7 +60,7 @@ export class ProcessRunner {
|
|
|
25
60
|
this.registry = registry;
|
|
26
61
|
this.#environment = { ...(options.environment ?? runtimeEnvironment()) };
|
|
27
62
|
}
|
|
28
|
-
async run(spec) {
|
|
63
|
+
async run(spec, hooks = {}) {
|
|
29
64
|
if (this.#environment.CUELINE_DEPTH !== undefined || spec.env?.CUELINE_DEPTH !== undefined) {
|
|
30
65
|
throw new CueLineError("NESTED_ROUTING_REJECTED", "nested CueLine routing is not allowed");
|
|
31
66
|
}
|
|
@@ -42,8 +77,27 @@ export class ProcessRunner {
|
|
|
42
77
|
if (registered.executable !== executable) {
|
|
43
78
|
throw new CueLineError("RUNNER_EXECUTABLE_UNREGISTERED", "argv executable registration did not match");
|
|
44
79
|
}
|
|
45
|
-
|
|
46
|
-
|
|
80
|
+
const startedAt = new Date().toISOString();
|
|
81
|
+
if (spec.signal?.aborted) {
|
|
82
|
+
const finishedAt = new Date().toISOString();
|
|
83
|
+
return {
|
|
84
|
+
status: "cancelled",
|
|
85
|
+
exitCode: null,
|
|
86
|
+
stdout: "",
|
|
87
|
+
stderr: "",
|
|
88
|
+
output: "",
|
|
89
|
+
emptyOutput: true,
|
|
90
|
+
timedOut: false,
|
|
91
|
+
cancelled: true,
|
|
92
|
+
ambiguousSideEffects: false,
|
|
93
|
+
retryable: false,
|
|
94
|
+
startedAt,
|
|
95
|
+
finishedAt,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
let spawnedPid;
|
|
99
|
+
let cancelSpawned;
|
|
100
|
+
const completion = new Promise((resolve) => {
|
|
47
101
|
const environment = {
|
|
48
102
|
...this.#environment,
|
|
49
103
|
...spec.env,
|
|
@@ -52,9 +106,11 @@ export class ProcessRunner {
|
|
|
52
106
|
let stdout = "";
|
|
53
107
|
let stderr = "";
|
|
54
108
|
let timedOut = false;
|
|
109
|
+
let cancelled = false;
|
|
55
110
|
let settled = false;
|
|
56
111
|
let timeoutTimer;
|
|
57
112
|
let forceKillTimer;
|
|
113
|
+
let child;
|
|
58
114
|
const finish = (status, exitCode) => {
|
|
59
115
|
if (settled) {
|
|
60
116
|
return;
|
|
@@ -65,7 +121,15 @@ export class ProcessRunner {
|
|
|
65
121
|
}
|
|
66
122
|
if (forceKillTimer !== undefined) {
|
|
67
123
|
clearTimeout(forceKillTimer);
|
|
124
|
+
forceKillTimer = undefined;
|
|
125
|
+
if (child !== undefined && processTreeIsAlive(child)) {
|
|
126
|
+
terminateProcessTree(child, "SIGKILL");
|
|
127
|
+
}
|
|
68
128
|
}
|
|
129
|
+
if (child !== undefined && processTreeIsAlive(child)) {
|
|
130
|
+
terminateProcessTree(child, "SIGKILL");
|
|
131
|
+
}
|
|
132
|
+
spec.signal?.removeEventListener("abort", cancel);
|
|
69
133
|
const output = combineOutput(stdout, stderr);
|
|
70
134
|
resolve({
|
|
71
135
|
status,
|
|
@@ -75,16 +139,34 @@ export class ProcessRunner {
|
|
|
75
139
|
output,
|
|
76
140
|
emptyOutput: output.length === 0,
|
|
77
141
|
timedOut,
|
|
142
|
+
cancelled,
|
|
78
143
|
ambiguousSideEffects: spec.mode === "work" && status !== "succeeded",
|
|
79
144
|
retryable: false,
|
|
80
145
|
startedAt,
|
|
81
146
|
finishedAt: new Date().toISOString(),
|
|
82
147
|
});
|
|
83
148
|
};
|
|
84
|
-
|
|
149
|
+
const terminate = () => {
|
|
150
|
+
if (child === undefined)
|
|
151
|
+
return;
|
|
152
|
+
terminateProcessTree(child, "SIGTERM");
|
|
153
|
+
forceKillTimer ??= setTimeout(() => {
|
|
154
|
+
forceKillTimer = undefined;
|
|
155
|
+
if (child !== undefined)
|
|
156
|
+
terminateProcessTree(child, "SIGKILL");
|
|
157
|
+
}, 250);
|
|
158
|
+
};
|
|
159
|
+
const cancel = () => {
|
|
160
|
+
if (settled || cancelled)
|
|
161
|
+
return;
|
|
162
|
+
cancelled = true;
|
|
163
|
+
terminate();
|
|
164
|
+
};
|
|
165
|
+
cancelSpawned = cancel;
|
|
85
166
|
try {
|
|
86
167
|
child = spawn(executable, [...spec.argv.slice(1)], {
|
|
87
168
|
cwd: spec.cwd,
|
|
169
|
+
detached: SUPPORTS_PROCESS_GROUPS,
|
|
88
170
|
env: environment,
|
|
89
171
|
shell: false,
|
|
90
172
|
stdio: [spec.stdin === undefined ? "ignore" : "pipe", "pipe", "pipe"],
|
|
@@ -95,11 +177,14 @@ export class ProcessRunner {
|
|
|
95
177
|
finish("failed", null);
|
|
96
178
|
return;
|
|
97
179
|
}
|
|
180
|
+
spawnedPid = child.pid;
|
|
181
|
+
spec.signal?.addEventListener("abort", cancel, { once: true });
|
|
98
182
|
timeoutTimer = setTimeout(() => {
|
|
99
183
|
timedOut = true;
|
|
100
|
-
|
|
101
|
-
forceKillTimer = setTimeout(() => child.kill("SIGKILL"), 250);
|
|
184
|
+
terminate();
|
|
102
185
|
}, spec.timeoutMs);
|
|
186
|
+
if (spec.signal?.aborted)
|
|
187
|
+
cancel();
|
|
103
188
|
child.stdout?.setEncoding("utf8");
|
|
104
189
|
child.stdout?.on("data", (chunk) => {
|
|
105
190
|
stdout += chunk.toString();
|
|
@@ -113,12 +198,31 @@ export class ProcessRunner {
|
|
|
113
198
|
}
|
|
114
199
|
child.once("error", (error) => {
|
|
115
200
|
stderr += errorText(error);
|
|
116
|
-
finish("failed", null);
|
|
201
|
+
finish(cancelled ? (spec.mode === "work" ? "ambiguous" : "cancelled") : "failed", null);
|
|
117
202
|
});
|
|
118
203
|
child.once("close", (exitCode) => {
|
|
119
|
-
finish(
|
|
204
|
+
finish(cancelled
|
|
205
|
+
? spec.mode === "work"
|
|
206
|
+
? "ambiguous"
|
|
207
|
+
: "cancelled"
|
|
208
|
+
: timedOut
|
|
209
|
+
? "timed_out"
|
|
210
|
+
: exitCode === 0
|
|
211
|
+
? "succeeded"
|
|
212
|
+
: "failed", exitCode);
|
|
120
213
|
});
|
|
121
214
|
});
|
|
215
|
+
if (spawnedPid !== undefined) {
|
|
216
|
+
try {
|
|
217
|
+
await hooks.onSpawn?.(spawnedPid);
|
|
218
|
+
}
|
|
219
|
+
catch (error) {
|
|
220
|
+
cancelSpawned?.();
|
|
221
|
+
await completion;
|
|
222
|
+
throw error;
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
return completion;
|
|
122
226
|
}
|
|
123
227
|
}
|
|
124
228
|
//# sourceMappingURL=process-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-runner.js","sourceRoot":"","sources":["../../../src/runners/process-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-runner.js","sourceRoot":"","sources":["../../../src/runners/process-runner.ts"],"names":[],"mappings":"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"}
|