@mycompbox/compbox-cli 1.21.4 → 1.21.6
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 +7 -1
- package/commands/run.d.ts.map +1 -1
- package/commands/run.js +29 -1
- package/commands/run.js.map +1 -1
- package/commands/workspace.d.ts.map +1 -1
- package/commands/workspace.js +8 -0
- package/commands/workspace.js.map +1 -1
- package/index.js +133 -23
- package/package.json +1 -1
- package/utils/agent-invoker.d.ts +13 -1
- package/utils/agent-invoker.d.ts.map +1 -1
- package/utils/agent-invoker.js +44 -10
- package/utils/agent-invoker.js.map +1 -1
- package/utils/run-workspace.d.ts +21 -1
- package/utils/run-workspace.d.ts.map +1 -1
- package/utils/run-workspace.js +93 -12
- 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;
|
|
@@ -109,6 +109,12 @@ export interface HandleJobContext {
|
|
|
109
109
|
/** The user's own pairing API token (st_...) — separate from the machine token. */
|
|
110
110
|
userApiToken: string | undefined;
|
|
111
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* A fix run's target (ENG-296), set only by the server: an open pull request's
|
|
114
|
+
* branch plus plain-language instructions. Returns undefined when malformed;
|
|
115
|
+
* the caller then refuses the job rather than running a full build instead.
|
|
116
|
+
*/
|
|
117
|
+
export declare function parseFix(raw: unknown): StartExecutionFix | undefined;
|
|
112
118
|
/**
|
|
113
119
|
* Parse a claimed job's `payload` into a {@link StartExecutionPayload}, or null
|
|
114
120
|
* 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":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,OAAO,EAAyB,KAAK,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM9G,OAAO,EACL,aAAa,EAEb,KAAK,UAAU,EAChB,MAAM,4BAA4B,CAAC;AAepC,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAC;AA+BpC,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAM5C,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAC7C,eAAO,MAAM,gBAAgB,QAAS,CAAC;AAMvC,eAAO,MAAM,6BAA6B,OAAQ,CAAC;AACnD,eAAO,MAAM,sBAAsB,QAAc,CAAC;AAElD;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,kBAAkB,SAAI,GAAG,MAAM,CAKxF;AAED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,YAAY,qBAAqB,CAAC;AAE/C,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAI5E;AAeD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,MAAM,EACzB,UAAU,GAAE,MAA8B,GACzC,OAAO,CAET;AAUD;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,EACvC,QAAQ,EAAE,iBAAiB,GAAG,SAAS,EACvC,GAAG,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAA8C,GACvE,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAQxC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACxC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAarE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,mFAAmF;IACnF,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAIlC;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,GAAG,SAAS,CAWpE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,qBAAqB,GAAG,IAAI,CA4CzF;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA+IhG;AA8GD,eAAO,MAAM,UAAU,SAwPnB,CAAC"}
|
package/commands/run.js
CHANGED
|
@@ -178,6 +178,23 @@ export async function runHeartbeatCycle(deps) {
|
|
|
178
178
|
export function gatherServicedRemotes() {
|
|
179
179
|
return listProjectDirs().map((dir) => dir.remote);
|
|
180
180
|
}
|
|
181
|
+
/**
|
|
182
|
+
* A fix run's target (ENG-296), set only by the server: an open pull request's
|
|
183
|
+
* branch plus plain-language instructions. Returns undefined when malformed;
|
|
184
|
+
* the caller then refuses the job rather than running a full build instead.
|
|
185
|
+
*/
|
|
186
|
+
export function parseFix(raw) {
|
|
187
|
+
if (!raw || typeof raw !== 'object')
|
|
188
|
+
return undefined;
|
|
189
|
+
const f = raw;
|
|
190
|
+
const branch = typeof f.branch === 'string' ? f.branch.trim() : '';
|
|
191
|
+
const instructions = typeof f.instructions === 'string' ? f.instructions.trim() : '';
|
|
192
|
+
if (!instructions || !/^[A-Za-z0-9._/-]+$/.test(branch) || branch.startsWith('-') || branch.includes('..')) {
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
195
|
+
const pullRequestUrl = typeof f.pullRequestUrl === 'string' && f.pullRequestUrl.startsWith('https://') ? f.pullRequestUrl : undefined;
|
|
196
|
+
return { branch, instructions, ...(pullRequestUrl && { pullRequestUrl }) };
|
|
197
|
+
}
|
|
181
198
|
/**
|
|
182
199
|
* Parse a claimed job's `payload` into a {@link StartExecutionPayload}, or null
|
|
183
200
|
* if malformed. The mailbox delivers `payload` as `unknown` — already an object
|
|
@@ -212,7 +229,17 @@ export function parseStartExecutionPayload(payload) {
|
|
|
212
229
|
return { kind: 'plan', epicRequestId: p.epicRequestId, ...(projectRemote && { projectRemote }), ...(useAiKey && { useAiKey }) };
|
|
213
230
|
}
|
|
214
231
|
if (p.kind === 'orchestrate' && typeof p.epicId === 'string' && p.epicId.length > 0) {
|
|
215
|
-
|
|
232
|
+
const fix = parseFix(p.fix);
|
|
233
|
+
// A fix job that can't be read must never fall back to building the whole epic.
|
|
234
|
+
if (p.fix !== undefined && !fix)
|
|
235
|
+
return null;
|
|
236
|
+
return {
|
|
237
|
+
kind: 'orchestrate',
|
|
238
|
+
epicId: p.epicId,
|
|
239
|
+
...(projectRemote && { projectRemote }),
|
|
240
|
+
...(useAiKey && { useAiKey }),
|
|
241
|
+
...(fix && { fix }),
|
|
242
|
+
};
|
|
216
243
|
}
|
|
217
244
|
if (p.kind === 'refine' && typeof p.epicId === 'string' && p.epicId.length > 0) {
|
|
218
245
|
// ENG-289: notes are optional; a non-string value is dropped rather than failing the job.
|
|
@@ -335,6 +362,7 @@ export async function handleStartExecution(ctx, job) {
|
|
|
335
362
|
epicId: payload.epicId,
|
|
336
363
|
projectDir: jobProjectDir,
|
|
337
364
|
...(keyRun && { keyRun }),
|
|
365
|
+
...(payload.fix && { fix: payload.fix }),
|
|
338
366
|
}, {
|
|
339
367
|
// H4: keep this machine online during the long orchestrator run — the
|
|
340
368
|
// poll loop (its own heartbeat) is blocked for the whole job.
|
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;AAInC,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,CA2H5E;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,7 @@ 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 { parseFix } from './run.js';
|
|
28
29
|
export function readWorkspaceEnv(env = process.env) {
|
|
29
30
|
const apiUrl = env.COMPBOX_API_URL?.trim();
|
|
30
31
|
const jobId = env.COMPBOX_JOB_ID?.trim();
|
|
@@ -86,6 +87,12 @@ export async function runWorkspace(deps = {}) {
|
|
|
86
87
|
return 1;
|
|
87
88
|
};
|
|
88
89
|
const payload = (job.payload ?? {});
|
|
90
|
+
// A fix run (ENG-296) targets an open pull request's branch; one that can't be
|
|
91
|
+
// read is refused rather than run as a full build of the epic.
|
|
92
|
+
const fix = payload.kind === 'orchestrate' ? parseFix(payload.fix) : undefined;
|
|
93
|
+
if (payload.fix !== undefined && !fix) {
|
|
94
|
+
return fail("This fix job's pull request details couldn't be read, so nothing was run.");
|
|
95
|
+
}
|
|
89
96
|
const repoDir = join(workDir, 'repo');
|
|
90
97
|
let userApiToken;
|
|
91
98
|
let keyRun;
|
|
@@ -134,6 +141,7 @@ export async function runWorkspace(deps = {}) {
|
|
|
134
141
|
epicId: payload.epicId,
|
|
135
142
|
projectDir: repoDir,
|
|
136
143
|
keyRun,
|
|
144
|
+
...(fix && { fix }),
|
|
137
145
|
}, {
|
|
138
146
|
heartbeat,
|
|
139
147
|
workspace: new RunWorkspaceManager({
|
|
@@ -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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"}
|
package/index.js
CHANGED
|
@@ -8762,6 +8762,26 @@ ${stderr}`;
|
|
|
8762
8762
|
var ORCHESTRATOR_RUN_TIMEOUT_MS = 3 * 60 * 60 * 1e3;
|
|
8763
8763
|
var ORCHESTRATOR_HEARTBEAT_INTERVAL_MS = PLANNER_HEARTBEAT_INTERVAL_MS;
|
|
8764
8764
|
var HEADLESS_ORCHESTRATE_REMINDER = "This is a non-interactive run: do NOT start sub-agents or reviews in the background and do not end your turn to wait for them. Run every step in this process and keep going until every feature is done or a hard gate stops the run.";
|
|
8765
|
+
var FIX_RUN_RULES = [
|
|
8766
|
+
"You are making a focused change to an open pull request, in a checkout of its branch. This is a non-interactive run.",
|
|
8767
|
+
"- Do only what the instructions below ask. Do not execute the epic's plan or start other work.",
|
|
8768
|
+
"- Never force-push, rebase, reset or otherwise rewrite the branch's existing history.",
|
|
8769
|
+
"- Do not open a new pull request; commits pushed to this branch update the existing one.",
|
|
8770
|
+
"- Run the project's tests before finishing, and fix anything your change broke.",
|
|
8771
|
+
"- Do not start sub-agents or reviews in the background, and do not end your turn to wait for them."
|
|
8772
|
+
].join("\n");
|
|
8773
|
+
function buildFixArgs(fix) {
|
|
8774
|
+
return [
|
|
8775
|
+
"-p",
|
|
8776
|
+
`${FIX_RUN_RULES}
|
|
8777
|
+
|
|
8778
|
+
${fix.instructions}`,
|
|
8779
|
+
"--append-system-prompt",
|
|
8780
|
+
HEADLESS_ORCHESTRATE_REMINDER,
|
|
8781
|
+
"--permission-mode",
|
|
8782
|
+
"bypassPermissions"
|
|
8783
|
+
];
|
|
8784
|
+
}
|
|
8765
8785
|
var ORCHESTRATOR_FINAL_TURN_MAX_CHARS = 4e3;
|
|
8766
8786
|
function buildOrchestratorArgs(epicId) {
|
|
8767
8787
|
return [
|
|
@@ -8885,7 +8905,7 @@ async function invokeStartExecutionOrchestrate(ctx, deps = {}) {
|
|
|
8885
8905
|
let workspace = null;
|
|
8886
8906
|
let workspaceNotes = [];
|
|
8887
8907
|
if (deps.workspace) {
|
|
8888
|
-
const prepared = await deps.workspace.prepare(projectDir, ctx.epicId);
|
|
8908
|
+
const prepared = ctx.fix ? await deps.workspace.prepare(projectDir, ctx.epicId, { branch: ctx.fix.branch }) : await deps.workspace.prepare(projectDir, ctx.epicId);
|
|
8889
8909
|
if (!prepared.ok) {
|
|
8890
8910
|
return { status: "failed", result: { error: prepared.error } };
|
|
8891
8911
|
}
|
|
@@ -8895,7 +8915,8 @@ async function invokeStartExecutionOrchestrate(ctx, deps = {}) {
|
|
|
8895
8915
|
const runDir = workspace?.dir ?? projectDir;
|
|
8896
8916
|
const routing = await resolveRoutingImpl();
|
|
8897
8917
|
const command = resolveClaudeBinary() ?? "claude";
|
|
8898
|
-
const
|
|
8918
|
+
const runArgs = ctx.fix ? buildFixArgs(ctx.fix) : buildOrchestratorArgs(ctx.epicId);
|
|
8919
|
+
const args = ctx.keyRun ? keyRunArgs(runArgs) : runArgs;
|
|
8899
8920
|
const routedEnv = claudeSpawnEnv(process.env, routing);
|
|
8900
8921
|
const baseEnv = {
|
|
8901
8922
|
...routedEnv,
|
|
@@ -8910,7 +8931,7 @@ async function invokeStartExecutionOrchestrate(ctx, deps = {}) {
|
|
|
8910
8931
|
await ctx.mailboxClient.postTurn(
|
|
8911
8932
|
ctx.machineToken,
|
|
8912
8933
|
ctx.jobId,
|
|
8913
|
-
`Started the orchestrator for epic ${ctx.epicId} (headless, non-interactive). This executes the full epic \u2014 every phase and feature \u2014 and may take a long time.` + (workspace ? workspace.continued ? ` Continuing the earlier unfinished work on ${workspace.branch}, which ends as a pull request into ${workspace.baseBranch}.` : ` Working on a new branch, ${workspace.branch}, which will end as a pull request into ${workspace.baseBranch}.` : "") + (workspaceNotes.length > 0 ? ` Note: ${workspaceNotes.join(" ")}` : "")
|
|
8934
|
+
(ctx.fix ? `Started a fix run on the pull request's branch ${ctx.fix.branch}${ctx.fix.pullRequestUrl ? ` (${ctx.fix.pullRequestUrl})` : ""}. New commits are pushed to the same branch, so the existing pull request updates.` : `Started the orchestrator for epic ${ctx.epicId} (headless, non-interactive). This executes the full epic \u2014 every phase and feature \u2014 and may take a long time.` + (workspace ? workspace.continued ? ` Continuing the earlier unfinished work on ${workspace.branch}, which ends as a pull request into ${workspace.baseBranch}.` : ` Working on a new branch, ${workspace.branch}, which will end as a pull request into ${workspace.baseBranch}.` : "")) + (workspaceNotes.length > 0 ? ` Note: ${workspaceNotes.join(" ")}` : "")
|
|
8914
8935
|
);
|
|
8915
8936
|
} catch {
|
|
8916
8937
|
}
|
|
@@ -8978,10 +8999,13 @@ ${stderr}`;
|
|
|
8978
8999
|
});
|
|
8979
9000
|
return;
|
|
8980
9001
|
}
|
|
8981
|
-
finish({
|
|
9002
|
+
finish({
|
|
9003
|
+
status: "done",
|
|
9004
|
+
result: ctx.fix ? { epicId: ctx.epicId, fix: true, branch: ctx.fix.branch, ...ctx.fix.pullRequestUrl && { prUrl: ctx.fix.pullRequestUrl } } : { epicId: ctx.epicId }
|
|
9005
|
+
});
|
|
8982
9006
|
});
|
|
8983
9007
|
});
|
|
8984
|
-
if (outcome.status === "done") {
|
|
9008
|
+
if (outcome.status === "done" && !ctx.fix) {
|
|
8985
9009
|
const readProgress = deps.epicProgress ?? (async () => {
|
|
8986
9010
|
try {
|
|
8987
9011
|
const job = await ctx.mailboxClient.postTurn(
|
|
@@ -9176,8 +9200,13 @@ function stamp(now) {
|
|
|
9176
9200
|
const pad = (n) => String(n).padStart(2, "0");
|
|
9177
9201
|
return `${String(now.getFullYear())}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
|
|
9178
9202
|
}
|
|
9179
|
-
|
|
9180
|
-
|
|
9203
|
+
var EMPTY_TREE = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
|
|
9204
|
+
function gitReason(text) {
|
|
9205
|
+
const lines = text.split("\n").map((l) => l.trim()).filter(Boolean);
|
|
9206
|
+
const failure = lines.find((l) => /^(fatal|error):/i.test(l));
|
|
9207
|
+
if (failure) return failure;
|
|
9208
|
+
const notProgress = lines.filter((l) => !/^(Preparing worktree|HEAD is now at|Updating files)/.test(l));
|
|
9209
|
+
return notProgress.at(-1) ?? lines.at(-1) ?? "";
|
|
9181
9210
|
}
|
|
9182
9211
|
function installCommand2(dir, exists = existsSync9) {
|
|
9183
9212
|
if (exists(join10(dir, "pnpm-lock.yaml"))) return ["pnpm", ["install", "--frozen-lockfile", "--prefer-offline"]];
|
|
@@ -9225,8 +9254,13 @@ var RunWorkspaceManager = class {
|
|
|
9225
9254
|
return this.run("git", args, cwd);
|
|
9226
9255
|
}
|
|
9227
9256
|
/** Creates the branch + worktree for a run. Never touches the person's checkout. */
|
|
9228
|
-
|
|
9229
|
-
|
|
9257
|
+
/**
|
|
9258
|
+
* `opts.branch` makes this a fix run (ENG-296): work on that existing,
|
|
9259
|
+
* pushed branch (an open pull request's head) instead of a new one, and fail
|
|
9260
|
+
* rather than fall back to a fresh branch when it can't be checked out.
|
|
9261
|
+
*/
|
|
9262
|
+
async prepare(projectDir, epicId, opts = {}) {
|
|
9263
|
+
const created = await withRepoLock(projectDir, () => this.createWorktree(projectDir, epicId, opts));
|
|
9230
9264
|
if (!created.ok) return created;
|
|
9231
9265
|
const { workspace, notes } = created;
|
|
9232
9266
|
const { dir, branch } = workspace;
|
|
@@ -9242,7 +9276,7 @@ var RunWorkspaceManager = class {
|
|
|
9242
9276
|
return {
|
|
9243
9277
|
ok: false,
|
|
9244
9278
|
error: [
|
|
9245
|
-
`Installing the project's dependencies failed (${command} ${args.join(" ")}): ${
|
|
9279
|
+
`Installing the project's dependencies failed (${command} ${args.join(" ")}): ${gitReason(res.stderr) || gitReason(res.stdout) || "unknown error"}`,
|
|
9246
9280
|
"The run was not started. Check that the same command works in your project folder."
|
|
9247
9281
|
].join("\n")
|
|
9248
9282
|
};
|
|
@@ -9250,10 +9284,43 @@ var RunWorkspaceManager = class {
|
|
|
9250
9284
|
}
|
|
9251
9285
|
return { ok: true, workspace, notes };
|
|
9252
9286
|
}
|
|
9253
|
-
|
|
9287
|
+
/**
|
|
9288
|
+
* When neither the folder nor its remote has any commit, records one empty
|
|
9289
|
+
* commit on `main` (and pushes it) so runs can branch and open pull requests.
|
|
9290
|
+
* Built with plumbing from git's empty tree, so nothing staged or sitting in
|
|
9291
|
+
* the folder is swept in: the person's files stay exactly as they were.
|
|
9292
|
+
*/
|
|
9293
|
+
async startEmptyRepository(projectDir, remote) {
|
|
9294
|
+
if ((await this.git(["rev-parse", "--verify", "--quiet", "HEAD"], projectDir)).status === 0) return { ok: true };
|
|
9295
|
+
if (remote) {
|
|
9296
|
+
const heads = await this.git(["ls-remote", "--heads", remote], projectDir);
|
|
9297
|
+
if (heads.status !== 0 || heads.stdout.trim() !== "") return { ok: true };
|
|
9298
|
+
}
|
|
9299
|
+
const fail = (what, res) => ({
|
|
9300
|
+
ok: false,
|
|
9301
|
+
error: [
|
|
9302
|
+
`This repository has no commits yet, and CompBox couldn't ${what}: ${gitReason(res.stderr) || "unknown error"}`,
|
|
9303
|
+
"The run was not started. Make a first commit on main in your project folder (or push one to GitHub), then try again."
|
|
9304
|
+
].join("\n")
|
|
9305
|
+
});
|
|
9306
|
+
const commit = await this.git(["commit-tree", EMPTY_TREE, "-m", "Start the project"], projectDir);
|
|
9307
|
+
if (commit.status !== 0) return fail("make its first commit", commit);
|
|
9308
|
+
const sha = commit.stdout.trim();
|
|
9309
|
+
const ref = await this.git(["update-ref", "refs/heads/main", sha, ""], projectDir);
|
|
9310
|
+
if (ref.status !== 0) return fail("create the main branch", ref);
|
|
9311
|
+
await this.git(["symbolic-ref", "HEAD", "refs/heads/main"], projectDir);
|
|
9312
|
+
if (!remote) return { ok: true, note: "The repository had no commits, so CompBox started main with an empty first commit." };
|
|
9313
|
+
const push = await this.git(["push", remote, "main"], projectDir);
|
|
9314
|
+
if (push.status !== 0) return fail(`push its first commit to ${remote}`, push);
|
|
9315
|
+
return { ok: true, note: `The repository had no commits, so CompBox started main with an empty first commit and pushed it to ${remote}.` };
|
|
9316
|
+
}
|
|
9317
|
+
async createWorktree(projectDir, epicId, opts = {}) {
|
|
9254
9318
|
const notes = [];
|
|
9255
9319
|
const remotes = (await this.git(["remote"], projectDir)).stdout.split("\n").map((r) => r.trim()).filter(Boolean);
|
|
9256
9320
|
const remote = remotes.includes("origin") ? "origin" : remotes[0] ?? null;
|
|
9321
|
+
const started = await this.startEmptyRepository(projectDir, remote);
|
|
9322
|
+
if (!started.ok) return started;
|
|
9323
|
+
if (started.note) notes.push(started.note);
|
|
9257
9324
|
let baseBranch = "";
|
|
9258
9325
|
let baseRef = "HEAD";
|
|
9259
9326
|
if (remote) {
|
|
@@ -9282,7 +9349,25 @@ var RunWorkspaceManager = class {
|
|
|
9282
9349
|
mkdirSync6(this.runsRoot, { recursive: true });
|
|
9283
9350
|
let branch = `compbox/epic-${slugForBranch(epicId)}-${when}`;
|
|
9284
9351
|
let continued = false;
|
|
9285
|
-
|
|
9352
|
+
if (opts.branch) {
|
|
9353
|
+
const target = opts.branch;
|
|
9354
|
+
const missing = (why) => ({
|
|
9355
|
+
ok: false,
|
|
9356
|
+
error: [
|
|
9357
|
+
`Couldn't open the pull request's branch ${target}: ${why}`,
|
|
9358
|
+
"The fix was not started, and your project folder was not changed."
|
|
9359
|
+
].join("\n")
|
|
9360
|
+
});
|
|
9361
|
+
if (!remote) return missing("this project folder has no remote to fetch it from.");
|
|
9362
|
+
if ((await this.git(["rev-parse", "--verify", "--quiet", `${remote}/${target}`], projectDir)).status !== 0) {
|
|
9363
|
+
return missing(`it isn't on ${remote} (was the pull request closed or the branch deleted?).`);
|
|
9364
|
+
}
|
|
9365
|
+
const checkout = await this.git(["worktree", "add", "-B", target, dir, `${remote}/${target}`], projectDir);
|
|
9366
|
+
if (checkout.status !== 0) return missing(gitReason(checkout.stderr) || "unknown error");
|
|
9367
|
+
branch = target;
|
|
9368
|
+
continued = true;
|
|
9369
|
+
}
|
|
9370
|
+
const previous = !opts.branch && remote ? await this.unfinishedBranch(remote, slugForBranch(epicId), baseRef, projectDir) : null;
|
|
9286
9371
|
if (remote && previous) {
|
|
9287
9372
|
const resume = await this.git(["worktree", "add", "-B", previous, dir, `${remote}/${previous}`], projectDir);
|
|
9288
9373
|
if (resume.status === 0) {
|
|
@@ -9291,7 +9376,7 @@ var RunWorkspaceManager = class {
|
|
|
9291
9376
|
notes.push(`Continuing the earlier unfinished work on ${previous}.`);
|
|
9292
9377
|
} else {
|
|
9293
9378
|
notes.push(
|
|
9294
|
-
`Couldn't continue the earlier unfinished branch ${previous} (${
|
|
9379
|
+
`Couldn't continue the earlier unfinished branch ${previous} (${gitReason(resume.stderr) || "unknown error"}), so the run starts a new branch.`
|
|
9295
9380
|
);
|
|
9296
9381
|
}
|
|
9297
9382
|
}
|
|
@@ -9300,7 +9385,7 @@ var RunWorkspaceManager = class {
|
|
|
9300
9385
|
return {
|
|
9301
9386
|
ok: false,
|
|
9302
9387
|
error: [
|
|
9303
|
-
`Couldn't create a separate workspace for this run (git worktree add failed): ${
|
|
9388
|
+
`Couldn't create a separate workspace for this run (git worktree add failed): ${gitReason(add.stderr) || "unknown error"}`,
|
|
9304
9389
|
"The run was not started, and your project folder was not changed."
|
|
9305
9390
|
].join("\n")
|
|
9306
9391
|
};
|
|
@@ -9349,7 +9434,7 @@ ${untracked.stdout}`.split("\n").map((p) => p.trim()).filter((p) => p && !p.ends
|
|
|
9349
9434
|
);
|
|
9350
9435
|
if (commit.status !== 0) {
|
|
9351
9436
|
commitFailed = true;
|
|
9352
|
-
notes.push(`Couldn't commit the remaining changes: ${
|
|
9437
|
+
notes.push(`Couldn't commit the remaining changes: ${gitReason(commit.stderr) || gitReason(commit.stdout) || "unknown error"}`);
|
|
9353
9438
|
}
|
|
9354
9439
|
}
|
|
9355
9440
|
const commits = Number.parseInt((await this.git(["rev-list", "--count", `${ws.baseRef}..HEAD`], ws.dir)).stdout.trim(), 10) || 0;
|
|
@@ -9383,7 +9468,7 @@ ${untracked.stdout}`.split("\n").map((p) => p.trim()).filter((p) => p && !p.ends
|
|
|
9383
9468
|
const push = await this.git(["push", "--set-upstream", ws.remote, ws.branch], ws.dir);
|
|
9384
9469
|
if (push.status !== 0) {
|
|
9385
9470
|
notes.push(
|
|
9386
|
-
`Couldn't push the branch to ${ws.remote}: ${
|
|
9471
|
+
`Couldn't push the branch to ${ws.remote}: ${gitReason(push.stderr) || "unknown error"}. The work is safe in ${ws.dir} on branch ${ws.branch}.`
|
|
9387
9472
|
);
|
|
9388
9473
|
return { ...base, keptWorktree: ws.dir };
|
|
9389
9474
|
}
|
|
@@ -9419,7 +9504,7 @@ ${untracked.stdout}`.split("\n").map((p) => p.trim()).filter((p) => p && !p.ends
|
|
|
9419
9504
|
const remoteUrl = (await this.git(["remote", "get-url", ws.remote], ws.dir)).stdout.trim();
|
|
9420
9505
|
compareUrl = githubCompareUrl(remoteUrl, ws.baseBranch, ws.branch) ?? void 0;
|
|
9421
9506
|
notes.push(
|
|
9422
|
-
`The branch was pushed, but the pull request couldn't be opened automatically${
|
|
9507
|
+
`The branch was pushed, but the pull request couldn't be opened automatically${gitReason(pr.stderr) ? ` (${gitReason(pr.stderr)})` : ""}.` + (compareUrl ? " Use the link to open it." : ` Open a pull request for ${ws.branch} on your git host.`)
|
|
9423
9508
|
);
|
|
9424
9509
|
}
|
|
9425
9510
|
const removed = await this.removeWorktree(ws, notes);
|
|
@@ -9508,7 +9593,7 @@ function parsePayload(payload) {
|
|
|
9508
9593
|
...typeof p.projectName === "string" ? { projectName: p.projectName } : {}
|
|
9509
9594
|
};
|
|
9510
9595
|
}
|
|
9511
|
-
function
|
|
9596
|
+
function firstLine(text) {
|
|
9512
9597
|
return text.trim().split("\n").filter(Boolean).pop() ?? "";
|
|
9513
9598
|
}
|
|
9514
9599
|
async function invokeConnectRepo(payload, deps = {}) {
|
|
@@ -9572,7 +9657,7 @@ async function invokeConnectRepo(payload, deps = {}) {
|
|
|
9572
9657
|
cloned = true;
|
|
9573
9658
|
break;
|
|
9574
9659
|
}
|
|
9575
|
-
errors.push(
|
|
9660
|
+
errors.push(firstLine(res.stderr));
|
|
9576
9661
|
}
|
|
9577
9662
|
if (!cloned) {
|
|
9578
9663
|
return {
|
|
@@ -9675,6 +9760,17 @@ async function runHeartbeatCycle(deps) {
|
|
|
9675
9760
|
function gatherServicedRemotes() {
|
|
9676
9761
|
return listProjectDirs().map((dir) => dir.remote);
|
|
9677
9762
|
}
|
|
9763
|
+
function parseFix(raw) {
|
|
9764
|
+
if (!raw || typeof raw !== "object") return void 0;
|
|
9765
|
+
const f = raw;
|
|
9766
|
+
const branch = typeof f.branch === "string" ? f.branch.trim() : "";
|
|
9767
|
+
const instructions = typeof f.instructions === "string" ? f.instructions.trim() : "";
|
|
9768
|
+
if (!instructions || !/^[A-Za-z0-9._/-]+$/.test(branch) || branch.startsWith("-") || branch.includes("..")) {
|
|
9769
|
+
return void 0;
|
|
9770
|
+
}
|
|
9771
|
+
const pullRequestUrl = typeof f.pullRequestUrl === "string" && f.pullRequestUrl.startsWith("https://") ? f.pullRequestUrl : void 0;
|
|
9772
|
+
return { branch, instructions, ...pullRequestUrl && { pullRequestUrl } };
|
|
9773
|
+
}
|
|
9678
9774
|
function parseStartExecutionPayload(payload) {
|
|
9679
9775
|
let parsed = payload;
|
|
9680
9776
|
if (typeof payload === "string") {
|
|
@@ -9693,7 +9789,15 @@ function parseStartExecutionPayload(payload) {
|
|
|
9693
9789
|
return { kind: "plan", epicRequestId: p.epicRequestId, ...projectRemote && { projectRemote }, ...useAiKey && { useAiKey } };
|
|
9694
9790
|
}
|
|
9695
9791
|
if (p.kind === "orchestrate" && typeof p.epicId === "string" && p.epicId.length > 0) {
|
|
9696
|
-
|
|
9792
|
+
const fix = parseFix(p.fix);
|
|
9793
|
+
if (p.fix !== void 0 && !fix) return null;
|
|
9794
|
+
return {
|
|
9795
|
+
kind: "orchestrate",
|
|
9796
|
+
epicId: p.epicId,
|
|
9797
|
+
...projectRemote && { projectRemote },
|
|
9798
|
+
...useAiKey && { useAiKey },
|
|
9799
|
+
...fix && { fix }
|
|
9800
|
+
};
|
|
9697
9801
|
}
|
|
9698
9802
|
if (p.kind === "refine" && typeof p.epicId === "string" && p.epicId.length > 0) {
|
|
9699
9803
|
const notes = typeof p.notes === "string" && p.notes.trim().length > 0 ? p.notes : void 0;
|
|
@@ -9826,7 +9930,8 @@ async function handleStartExecution(ctx, job) {
|
|
|
9826
9930
|
jobId: job.id,
|
|
9827
9931
|
epicId: payload.epicId,
|
|
9828
9932
|
projectDir: jobProjectDir,
|
|
9829
|
-
...keyRun && { keyRun }
|
|
9933
|
+
...keyRun && { keyRun },
|
|
9934
|
+
...payload.fix && { fix: payload.fix }
|
|
9830
9935
|
},
|
|
9831
9936
|
{
|
|
9832
9937
|
// H4: keep this machine online during the long orchestrator run — the
|
|
@@ -10482,6 +10587,10 @@ async function runWorkspace(deps = {}) {
|
|
|
10482
10587
|
return 1;
|
|
10483
10588
|
};
|
|
10484
10589
|
const payload = job.payload ?? {};
|
|
10590
|
+
const fix = payload.kind === "orchestrate" ? parseFix(payload.fix) : void 0;
|
|
10591
|
+
if (payload.fix !== void 0 && !fix) {
|
|
10592
|
+
return fail("This fix job's pull request details couldn't be read, so nothing was run.");
|
|
10593
|
+
}
|
|
10485
10594
|
const repoDir = join12(workDir, "repo");
|
|
10486
10595
|
let userApiToken;
|
|
10487
10596
|
let keyRun;
|
|
@@ -10537,7 +10646,8 @@ async function runWorkspace(deps = {}) {
|
|
|
10537
10646
|
jobId: job.id,
|
|
10538
10647
|
epicId: payload.epicId,
|
|
10539
10648
|
projectDir: repoDir,
|
|
10540
|
-
keyRun
|
|
10649
|
+
keyRun,
|
|
10650
|
+
...fix && { fix }
|
|
10541
10651
|
},
|
|
10542
10652
|
{
|
|
10543
10653
|
heartbeat,
|
|
@@ -10670,7 +10780,7 @@ ${error instanceof Error ? error.message : String(error)}`));
|
|
|
10670
10780
|
// src/index.ts
|
|
10671
10781
|
function resolveCliVersion() {
|
|
10672
10782
|
if (true) {
|
|
10673
|
-
return "1.21.
|
|
10783
|
+
return "1.21.6";
|
|
10674
10784
|
}
|
|
10675
10785
|
const require2 = createRequire(import.meta.url);
|
|
10676
10786
|
const pkg = require2("../package.json");
|
package/package.json
CHANGED
package/utils/agent-invoker.d.ts
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
*/
|
|
19
19
|
import Anthropic from '@anthropic-ai/sdk';
|
|
20
20
|
import { spawn } from 'node:child_process';
|
|
21
|
-
import { type PxpipeRouting, type InterviewSeedPayload, extractCompletionJson, looksLikeCompletionAttempt, meetsComplianceTarget, buildAuditFeedback, COMPLETION_REPAIR_INSTRUCTION, type ComplianceSummary, type EpicRequestDraft } from '@mycompbox/shared';
|
|
21
|
+
import { type PxpipeRouting, type InterviewSeedPayload, extractCompletionJson, looksLikeCompletionAttempt, meetsComplianceTarget, buildAuditFeedback, COMPLETION_REPAIR_INSTRUCTION, type ComplianceSummary, type EpicRequestDraft, type StartExecutionFix } from '@mycompbox/shared';
|
|
22
22
|
export { extractCompletionJson, looksLikeCompletionAttempt, meetsComplianceTarget, buildAuditFeedback, COMPLETION_REPAIR_INSTRUCTION, };
|
|
23
23
|
export type { ComplianceSummary, EpicRequestDraft };
|
|
24
24
|
import { type KeyRun } from './key-run.js';
|
|
@@ -343,6 +343,13 @@ export declare const ORCHESTRATOR_HEARTBEAT_INTERVAL_MS: number;
|
|
|
343
343
|
* run once exited "waiting for the architect review" after one task.
|
|
344
344
|
*/
|
|
345
345
|
export declare const HEADLESS_ORCHESTRATE_REMINDER = "This is a non-interactive run: do NOT start sub-agents or reviews in the background and do not end your turn to wait for them. Run every step in this process and keep going until every feature is done or a hard gate stops the run.";
|
|
346
|
+
/**
|
|
347
|
+
* Guardrails for a fix run (ENG-296), prepended to the server's instructions:
|
|
348
|
+
* work only on the pull request's branch, push normally, never rewrite history.
|
|
349
|
+
*/
|
|
350
|
+
export declare const FIX_RUN_RULES: string;
|
|
351
|
+
/** Claude CLI args for a fix run: the instructions as the prompt, same unattended profile as a build. */
|
|
352
|
+
export declare function buildFixArgs(fix: Pick<StartExecutionFix, 'instructions'>): string[];
|
|
346
353
|
/**
|
|
347
354
|
* Build the `claude` argv for a headless orchestrator run (H1). Pure + exported
|
|
348
355
|
* so a unit test can assert the exact command shape: the `@orchestrator execute
|
|
@@ -387,6 +394,11 @@ export interface StartExecutionOrchestrateCtx {
|
|
|
387
394
|
projectDir: string | undefined;
|
|
388
395
|
/** Run on the person's saved API key instead of this computer's Claude sign-in. */
|
|
389
396
|
keyRun?: KeyRun;
|
|
397
|
+
/**
|
|
398
|
+
* A fix run (ENG-296: Send back / Resolve conflicts): apply these instructions
|
|
399
|
+
* on the open pull request's branch instead of executing the epic's plan.
|
|
400
|
+
*/
|
|
401
|
+
fix?: StartExecutionFix;
|
|
390
402
|
}
|
|
391
403
|
export interface StartExecutionOrchestrateDeps {
|
|
392
404
|
/** Injectable child spawner (defaults to node's `spawn`) — tests never spawn a real `claude`. */
|