cueline 0.1.2 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude-plugin/plugin.json +1 -1
- package/.codex-plugin/plugin.json +1 -1
- package/CHANGELOG.md +17 -0
- package/README.ja.md +15 -6
- package/README.ko.md +15 -6
- package/README.md +15 -6
- package/README.zh-CN.md +15 -6
- package/README.zh-TW.md +15 -6
- package/dist/src/api.d.ts +23 -1
- package/dist/src/api.js +110 -6
- package/dist/src/api.js.map +1 -1
- package/dist/src/browser/browser-adapter.d.ts +1 -0
- package/dist/src/browser/codex-iab/bootstrap.d.ts +6 -0
- package/dist/src/browser/codex-iab/bootstrap.js.map +1 -1
- package/dist/src/browser/codex-iab/chatgpt-client.js +138 -41
- package/dist/src/browser/codex-iab/chatgpt-client.js.map +1 -1
- package/dist/src/cli/main.js +150 -8
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/core/controller-loop.d.ts +6 -0
- package/dist/src/core/controller-loop.js +240 -74
- package/dist/src/core/controller-loop.js.map +1 -1
- package/dist/src/core/run-status.d.ts +50 -0
- package/dist/src/core/run-status.js +169 -0
- package/dist/src/core/run-status.js.map +1 -0
- package/dist/src/core/state-machine.d.ts +2 -1
- package/dist/src/core/state-machine.js +22 -1
- package/dist/src/core/state-machine.js.map +1 -1
- package/dist/src/jobs/status.d.ts +6 -0
- package/dist/src/jobs/status.js.map +1 -1
- package/dist/src/jobs/supervisor.d.ts +2 -0
- package/dist/src/jobs/supervisor.js +44 -12
- 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.js +7 -1
- 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 +56 -5
- 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/cancellation.d.ts +42 -0
- package/dist/src/state/cancellation.js +160 -0
- package/dist/src/state/cancellation.js.map +1 -0
- package/dist/src/state/paths.d.ts +3 -0
- package/dist/src/state/paths.js +3 -0
- package/dist/src/state/paths.js.map +1 -1
- package/dist/src/state/runtime-lease.d.ts +28 -0
- package/dist/src/state/runtime-lease.js +179 -0
- package/dist/src/state/runtime-lease.js.map +1 -0
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.js +1 -1
- package/docs/compatibility.md +3 -1
- package/docs/controller-protocol.md +4 -2
- package/docs/runner-contract.md +7 -1
- package/docs/state-and-recovery.md +34 -9
- package/package.json +3 -2
- package/schemas/controller-observation.schema.json +1 -1
- package/scripts/validate-plugin.mjs +66 -0
- package/skills/cueline/SKILL.md +33 -5
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { CueLineError } from "./errors.js";
|
|
2
|
+
const JOB_STATUSES = [
|
|
3
|
+
"pending",
|
|
4
|
+
"running",
|
|
5
|
+
"succeeded",
|
|
6
|
+
"failed",
|
|
7
|
+
"timed_out",
|
|
8
|
+
"cancelled",
|
|
9
|
+
"ambiguous",
|
|
10
|
+
];
|
|
11
|
+
const OBSERVED_JOB_STATUSES = [...JOB_STATUSES, "orphaned"];
|
|
12
|
+
export function acceptedControllerCommandEvidence(events) {
|
|
13
|
+
for (let index = events.length - 1; index >= 0; index -= 1) {
|
|
14
|
+
const event = events[index];
|
|
15
|
+
if (event?.type !== "controller_command_accepted")
|
|
16
|
+
continue;
|
|
17
|
+
const payload = event.payload;
|
|
18
|
+
const command = payload.command;
|
|
19
|
+
if (typeof command !== "object" || command === null || Array.isArray(command))
|
|
20
|
+
continue;
|
|
21
|
+
const record = command;
|
|
22
|
+
const action = record.action === "dispatch" ||
|
|
23
|
+
record.action === "wait" ||
|
|
24
|
+
record.action === "inspect" ||
|
|
25
|
+
record.action === "complete" ||
|
|
26
|
+
record.action === "blocked"
|
|
27
|
+
? record.action
|
|
28
|
+
: null;
|
|
29
|
+
if (action === null)
|
|
30
|
+
continue;
|
|
31
|
+
const jobs = Array.isArray(record.jobs) ? record.jobs : [];
|
|
32
|
+
return {
|
|
33
|
+
action,
|
|
34
|
+
requestId: typeof record.request_id === "string" ? record.request_id : null,
|
|
35
|
+
jobKeys: jobs.flatMap((job) => {
|
|
36
|
+
if (typeof job !== "object" || job === null || Array.isArray(job))
|
|
37
|
+
return [];
|
|
38
|
+
const jobKey = job.job_key;
|
|
39
|
+
return typeof jobKey === "string" ? [jobKey] : [];
|
|
40
|
+
}),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
return { action: null, requestId: null, jobKeys: [] };
|
|
44
|
+
}
|
|
45
|
+
function activeJobCount(state) {
|
|
46
|
+
return Object.values(state.jobs).filter((job) => job.status === "pending" || job.status === "running").length;
|
|
47
|
+
}
|
|
48
|
+
function safeNextActionFor(state, runtime, cancellation) {
|
|
49
|
+
if (state.status === "complete" || state.status === "blocked" || state.status === "cancelled") {
|
|
50
|
+
return "return_result";
|
|
51
|
+
}
|
|
52
|
+
if (cancellation.runRequested) {
|
|
53
|
+
return runtime.ownership === "active" ? "observe" : "inspect_runtime";
|
|
54
|
+
}
|
|
55
|
+
if (runtime.ownership === "active")
|
|
56
|
+
return "observe";
|
|
57
|
+
if (runtime.ownership === "stale" || runtime.ownership === "invalid") {
|
|
58
|
+
return "inspect_runtime";
|
|
59
|
+
}
|
|
60
|
+
if (state.status === "running")
|
|
61
|
+
return "inspect_runtime";
|
|
62
|
+
if (state.pendingControllerTurns.length > 0)
|
|
63
|
+
return "reconcile";
|
|
64
|
+
if (activeJobCount(state) > 0)
|
|
65
|
+
return "inspect_jobs_then_continue";
|
|
66
|
+
return "continue";
|
|
67
|
+
}
|
|
68
|
+
export function cueLineRunPhase(state, runtime, cancellation = { runRequested: false, jobRequests: [] }) {
|
|
69
|
+
if (state.status === "complete")
|
|
70
|
+
return "complete";
|
|
71
|
+
if (state.status === "blocked")
|
|
72
|
+
return "blocked";
|
|
73
|
+
if (state.status === "cancelled")
|
|
74
|
+
return "cancelled";
|
|
75
|
+
if (cancellation.runRequested)
|
|
76
|
+
return "cancellation_pending";
|
|
77
|
+
if (state.status === "failed" && runtime.ownership === "active")
|
|
78
|
+
return "runtime_active";
|
|
79
|
+
if (runtime.ownership === "stale")
|
|
80
|
+
return "runtime_stale";
|
|
81
|
+
if (state.status === "failed") {
|
|
82
|
+
if (state.pendingControllerTurns.length > 0)
|
|
83
|
+
return "reconciliation_required";
|
|
84
|
+
if (activeJobCount(state) > 0)
|
|
85
|
+
return "job_recovery_required";
|
|
86
|
+
return "resume_ready";
|
|
87
|
+
}
|
|
88
|
+
if (runtime.ownership !== "active")
|
|
89
|
+
return "runtime_ownership_unknown";
|
|
90
|
+
if (state.pendingControllerTurns.length > 0)
|
|
91
|
+
return "controller_response_pending";
|
|
92
|
+
if (activeJobCount(state) > 0)
|
|
93
|
+
return "jobs_running";
|
|
94
|
+
if (state.commandHashes.length > 0)
|
|
95
|
+
return "controller_decision_pending";
|
|
96
|
+
return "starting";
|
|
97
|
+
}
|
|
98
|
+
export function assertRunCanContinue(state, runtime, cancellation = { runRequested: false, jobRequests: [] }) {
|
|
99
|
+
if (cancellation.runRequested) {
|
|
100
|
+
throw new CueLineError("RUN_CANCELLATION_PENDING", `CueLine run '${state.runId}' has a durable cancellation request; continuation is forbidden.`, { details: { run_id: state.runId, phase: "cancellation_pending" } });
|
|
101
|
+
}
|
|
102
|
+
const inspect = `Inspect it with 'cueline run status ${state.runId} --json'; do not resend it.`;
|
|
103
|
+
if (runtime.ownership === "active") {
|
|
104
|
+
throw new CueLineError("RUN_ALREADY_ACTIVE", `CueLine run '${state.runId}' still has an active controller loop. ${inspect}`, { details: { run_id: state.runId, phase: cueLineRunPhase(state, runtime) } });
|
|
105
|
+
}
|
|
106
|
+
if (runtime.ownership === "stale") {
|
|
107
|
+
throw new CueLineError("RUN_STALE_REQUIRES_TAKEOVER", `CueLine run '${state.runId}' stopped heartbeating; explicit recovery is required. ${inspect}`, { details: { run_id: state.runId, phase: cueLineRunPhase(state, runtime) } });
|
|
108
|
+
}
|
|
109
|
+
if (runtime.ownership === "invalid") {
|
|
110
|
+
throw new CueLineError("RUNTIME_LEASE_INVALID", `CueLine run '${state.runId}' has unreadable runtime ownership evidence. ${inspect}`, { details: { run_id: state.runId, phase: cueLineRunPhase(state, runtime) } });
|
|
111
|
+
}
|
|
112
|
+
if (state.status !== "running")
|
|
113
|
+
return;
|
|
114
|
+
throw new CueLineError("RUN_OWNERSHIP_UNVERIFIED", `CueLine run '${state.runId}' is marked running but has no verifiable active owner. ${inspect}`, { details: { run_id: state.runId, phase: cueLineRunPhase(state, runtime) } });
|
|
115
|
+
}
|
|
116
|
+
export function summarizeCueLineRunState(state, lastEventSequence, runtime, cancellation = { runRequested: false, jobRequests: [] }, acceptedCommand = {
|
|
117
|
+
action: null,
|
|
118
|
+
requestId: null,
|
|
119
|
+
jobKeys: [],
|
|
120
|
+
}) {
|
|
121
|
+
const counts = Object.fromEntries(OBSERVED_JOB_STATUSES.map((status) => [status, 0]));
|
|
122
|
+
const items = Object.values(state.jobs).map((job) => {
|
|
123
|
+
const status = (job.status === "pending" || job.status === "running") &&
|
|
124
|
+
runtime.ownership !== "active"
|
|
125
|
+
? "orphaned"
|
|
126
|
+
: job.status;
|
|
127
|
+
counts[status] += 1;
|
|
128
|
+
return {
|
|
129
|
+
jobId: job.jobId,
|
|
130
|
+
jobKey: job.jobKey,
|
|
131
|
+
required: job.required,
|
|
132
|
+
lane: job.spec.lane,
|
|
133
|
+
mode: job.spec.mode,
|
|
134
|
+
status,
|
|
135
|
+
persistedStatus: job.status,
|
|
136
|
+
};
|
|
137
|
+
});
|
|
138
|
+
const phase = cueLineRunPhase(state, runtime, cancellation);
|
|
139
|
+
const continueAllowed = state.status === "failed" &&
|
|
140
|
+
!cancellation.runRequested &&
|
|
141
|
+
(runtime.ownership === "missing" || runtime.ownership === "released");
|
|
142
|
+
const safeNextAction = safeNextActionFor(state, runtime, cancellation);
|
|
143
|
+
return {
|
|
144
|
+
runId: state.runId,
|
|
145
|
+
status: state.status,
|
|
146
|
+
phase,
|
|
147
|
+
round: state.round,
|
|
148
|
+
lastEventSequence,
|
|
149
|
+
runtime,
|
|
150
|
+
cancellation,
|
|
151
|
+
controller: {
|
|
152
|
+
pendingTurns: state.pendingControllerTurns.length,
|
|
153
|
+
acceptedCommands: state.commandHashes.length,
|
|
154
|
+
responseAccepted: acceptedCommand.action !== null ||
|
|
155
|
+
(state.pendingControllerTurns.length === 0 && state.commandHashes.length > 0),
|
|
156
|
+
lastAcceptedAction: acceptedCommand.action,
|
|
157
|
+
lastAcceptedRequestId: acceptedCommand.requestId,
|
|
158
|
+
lastAcceptedJobKeys: acceptedCommand.jobKeys,
|
|
159
|
+
},
|
|
160
|
+
jobs: {
|
|
161
|
+
total: items.length,
|
|
162
|
+
counts,
|
|
163
|
+
items,
|
|
164
|
+
},
|
|
165
|
+
continueAllowed,
|
|
166
|
+
safeNextAction,
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
//# sourceMappingURL=run-status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-status.js","sourceRoot":"","sources":["../../../src/core/run-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ControllerJobSpec, JobObservation } from "../protocol/types.js";
|
|
2
2
|
import type { RunEvent } from "../state/event-log.js";
|
|
3
|
-
export type CueLineRunStatus = "running" | "complete" | "blocked" | "failed";
|
|
3
|
+
export type CueLineRunStatus = "running" | "complete" | "blocked" | "cancelled" | "failed";
|
|
4
4
|
export type StoredJobStatus = JobObservation["status"];
|
|
5
5
|
export type ControllerSubmissionState = "requested" | "possibly_sent" | "submitted";
|
|
6
6
|
export interface PendingControllerTurn {
|
|
@@ -44,6 +44,7 @@ export interface CueLineRunState {
|
|
|
44
44
|
commandHashes: string[];
|
|
45
45
|
finalDeliveryText: string | null;
|
|
46
46
|
blockedReason: string | null;
|
|
47
|
+
cancelledReason: string | null;
|
|
47
48
|
}
|
|
48
49
|
export declare function initialRunState(runId: string, request: string): CueLineRunState;
|
|
49
50
|
export declare function reduceRunState(state: CueLineRunState, event: RunEvent): CueLineRunState;
|
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
const STORED_JOB_STATUSES = new Set([
|
|
2
|
+
"pending",
|
|
3
|
+
"running",
|
|
4
|
+
"succeeded",
|
|
5
|
+
"failed",
|
|
6
|
+
"timed_out",
|
|
7
|
+
"cancelled",
|
|
8
|
+
"ambiguous",
|
|
9
|
+
]);
|
|
1
10
|
function recordPayload(event) {
|
|
2
11
|
if (typeof event.payload !== "object" || event.payload === null || Array.isArray(event.payload)) {
|
|
3
12
|
return {};
|
|
@@ -18,6 +27,7 @@ export function initialRunState(runId, request) {
|
|
|
18
27
|
commandHashes: [],
|
|
19
28
|
finalDeliveryText: null,
|
|
20
29
|
blockedReason: null,
|
|
30
|
+
cancelledReason: null,
|
|
21
31
|
};
|
|
22
32
|
}
|
|
23
33
|
export function reduceRunState(state, event) {
|
|
@@ -122,8 +132,11 @@ export function reduceRunState(state, event) {
|
|
|
122
132
|
}
|
|
123
133
|
if (event.type === "job_status" && typeof payload.job_id === "string") {
|
|
124
134
|
const existing = state.jobs[payload.job_id];
|
|
125
|
-
if (!existing ||
|
|
135
|
+
if (!existing ||
|
|
136
|
+
typeof payload.status !== "string" ||
|
|
137
|
+
!STORED_JOB_STATUSES.has(payload.status)) {
|
|
126
138
|
return state;
|
|
139
|
+
}
|
|
127
140
|
const status = payload.status;
|
|
128
141
|
return {
|
|
129
142
|
...state,
|
|
@@ -155,6 +168,14 @@ export function reduceRunState(state, event) {
|
|
|
155
168
|
finalDeliveryText: typeof payload.final_delivery_text === "string" ? payload.final_delivery_text : null,
|
|
156
169
|
};
|
|
157
170
|
}
|
|
171
|
+
if (event.type === "run_cancelled" && typeof payload.reason === "string") {
|
|
172
|
+
return {
|
|
173
|
+
...state,
|
|
174
|
+
status: "cancelled",
|
|
175
|
+
pendingControllerTurns: [],
|
|
176
|
+
cancelledReason: payload.reason,
|
|
177
|
+
};
|
|
178
|
+
}
|
|
158
179
|
if (event.type === "run_failed") {
|
|
159
180
|
return {
|
|
160
181
|
...state,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-machine.js","sourceRoot":"","sources":["../../../src/core/state-machine.ts"],"names":[],"mappings":"
|
|
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
3
|
export type JobStatusKind = "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,12 +90,17 @@ 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,
|
|
103
|
+
...running.current,
|
|
73
104
|
status: "failed",
|
|
74
105
|
finishedAt: new Date().toISOString(),
|
|
75
106
|
error: errorText(error),
|
|
@@ -81,6 +112,7 @@ export class JobSupervisor {
|
|
|
81
112
|
}
|
|
82
113
|
finally {
|
|
83
114
|
this.#completions.delete(spec.jobId);
|
|
115
|
+
this.#cancellations.delete(spec.jobId);
|
|
84
116
|
release();
|
|
85
117
|
}
|
|
86
118
|
}
|
|
@@ -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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"}
|
|
@@ -18,7 +18,13 @@ function isAvailable(availability, candidate, lane) {
|
|
|
18
18
|
export function resolveRoute(lane, config, availability, requestedCandidateId) {
|
|
19
19
|
const laneConfig = config.lanes[lane];
|
|
20
20
|
if (laneConfig === undefined) {
|
|
21
|
-
|
|
21
|
+
const runnerLanes = Object.entries(config.lanes)
|
|
22
|
+
.filter(([, candidateLane]) => candidateLane.candidates.some((candidate) => candidate.id === lane))
|
|
23
|
+
.map(([name]) => name);
|
|
24
|
+
const correction = runnerLanes.length === 0
|
|
25
|
+
? ""
|
|
26
|
+
: ` '${lane}' is a runner ID; use lane '${runnerLanes[0]}' with runner '${lane}'.`;
|
|
27
|
+
throw new CueLineError("ROUTE_LANE_UNKNOWN", `unknown routing lane: ${lane}.${correction}`, { details: { lane, ...(runnerLanes.length === 0 ? {} : { runner_lanes: runnerLanes }) } });
|
|
22
28
|
}
|
|
23
29
|
if (!laneConfig.enabled) {
|
|
24
30
|
throw new CueLineError("ROUTE_LANE_DISABLED", `routing lane is disabled: ${lane}`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/router/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AASjD,SAAS,qBAAqB,CAAC,KAAwB;IACrD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,aAAa,IAAI,KAAK,CAAC;AAC/E,CAAC;AAED,SAAS,WAAW,CAAC,YAA+B,EAAE,SAAyB,EAAE,IAAY;IAC3F,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;QACvC,OAAO,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,qBAAqB,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,OAAO,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;AAC7C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,MAAqB,EACrB,YAA+B,EAC/B,oBAA6B;IAE7B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,
|
|
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
|
}
|