@mycompbox/compbox-cli 1.21.5 → 1.21.7
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/.tsbuildinfo +1 -1
- package/commands/run.d.ts +46 -1
- package/commands/run.d.ts.map +1 -1
- package/commands/run.js +140 -13
- package/commands/run.js.map +1 -1
- package/commands/workspace.d.ts.map +1 -1
- package/commands/workspace.js +43 -1
- package/commands/workspace.js.map +1 -1
- package/index.js +439 -48
- package/package.json +1 -1
- package/utils/agent-invoker.d.ts +33 -1
- package/utils/agent-invoker.d.ts.map +1 -1
- package/utils/agent-invoker.js +151 -17
- package/utils/agent-invoker.js.map +1 -1
- package/utils/mailbox-client.d.ts +27 -1
- package/utils/mailbox-client.d.ts.map +1 -1
- package/utils/mailbox-client.js +28 -3
- package/utils/mailbox-client.js.map +1 -1
- package/utils/process-group.d.ts +42 -0
- package/utils/process-group.d.ts.map +1 -0
- package/utils/process-group.js +127 -0
- package/utils/process-group.js.map +1 -0
- package/utils/run-workspace.d.ts +18 -1
- package/utils/run-workspace.d.ts.map +1 -1
- package/utils/run-workspace.js +57 -6
- package/utils/run-workspace.js.map +1 -1
package/commands/run.d.ts
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
* ENG-123-2 failure banner surfaces the reason.
|
|
20
20
|
*/
|
|
21
21
|
import { Command } from 'commander';
|
|
22
|
-
import { type StartExecutionPayload } from '@mycompbox/shared';
|
|
22
|
+
import { type StartExecutionFix, type StartExecutionPayload } from '@mycompbox/shared';
|
|
23
23
|
import { MailboxClient, type MailboxJob } from '../utils/mailbox-client.js';
|
|
24
24
|
import { type AgentRuntimeProbe } from '../utils/claude-runtime.js';
|
|
25
25
|
export declare const IDLE_POLL_INTERVAL_MS = 15000;
|
|
@@ -88,11 +88,38 @@ export declare function runHeartbeatCycle(deps: {
|
|
|
88
88
|
* ENG-136 runtime-only wire shape is unchanged.
|
|
89
89
|
*/
|
|
90
90
|
servicedRemotes?: string[];
|
|
91
|
+
/** Receives the heartbeat's `cancelJobIds` (ENG-300) — see handleCancelIds. */
|
|
92
|
+
onCancelJobIds?: (ids: readonly string[]) => void;
|
|
91
93
|
log?: (message: string) => void;
|
|
92
94
|
}): Promise<{
|
|
93
95
|
runtime: AgentRuntimeProbe | undefined;
|
|
94
96
|
sent: boolean;
|
|
95
97
|
}>;
|
|
98
|
+
/**
|
|
99
|
+
* Per-job cancel tracking for the daemon (ENG-300). Each in-flight job gets an
|
|
100
|
+
* AbortController; {@link CancelRegistry.handleCancelIds} — fed by EVERY
|
|
101
|
+
* heartbeat and next-job response — aborts the ones the server says are being
|
|
102
|
+
* cancelled. Unknown ids (already finished, or another machine's) are ignored,
|
|
103
|
+
* and a job is aborted at most once no matter how many responses repeat it.
|
|
104
|
+
*/
|
|
105
|
+
export declare class CancelRegistry {
|
|
106
|
+
private readonly log;
|
|
107
|
+
private readonly controllers;
|
|
108
|
+
constructor(log?: (message: string) => void);
|
|
109
|
+
/** Starts tracking a job; returns the signal its work should honor. */
|
|
110
|
+
register(jobId: string): AbortSignal;
|
|
111
|
+
/** Stops tracking a job (call from a `finally` so entries never leak). */
|
|
112
|
+
release(jobId: string): void;
|
|
113
|
+
/** Whether a job is currently tracked. */
|
|
114
|
+
has(jobId: string): boolean;
|
|
115
|
+
/** Number of tracked jobs. */
|
|
116
|
+
get size(): number;
|
|
117
|
+
/**
|
|
118
|
+
* Aborts every tracked job listed in `ids`. Returns the ids aborted by THIS
|
|
119
|
+
* call (already-aborted and unknown ids are skipped).
|
|
120
|
+
*/
|
|
121
|
+
handleCancelIds(ids: readonly string[]): string[];
|
|
122
|
+
}
|
|
96
123
|
/**
|
|
97
124
|
* Gather this machine's serviced git remotes for a heartbeat (ENG-177) — the
|
|
98
125
|
* canonical origin remotes of every checkout in the local allowlist. Read fresh
|
|
@@ -108,7 +135,25 @@ export interface HandleJobContext {
|
|
|
108
135
|
aiMode: string | undefined;
|
|
109
136
|
/** The user's own pairing API token (st_...) — separate from the machine token. */
|
|
110
137
|
userApiToken: string | undefined;
|
|
138
|
+
/**
|
|
139
|
+
* Receives `cancelJobIds` from heartbeats sent inside a job (ENG-300), so
|
|
140
|
+
* they reach the same handler as the poll loop's. Optional: omitted, they
|
|
141
|
+
* are simply dropped.
|
|
142
|
+
*/
|
|
143
|
+
onCancelJobIds?: (ids: readonly string[]) => void;
|
|
144
|
+
/**
|
|
145
|
+
* Aborted when the server lists this job in `cancelJobIds` (ENG-300). Set per
|
|
146
|
+
* job by the poll loop; the invokers kill the agent's process group on abort
|
|
147
|
+
* and the run workspace keeps the branch locally without pushing.
|
|
148
|
+
*/
|
|
149
|
+
signal?: AbortSignal;
|
|
111
150
|
}
|
|
151
|
+
/**
|
|
152
|
+
* A fix run's target (ENG-296), set only by the server: an open pull request's
|
|
153
|
+
* branch plus plain-language instructions. Returns undefined when malformed;
|
|
154
|
+
* the caller then refuses the job rather than running a full build instead.
|
|
155
|
+
*/
|
|
156
|
+
export declare function parseFix(raw: unknown): StartExecutionFix | undefined;
|
|
112
157
|
/**
|
|
113
158
|
* Parse a claimed job's `payload` into a {@link StartExecutionPayload}, or null
|
|
114
159
|
* if malformed. The mailbox delivers `payload` as `unknown` — already an object
|
package/commands/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,OAAO,EAAyB,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
package/commands/run.js
CHANGED
|
@@ -23,7 +23,7 @@ import chalk from 'chalk';
|
|
|
23
23
|
import { readConfig, applyPxpipeEnv, resolveProjectDirForJob, listProjectDirs, addProjectDir, unusedLegacyProjectDir, } from '../utils/config-store.js';
|
|
24
24
|
import { START_EXECUTION_KINDS } from '@mycompbox/shared';
|
|
25
25
|
import { retrieveSecret, MACHINE_TOKEN_ACCOUNT, AI_KEY_ACCOUNT, } from '../utils/keychain.js';
|
|
26
|
-
import { MailboxClient, MailboxClientError, } from '../utils/mailbox-client.js';
|
|
26
|
+
import { MailboxClient, MailboxClientError, parseCancelJobIds, } from '../utils/mailbox-client.js';
|
|
27
27
|
import { invokeEpicRequestStep, invokeStartExecutionPlan, invokeStartExecutionOrchestrate, invokeStartExecutionRefine, unregisteredRemoteMessage, noProjectRemoteMessage, } from '../utils/agent-invoker.js';
|
|
28
28
|
import { RunWorkspaceManager } from '../utils/run-workspace.js';
|
|
29
29
|
import { invokeConnectRepo } from '../utils/repo-setup.js';
|
|
@@ -154,19 +154,94 @@ export async function safeProbeAgentRuntime(probe, previous, log = (m) => { cons
|
|
|
154
154
|
*/
|
|
155
155
|
export async function runHeartbeatCycle(deps) {
|
|
156
156
|
const runtime = await safeProbeAgentRuntime(deps.probe, deps.previous, deps.log);
|
|
157
|
+
let result;
|
|
157
158
|
try {
|
|
158
159
|
if (deps.servicedRemotes !== undefined) {
|
|
159
|
-
await deps.client.heartbeat(deps.machineToken, runtime, deps.servicedRemotes);
|
|
160
|
+
result = await deps.client.heartbeat(deps.machineToken, runtime, deps.servicedRemotes);
|
|
160
161
|
}
|
|
161
162
|
else {
|
|
162
|
-
await deps.client.heartbeat(deps.machineToken, runtime);
|
|
163
|
+
result = await deps.client.heartbeat(deps.machineToken, runtime);
|
|
163
164
|
}
|
|
164
|
-
return { runtime, sent: true };
|
|
165
165
|
}
|
|
166
166
|
catch {
|
|
167
167
|
// Best-effort — the next successful next-job call will heartbeat anyway.
|
|
168
168
|
return { runtime, sent: false };
|
|
169
169
|
}
|
|
170
|
+
deps.onCancelJobIds?.(cancelIdsOf(result));
|
|
171
|
+
return { runtime, sent: true };
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* The `cancelJobIds` of a heartbeat / next-job result, or `[]` when the result
|
|
175
|
+
* (or the field) is missing — e.g. a test double that resolves `undefined`.
|
|
176
|
+
*/
|
|
177
|
+
function cancelIdsOf(result) {
|
|
178
|
+
return parseCancelJobIds(result);
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* Per-job cancel tracking for the daemon (ENG-300). Each in-flight job gets an
|
|
182
|
+
* AbortController; {@link CancelRegistry.handleCancelIds} — fed by EVERY
|
|
183
|
+
* heartbeat and next-job response — aborts the ones the server says are being
|
|
184
|
+
* cancelled. Unknown ids (already finished, or another machine's) are ignored,
|
|
185
|
+
* and a job is aborted at most once no matter how many responses repeat it.
|
|
186
|
+
*/
|
|
187
|
+
export class CancelRegistry {
|
|
188
|
+
log;
|
|
189
|
+
controllers = new Map();
|
|
190
|
+
constructor(log = (m) => {
|
|
191
|
+
console.log(m);
|
|
192
|
+
}) {
|
|
193
|
+
this.log = log;
|
|
194
|
+
}
|
|
195
|
+
/** Starts tracking a job; returns the signal its work should honor. */
|
|
196
|
+
register(jobId) {
|
|
197
|
+
const controller = new AbortController();
|
|
198
|
+
this.controllers.set(jobId, controller);
|
|
199
|
+
return controller.signal;
|
|
200
|
+
}
|
|
201
|
+
/** Stops tracking a job (call from a `finally` so entries never leak). */
|
|
202
|
+
release(jobId) {
|
|
203
|
+
this.controllers.delete(jobId);
|
|
204
|
+
}
|
|
205
|
+
/** Whether a job is currently tracked. */
|
|
206
|
+
has(jobId) {
|
|
207
|
+
return this.controllers.has(jobId);
|
|
208
|
+
}
|
|
209
|
+
/** Number of tracked jobs. */
|
|
210
|
+
get size() {
|
|
211
|
+
return this.controllers.size;
|
|
212
|
+
}
|
|
213
|
+
/**
|
|
214
|
+
* Aborts every tracked job listed in `ids`. Returns the ids aborted by THIS
|
|
215
|
+
* call (already-aborted and unknown ids are skipped).
|
|
216
|
+
*/
|
|
217
|
+
handleCancelIds(ids) {
|
|
218
|
+
const aborted = [];
|
|
219
|
+
for (const id of ids) {
|
|
220
|
+
const controller = this.controllers.get(id);
|
|
221
|
+
if (!controller || controller.signal.aborted)
|
|
222
|
+
continue;
|
|
223
|
+
controller.abort(new Error('Job cancelled'));
|
|
224
|
+
aborted.push(id);
|
|
225
|
+
this.log(chalk.yellow(` Job ${id}: cancel requested — stopping it.`));
|
|
226
|
+
}
|
|
227
|
+
return aborted;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
/**
|
|
231
|
+
* A heartbeat sent from inside a job (keep-alive during long runs, or the
|
|
232
|
+
* folder report after connect_repo). Best-effort: errors are swallowed. Its
|
|
233
|
+
* `cancelJobIds` go to the same handler as the poll loop's (ENG-300).
|
|
234
|
+
*/
|
|
235
|
+
async function jobHeartbeat(ctx, servicedRemotes) {
|
|
236
|
+
try {
|
|
237
|
+
const result = servicedRemotes !== undefined
|
|
238
|
+
? await ctx.client.heartbeat(ctx.machineToken, undefined, servicedRemotes)
|
|
239
|
+
: await ctx.client.heartbeat(ctx.machineToken);
|
|
240
|
+
ctx.onCancelJobIds?.(cancelIdsOf(result));
|
|
241
|
+
}
|
|
242
|
+
catch {
|
|
243
|
+
// Best-effort — the poll loop heartbeats on its own cadence too.
|
|
244
|
+
}
|
|
170
245
|
}
|
|
171
246
|
/**
|
|
172
247
|
* Gather this machine's serviced git remotes for a heartbeat (ENG-177) — the
|
|
@@ -178,6 +253,23 @@ export async function runHeartbeatCycle(deps) {
|
|
|
178
253
|
export function gatherServicedRemotes() {
|
|
179
254
|
return listProjectDirs().map((dir) => dir.remote);
|
|
180
255
|
}
|
|
256
|
+
/**
|
|
257
|
+
* A fix run's target (ENG-296), set only by the server: an open pull request's
|
|
258
|
+
* branch plus plain-language instructions. Returns undefined when malformed;
|
|
259
|
+
* the caller then refuses the job rather than running a full build instead.
|
|
260
|
+
*/
|
|
261
|
+
export function parseFix(raw) {
|
|
262
|
+
if (!raw || typeof raw !== 'object')
|
|
263
|
+
return undefined;
|
|
264
|
+
const f = raw;
|
|
265
|
+
const branch = typeof f.branch === 'string' ? f.branch.trim() : '';
|
|
266
|
+
const instructions = typeof f.instructions === 'string' ? f.instructions.trim() : '';
|
|
267
|
+
if (!instructions || !/^[A-Za-z0-9._/-]+$/.test(branch) || branch.startsWith('-') || branch.includes('..')) {
|
|
268
|
+
return undefined;
|
|
269
|
+
}
|
|
270
|
+
const pullRequestUrl = typeof f.pullRequestUrl === 'string' && f.pullRequestUrl.startsWith('https://') ? f.pullRequestUrl : undefined;
|
|
271
|
+
return { branch, instructions, ...(pullRequestUrl && { pullRequestUrl }) };
|
|
272
|
+
}
|
|
181
273
|
/**
|
|
182
274
|
* Parse a claimed job's `payload` into a {@link StartExecutionPayload}, or null
|
|
183
275
|
* if malformed. The mailbox delivers `payload` as `unknown` — already an object
|
|
@@ -209,10 +301,25 @@ export function parseStartExecutionPayload(payload) {
|
|
|
209
301
|
: undefined;
|
|
210
302
|
const useAiKey = p.useAiKey === true;
|
|
211
303
|
if (p.kind === 'plan' && typeof p.epicRequestId === 'string' && p.epicRequestId.length > 0) {
|
|
212
|
-
return {
|
|
304
|
+
return {
|
|
305
|
+
kind: 'plan',
|
|
306
|
+
epicRequestId: p.epicRequestId,
|
|
307
|
+
...(projectRemote && { projectRemote }),
|
|
308
|
+
...(useAiKey && { useAiKey }),
|
|
309
|
+
};
|
|
213
310
|
}
|
|
214
311
|
if (p.kind === 'orchestrate' && typeof p.epicId === 'string' && p.epicId.length > 0) {
|
|
215
|
-
|
|
312
|
+
const fix = parseFix(p.fix);
|
|
313
|
+
// A fix job that can't be read must never fall back to building the whole epic.
|
|
314
|
+
if (p.fix !== undefined && !fix)
|
|
315
|
+
return null;
|
|
316
|
+
return {
|
|
317
|
+
kind: 'orchestrate',
|
|
318
|
+
epicId: p.epicId,
|
|
319
|
+
...(projectRemote && { projectRemote }),
|
|
320
|
+
...(useAiKey && { useAiKey }),
|
|
321
|
+
...(fix && { fix }),
|
|
322
|
+
};
|
|
216
323
|
}
|
|
217
324
|
if (p.kind === 'refine' && typeof p.epicId === 'string' && p.epicId.length > 0) {
|
|
218
325
|
// ENG-289: notes are optional; a non-string value is dropped rather than failing the job.
|
|
@@ -286,6 +393,7 @@ export async function handleStartExecution(ctx, job) {
|
|
|
286
393
|
mailboxClient: ctx.client,
|
|
287
394
|
machineToken: ctx.machineToken,
|
|
288
395
|
jobId: job.id,
|
|
396
|
+
...(ctx.signal && { signal: ctx.signal }),
|
|
289
397
|
apiBaseUrl: ctx.apiBaseUrl,
|
|
290
398
|
userApiToken,
|
|
291
399
|
epicRequestId: payload.epicRequestId,
|
|
@@ -294,7 +402,7 @@ export async function handleStartExecution(ctx, job) {
|
|
|
294
402
|
}, {
|
|
295
403
|
// H4: keep this machine online during the long planner run — the poll
|
|
296
404
|
// loop (its own heartbeat) is blocked for the whole job.
|
|
297
|
-
heartbeat: () =>
|
|
405
|
+
heartbeat: () => jobHeartbeat(ctx),
|
|
298
406
|
}));
|
|
299
407
|
return;
|
|
300
408
|
}
|
|
@@ -309,6 +417,7 @@ export async function handleStartExecution(ctx, job) {
|
|
|
309
417
|
mailboxClient: ctx.client,
|
|
310
418
|
machineToken: ctx.machineToken,
|
|
311
419
|
jobId: job.id,
|
|
420
|
+
...(ctx.signal && { signal: ctx.signal }),
|
|
312
421
|
apiBaseUrl: ctx.apiBaseUrl,
|
|
313
422
|
userApiToken,
|
|
314
423
|
epicId: payload.epicId,
|
|
@@ -316,7 +425,7 @@ export async function handleStartExecution(ctx, job) {
|
|
|
316
425
|
projectDir: jobProjectDir,
|
|
317
426
|
...(keyRun && { keyRun }),
|
|
318
427
|
}, {
|
|
319
|
-
heartbeat: () =>
|
|
428
|
+
heartbeat: () => jobHeartbeat(ctx),
|
|
320
429
|
}));
|
|
321
430
|
return;
|
|
322
431
|
}
|
|
@@ -332,13 +441,15 @@ export async function handleStartExecution(ctx, job) {
|
|
|
332
441
|
mailboxClient: ctx.client,
|
|
333
442
|
machineToken: ctx.machineToken,
|
|
334
443
|
jobId: job.id,
|
|
444
|
+
...(ctx.signal && { signal: ctx.signal }),
|
|
335
445
|
epicId: payload.epicId,
|
|
336
446
|
projectDir: jobProjectDir,
|
|
337
447
|
...(keyRun && { keyRun }),
|
|
448
|
+
...(payload.fix && { fix: payload.fix }),
|
|
338
449
|
}, {
|
|
339
450
|
// H4: keep this machine online during the long orchestrator run — the
|
|
340
451
|
// poll loop (its own heartbeat) is blocked for the whole job.
|
|
341
|
-
heartbeat: () =>
|
|
452
|
+
heartbeat: () => jobHeartbeat(ctx),
|
|
342
453
|
// Own branch + worktree per run, finishing with a pull request (opened
|
|
343
454
|
// through CompBox's GitHub app when the project is connected to it).
|
|
344
455
|
workspace: new RunWorkspaceManager({
|
|
@@ -410,7 +521,7 @@ async function handleJob(ctx, job) {
|
|
|
410
521
|
const outcome = await invokeConnectRepo(job.payload);
|
|
411
522
|
// Report the new folder right away so the web shows it as ready.
|
|
412
523
|
if (outcome.status === 'done') {
|
|
413
|
-
await
|
|
524
|
+
await jobHeartbeat(ctx, gatherServicedRemotes());
|
|
414
525
|
}
|
|
415
526
|
return outcome;
|
|
416
527
|
});
|
|
@@ -473,12 +584,19 @@ export const runCommand = new Command('run')
|
|
|
473
584
|
}
|
|
474
585
|
const waitMs = options.waitMs ? Number.parseInt(options.waitMs, 10) : POLL_WAIT_MS;
|
|
475
586
|
const client = new MailboxClient(config.apiBaseUrl);
|
|
587
|
+
// Cancel (ENG-300): one AbortController per in-flight job. EVERY heartbeat
|
|
588
|
+
// and next-job response feeds its `cancelJobIds` into this one handler.
|
|
589
|
+
const cancels = new CancelRegistry();
|
|
590
|
+
const handleCancelIds = (ids) => {
|
|
591
|
+
cancels.handleCancelIds(ids);
|
|
592
|
+
};
|
|
476
593
|
const jobContext = {
|
|
477
594
|
client,
|
|
478
595
|
machineToken,
|
|
479
596
|
apiBaseUrl: config.apiBaseUrl,
|
|
480
597
|
aiMode: config.aiMode,
|
|
481
598
|
userApiToken: config.apiToken,
|
|
599
|
+
onCancelJobIds: handleCancelIds,
|
|
482
600
|
};
|
|
483
601
|
const folders = config.projectDirs ?? [];
|
|
484
602
|
const legacyDir = unusedLegacyProjectDir(config);
|
|
@@ -527,8 +645,9 @@ export const runCommand = new Command('run')
|
|
|
527
645
|
try {
|
|
528
646
|
// Report the serviced-remotes allowlist (ENG-177) alongside the startup
|
|
529
647
|
// runtime status so the machine's routable repos appear immediately.
|
|
530
|
-
await client.heartbeat(machineToken, agentRuntime, gatherServicedRemotes());
|
|
648
|
+
const result = await client.heartbeat(machineToken, agentRuntime, gatherServicedRemotes());
|
|
531
649
|
lastRuntimeSentAt = Date.now();
|
|
650
|
+
handleCancelIds(cancelIdsOf(result));
|
|
532
651
|
}
|
|
533
652
|
catch {
|
|
534
653
|
// Best-effort — the loop below re-sends on its own cadence.
|
|
@@ -567,10 +686,14 @@ export const runCommand = new Command('run')
|
|
|
567
686
|
const inFlight = new Map();
|
|
568
687
|
do {
|
|
569
688
|
let job = null;
|
|
689
|
+
// Cancels from this poll — applied after any new job is registered.
|
|
690
|
+
let pollCancelIds = [];
|
|
570
691
|
try {
|
|
571
692
|
// At capacity: don't ask for more work, just keep the heartbeat going.
|
|
572
693
|
if (inFlight.size < maxJobs) {
|
|
573
|
-
|
|
694
|
+
const polled = await client.pollNextJob(machineToken, waitMs, [...inFlight.keys()]);
|
|
695
|
+
job = polled.job;
|
|
696
|
+
pollCancelIds = polled.cancelJobIds;
|
|
574
697
|
}
|
|
575
698
|
consecutiveErrors = 0;
|
|
576
699
|
// next-job refreshes lastSeenAt server-side (machine-auth); the runtime
|
|
@@ -594,12 +717,14 @@ export const runCommand = new Command('run')
|
|
|
594
717
|
if (job) {
|
|
595
718
|
const jobId = job.id;
|
|
596
719
|
const isConversation = job.type === 'epic_request';
|
|
597
|
-
const
|
|
720
|
+
const signal = cancels.register(jobId);
|
|
721
|
+
const work = handleJob({ ...jobContext, signal }, job)
|
|
598
722
|
.catch((error) => {
|
|
599
723
|
console.error(chalk.red(` Job ${jobId} stopped unexpectedly: ${error instanceof Error ? error.message : String(error)}`));
|
|
600
724
|
})
|
|
601
725
|
.finally(() => {
|
|
602
726
|
inFlight.delete(jobId);
|
|
727
|
+
cancels.release(jobId);
|
|
603
728
|
// Stamped AFTER the job finishes: the warm window should measure quiet
|
|
604
729
|
// time since work ended, not since it started (a long run would
|
|
605
730
|
// otherwise expire its own window while still executing).
|
|
@@ -609,6 +734,7 @@ export const runCommand = new Command('run')
|
|
|
609
734
|
});
|
|
610
735
|
inFlight.set(jobId, work);
|
|
611
736
|
}
|
|
737
|
+
handleCancelIds(pollCancelIds);
|
|
612
738
|
// Agent-runtime heartbeat (ENG-136): refresh the cached probe and re-send
|
|
613
739
|
// the status on its OWN cadence, independent of next-job. `lastRuntimeSentAt`
|
|
614
740
|
// is advanced ONLY when a runtime heartbeat is actually sent (never by
|
|
@@ -624,6 +750,7 @@ export const runCommand = new Command('run')
|
|
|
624
750
|
// Re-read the allowlist each cycle so `machines dirs` edits between
|
|
625
751
|
// polls are reflected without a daemon restart (ENG-177).
|
|
626
752
|
servicedRemotes: gatherServicedRemotes(),
|
|
753
|
+
onCancelJobIds: handleCancelIds,
|
|
627
754
|
});
|
|
628
755
|
agentRuntime = cycle.runtime;
|
|
629
756
|
if (cycle.sent) {
|
package/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,EAAE,aAAa,EAAmB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EACL,+BAA+B,EAC/B,wBAAwB,EACxB,0BAA0B,EAE3B,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,EAAE,aAAa,EAAmB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EACL,+BAA+B,EAC/B,wBAAwB,EACxB,0BAA0B,EAE3B,MAAM,2BAA2B,CAAC;AAKnC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,YAAY,GAAG,IAAI,CAM1F;AAsBD,8DAA8D;AAC9D,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAS7E,yFAAyF;AACzF,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,SAAiB,GAAG,MAAM,CAShG;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,wBAAwB,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,+BAA+B,CAAC;IACrD,MAAM,CAAC,EAAE,OAAO,0BAA0B,CAAC;IAC3C,MAAM,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,aAAa,GAAG,UAAU,GAAG,WAAW,GAAG,iBAAiB,CAAC,CAAC;CACxG;AAED,mEAAmE;AACnE,wBAAsB,YAAY,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4J5E;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAM9J;AAED,eAAO,MAAM,gBAAgB,SAAiG,CAAC"}
|
package/commands/workspace.js
CHANGED
|
@@ -25,6 +25,8 @@ import { join } from 'node:path';
|
|
|
25
25
|
import { MailboxClient } from '../utils/mailbox-client.js';
|
|
26
26
|
import { invokeStartExecutionOrchestrate, invokeStartExecutionPlan, invokeStartExecutionRefine, } from '../utils/agent-invoker.js';
|
|
27
27
|
import { RunWorkspaceManager } from '../utils/run-workspace.js';
|
|
28
|
+
import { cancelledRunResult } from '../utils/process-group.js';
|
|
29
|
+
import { parseFix } from './run.js';
|
|
28
30
|
export function readWorkspaceEnv(env = process.env) {
|
|
29
31
|
const apiUrl = env.COMPBOX_API_URL?.trim();
|
|
30
32
|
const jobId = env.COMPBOX_JOB_ID?.trim();
|
|
@@ -86,6 +88,12 @@ export async function runWorkspace(deps = {}) {
|
|
|
86
88
|
return 1;
|
|
87
89
|
};
|
|
88
90
|
const payload = (job.payload ?? {});
|
|
91
|
+
// A fix run (ENG-296) targets an open pull request's branch; one that can't be
|
|
92
|
+
// read is refused rather than run as a full build of the epic.
|
|
93
|
+
const fix = payload.kind === 'orchestrate' ? parseFix(payload.fix) : undefined;
|
|
94
|
+
if (payload.fix !== undefined && !fix) {
|
|
95
|
+
return fail("This fix job's pull request details couldn't be read, so nothing was run.");
|
|
96
|
+
}
|
|
89
97
|
const repoDir = join(workDir, 'repo');
|
|
90
98
|
let userApiToken;
|
|
91
99
|
let keyRun;
|
|
@@ -112,7 +120,35 @@ export async function runWorkspace(deps = {}) {
|
|
|
112
120
|
catch (error) {
|
|
113
121
|
return fail(`Setting up the cloud workspace failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
114
122
|
}
|
|
115
|
-
|
|
123
|
+
// ENG-301: the server lists this job in a heartbeat's `cancelJobIds` once the
|
|
124
|
+
// person cancels it on the website. Aborting stops the agent and (orchestrate)
|
|
125
|
+
// keeps RunWorkspaceManager from pushing or opening a pull request — the
|
|
126
|
+
// backstop for when Cloud Run's own :cancel didn't stop the container.
|
|
127
|
+
const controller = new AbortController();
|
|
128
|
+
const heartbeat = () => client
|
|
129
|
+
.heartbeat(env.token)
|
|
130
|
+
.then((res) => {
|
|
131
|
+
const ids = res?.cancelJobIds;
|
|
132
|
+
if (Array.isArray(ids) && ids.includes(job.id) && !controller.signal.aborted) {
|
|
133
|
+
controller.abort(new Error('Job cancelled'));
|
|
134
|
+
}
|
|
135
|
+
})
|
|
136
|
+
.catch(() => undefined);
|
|
137
|
+
// Read through a function: heartbeats inside the run can flip it at any time.
|
|
138
|
+
const cancelled = () => controller.signal.aborted;
|
|
139
|
+
const finishCancelled = async () => {
|
|
140
|
+
const { result } = cancelledRunResult('workspace');
|
|
141
|
+
// A completion of a 'cancelling' job is recorded as 'cancelled' by the server.
|
|
142
|
+
await client.completeJob(env.token, job.id, 'failed', result).catch(() => undefined);
|
|
143
|
+
console.log(chalk.yellow('Cancelled.'));
|
|
144
|
+
return 1;
|
|
145
|
+
};
|
|
146
|
+
// Setup runs synchronous git/npm steps, so check once before any agent starts:
|
|
147
|
+
// a job cancelled during clone/install never runs at all.
|
|
148
|
+
await heartbeat();
|
|
149
|
+
if (cancelled())
|
|
150
|
+
return finishCancelled();
|
|
151
|
+
const signal = controller.signal;
|
|
116
152
|
let outcome;
|
|
117
153
|
if (payload.kind === 'plan' && payload.epicRequestId) {
|
|
118
154
|
outcome = await (deps.plan ?? invokeStartExecutionPlan)({
|
|
@@ -124,6 +160,7 @@ export async function runWorkspace(deps = {}) {
|
|
|
124
160
|
epicRequestId: payload.epicRequestId,
|
|
125
161
|
projectDir: repoDir,
|
|
126
162
|
keyRun,
|
|
163
|
+
signal,
|
|
127
164
|
}, { heartbeat });
|
|
128
165
|
}
|
|
129
166
|
else if (payload.kind === 'orchestrate' && payload.epicId) {
|
|
@@ -134,6 +171,8 @@ export async function runWorkspace(deps = {}) {
|
|
|
134
171
|
epicId: payload.epicId,
|
|
135
172
|
projectDir: repoDir,
|
|
136
173
|
keyRun,
|
|
174
|
+
signal,
|
|
175
|
+
...(fix && { fix }),
|
|
137
176
|
}, {
|
|
138
177
|
heartbeat,
|
|
139
178
|
workspace: new RunWorkspaceManager({
|
|
@@ -153,11 +192,14 @@ export async function runWorkspace(deps = {}) {
|
|
|
153
192
|
notes: typeof payload.notes === 'string' ? payload.notes : undefined,
|
|
154
193
|
projectDir: repoDir,
|
|
155
194
|
keyRun,
|
|
195
|
+
signal,
|
|
156
196
|
}, { heartbeat });
|
|
157
197
|
}
|
|
158
198
|
else {
|
|
159
199
|
return fail('The job is missing what to plan or build.');
|
|
160
200
|
}
|
|
201
|
+
if (cancelled())
|
|
202
|
+
return finishCancelled();
|
|
161
203
|
await client.completeJob(env.token, job.id, outcome.status, outcome.result);
|
|
162
204
|
console.log(outcome.status === 'done' ? chalk.green('Finished.') : chalk.yellow(`Stopped: ${JSON.stringify(outcome.result)}`));
|
|
163
205
|
return outcome.status === 'done' ? 0 : 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAmB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EACL,+BAA+B,EAC/B,wBAAwB,EACxB,0BAA0B,GAE3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"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"}
|