@on-par/factory-cli 0.9.18-next.2 → 0.9.18-next.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/awaiting-ci-recheck.d.ts +31 -0
- package/dist/cli/awaiting-ci-recheck.d.ts.map +1 -0
- package/dist/cli/awaiting-ci-recheck.js +61 -0
- package/dist/cli/awaiting-ci-recheck.js.map +1 -0
- package/dist/cli/awaiting-ci-wiring.d.ts +6 -0
- package/dist/cli/awaiting-ci-wiring.d.ts.map +1 -0
- package/dist/cli/awaiting-ci-wiring.js +45 -0
- package/dist/cli/awaiting-ci-wiring.js.map +1 -0
- package/dist/cli/daemon.d.ts.map +1 -1
- package/dist/cli/daemon.js +3 -3
- package/dist/cli/daemon.js.map +1 -1
- package/dist/cli/detect-checks.d.ts +2 -0
- package/dist/cli/detect-checks.d.ts.map +1 -1
- package/dist/cli/detect-checks.js +13 -2
- package/dist/cli/detect-checks.js.map +1 -1
- package/dist/cli/doctor-verify.d.ts +3 -1
- package/dist/cli/doctor-verify.d.ts.map +1 -1
- package/dist/cli/doctor-verify.js +13 -8
- package/dist/cli/doctor-verify.js.map +1 -1
- package/dist/cli/errors.d.ts +6 -0
- package/dist/cli/errors.d.ts.map +1 -0
- package/dist/cli/errors.js +11 -0
- package/dist/cli/errors.js.map +1 -0
- package/dist/cli/host-claim-guards.d.ts +9 -0
- package/dist/cli/host-claim-guards.d.ts.map +1 -0
- package/dist/cli/host-claim-guards.js +11 -0
- package/dist/cli/host-claim-guards.js.map +1 -0
- package/dist/cli/host-slot.d.ts +15 -2
- package/dist/cli/host-slot.d.ts.map +1 -1
- package/dist/cli/host-slot.js +33 -3
- package/dist/cli/host-slot.js.map +1 -1
- package/dist/cli/index.d.ts +6 -16
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +52 -78
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/json-contract.d.ts +7 -0
- package/dist/cli/json-contract.d.ts.map +1 -1
- package/dist/cli/json-contract.js +3 -0
- package/dist/cli/json-contract.js.map +1 -1
- package/dist/cli/land-behind.d.ts +8 -0
- package/dist/cli/land-behind.d.ts.map +1 -0
- package/dist/cli/land-behind.js +21 -0
- package/dist/cli/land-behind.js.map +1 -0
- package/dist/cli/land-pr.d.ts +24 -0
- package/dist/cli/land-pr.d.ts.map +1 -1
- package/dist/cli/land-pr.js +143 -51
- package/dist/cli/land-pr.js.map +1 -1
- package/dist/cli/land.d.ts +9 -0
- package/dist/cli/land.d.ts.map +1 -1
- package/dist/cli/land.js +24 -23
- package/dist/cli/land.js.map +1 -1
- package/dist/cli/lane-heartbeat.d.ts +31 -3
- package/dist/cli/lane-heartbeat.d.ts.map +1 -1
- package/dist/cli/lane-heartbeat.js +74 -6
- package/dist/cli/lane-heartbeat.js.map +1 -1
- package/dist/cli/lane-park-comment.d.ts.map +1 -1
- package/dist/cli/lane-park-comment.js +2 -1
- package/dist/cli/lane-park-comment.js.map +1 -1
- package/dist/cli/lane-pause.d.ts +6 -1
- package/dist/cli/lane-pause.d.ts.map +1 -1
- package/dist/cli/lane-pause.js +30 -0
- package/dist/cli/lane-pause.js.map +1 -1
- package/dist/cli/model-override-messages.d.ts +5 -1
- package/dist/cli/model-override-messages.d.ts.map +1 -1
- package/dist/cli/model-override-messages.js +9 -1
- package/dist/cli/model-override-messages.js.map +1 -1
- package/dist/cli/notify.d.ts +12 -0
- package/dist/cli/notify.d.ts.map +1 -1
- package/dist/cli/notify.js +28 -0
- package/dist/cli/notify.js.map +1 -1
- package/dist/cli/queue-preflight.d.ts +4 -2
- package/dist/cli/queue-preflight.d.ts.map +1 -1
- package/dist/cli/queue-preflight.js +1 -1
- package/dist/cli/queue-preflight.js.map +1 -1
- package/dist/cli/queue-startup.d.ts +57 -0
- package/dist/cli/queue-startup.d.ts.map +1 -1
- package/dist/cli/queue-startup.js +64 -1
- package/dist/cli/queue-startup.js.map +1 -1
- package/dist/cli/repo-live-run-lock.d.ts +7 -0
- package/dist/cli/repo-live-run-lock.d.ts.map +1 -0
- package/dist/cli/repo-live-run-lock.js +14 -0
- package/dist/cli/repo-live-run-lock.js.map +1 -0
- package/dist/cli/repo-run-lock.d.ts +14 -0
- package/dist/cli/repo-run-lock.d.ts.map +1 -0
- package/dist/cli/repo-run-lock.js +27 -0
- package/dist/cli/repo-run-lock.js.map +1 -0
- package/dist/cli/reset.d.ts.map +1 -1
- package/dist/cli/reset.js +2 -2
- package/dist/cli/reset.js.map +1 -1
- package/dist/cli/run-branch.js +1 -1
- package/dist/cli/run-branch.js.map +1 -1
- package/dist/cli/run-lane-deps.d.ts +16 -1
- package/dist/cli/run-lane-deps.d.ts.map +1 -1
- package/dist/cli/run-lane-disk-hold.d.ts +14 -0
- package/dist/cli/run-lane-disk-hold.d.ts.map +1 -0
- package/dist/cli/run-lane-disk-hold.js +25 -0
- package/dist/cli/run-lane-disk-hold.js.map +1 -0
- package/dist/cli/run-lane-load-hold.d.ts +14 -0
- package/dist/cli/run-lane-load-hold.d.ts.map +1 -0
- package/dist/cli/run-lane-load-hold.js +22 -0
- package/dist/cli/run-lane-load-hold.js.map +1 -0
- package/dist/cli/run-lane-restack.d.ts +13 -0
- package/dist/cli/run-lane-restack.d.ts.map +1 -0
- package/dist/cli/run-lane-restack.js +21 -0
- package/dist/cli/run-lane-restack.js.map +1 -0
- package/dist/cli/run-lane.d.ts.map +1 -1
- package/dist/cli/run-lane.js +77 -61
- package/dist/cli/run-lane.js.map +1 -1
- package/dist/cli/run.d.ts +1 -0
- package/dist/cli/run.d.ts.map +1 -1
- package/dist/cli/run.js +19 -15
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/self-update-apply.d.ts +1 -1
- package/dist/cli/self-update-apply.d.ts.map +1 -1
- package/dist/cli/self-update-apply.js +4 -5
- package/dist/cli/self-update-apply.js.map +1 -1
- package/dist/cli/ship-run-state.d.ts +5 -0
- package/dist/cli/ship-run-state.d.ts.map +1 -1
- package/dist/cli/ship-run-state.js +18 -1
- package/dist/cli/ship-run-state.js.map +1 -1
- package/dist/cli/ship-steps.d.ts +4 -2
- package/dist/cli/ship-steps.d.ts.map +1 -1
- package/dist/cli/ship-steps.js +3 -1
- package/dist/cli/ship-steps.js.map +1 -1
- package/dist/cli/ship.d.ts +4 -2
- package/dist/cli/ship.d.ts.map +1 -1
- package/dist/cli/ship.js +11 -17
- package/dist/cli/ship.js.map +1 -1
- package/dist/cli/status-json.d.ts +1 -0
- package/dist/cli/status-json.d.ts.map +1 -1
- package/dist/cli/status-json.js +1 -0
- package/dist/cli/status-json.js.map +1 -1
- package/dist/cli/status.d.ts.map +1 -1
- package/dist/cli/status.js +16 -1
- package/dist/cli/status.js.map +1 -1
- package/dist/cli/steer.js +3 -3
- package/dist/cli/steer.js.map +1 -1
- package/dist/cli/unpark.d.ts.map +1 -1
- package/dist/cli/unpark.js +4 -2
- package/dist/cli/unpark.js.map +1 -1
- package/package.json +4 -4
- package/schemas/logs-line.schema.json +10 -0
- package/schemas/status.schema.json +24 -0
package/dist/cli/run.js
CHANGED
|
@@ -2,15 +2,18 @@
|
|
|
2
2
|
import { randomUUID } from 'node:crypto';
|
|
3
3
|
import { existsSync, readFileSync } from 'node:fs';
|
|
4
4
|
import { styleText } from 'node:util';
|
|
5
|
-
import { LaneFileGuard, applyRepoConfig, clearProxyState, getFactoryPaths, provisionLaneContainer, resolveCodexDisabled, resolveEffectiveBuildRoute, resolveEnvironmentProxy, resolveLaneBreakerThreshold, resolveMergePolicy, resolveSizeGateMode, } from '@on-par/factory-core';
|
|
6
|
-
import { createDockerEngine, createGithubQueue, createFileIterateStore, createFileReviewReworkStore, createOctokitCollaboratorPermissionClient, createOctokitQueueClient, createOctokitIterateGitHub, createOctokitReviewReworkGitHub,
|
|
5
|
+
import { LaneFileGuard, applyRepoConfig, clearProxyState, getFactoryPaths, provisionLaneContainer, resolveCodexDisabled, resolveEffectiveBuildRoute, resolveEnvironmentProxy, resolveLaneBreakerThreshold, resolveMergePolicy, resolveSizeGateMode, workKeyFromIssue, } from '@on-par/factory-core';
|
|
6
|
+
import { createDockerEngine, createGithubQueue, createFileIterateStore, createFileReviewReworkStore, createOctokitCollaboratorPermissionClient, createOctokitQueueClient, createOctokitIterateGitHub, createOctokitReviewReworkGitHub, formatQueueOrderConflict, logEvent, parkPayload, pollIterateCommands, pollReviewRework, publishParkComment, recordSliceMerged, resolveBaseHealthChecks, resolveLocalOnly, resolveMaxReviewReworkRuns, resolveQueueClaimSettleMs, resolveRunUsageHarness, settleParkedPullRequest, slugify, withAdmissionGuard, } from '@on-par/factory-core/internal';
|
|
7
7
|
import { admissionStateReaderFor } from './admission.js';
|
|
8
8
|
import { baseChecksVerdict } from './base-health-ci.js';
|
|
9
9
|
import { createBaseHoldGate, formatBaseHoldCleared } from './base-hold.js';
|
|
10
10
|
import { keychainPreflightError } from './doctor.js';
|
|
11
|
+
import { awaitingCiLaneDeps } from './awaiting-ci-wiring.js';
|
|
11
12
|
import { runEndOfRunKpiSnapshot } from './kpi-sweep.js';
|
|
12
13
|
import { waitForMerge } from './land.js';
|
|
13
|
-
import {
|
|
14
|
+
import { hostClaimGuards } from './host-claim-guards.js';
|
|
15
|
+
import { DRAIN_MESSAGE, createNotifier, resolveNotifyCommand, withDiskLowNotify, withParkNotify } from './notify.js';
|
|
16
|
+
import { createDeferralTracker, settleDeferredOnly } from './queue-startup.js';
|
|
14
17
|
import { runLane } from './run-lane.js';
|
|
15
18
|
import { restackFromSlicePlan } from './run-restack.js';
|
|
16
19
|
import { writeRunFlagOverrides } from './run-flags.js';
|
|
@@ -21,7 +24,7 @@ export async function cmdRun(opts, rt) {
|
|
|
21
24
|
const paths = getFactoryPaths(repoRoot);
|
|
22
25
|
const branchPrefix = rt.branchPrefixOrExit(opts.branchPrefix);
|
|
23
26
|
return rt.withRepoRunLock(paths, 'factory run', async () => {
|
|
24
|
-
const
|
|
27
|
+
const deferrals = createDeferralTracker(paths.events);
|
|
25
28
|
const runStartedAt = new Date().toISOString();
|
|
26
29
|
const stopStatus = readStopFileStatus(paths);
|
|
27
30
|
if (stopStatus.present) {
|
|
@@ -43,6 +46,8 @@ export async function cmdRun(opts, rt) {
|
|
|
43
46
|
}
|
|
44
47
|
await rt.runAutoWorktreeGc(repoRoot, paths, ghRepo, 'all');
|
|
45
48
|
await rt.sweepStaleLaneClaims(paths, ghRepo);
|
|
49
|
+
if (opts.localQueue !== true)
|
|
50
|
+
await rt.reapExpiredClaims(paths, ghRepo);
|
|
46
51
|
await rt.sweepOrphanDrafts(paths, ghRepo);
|
|
47
52
|
const { lanes, diagnostics } = await rt.planRunLanes({
|
|
48
53
|
localQueue: opts.localQueue === true,
|
|
@@ -62,12 +67,7 @@ export async function cmdRun(opts, rt) {
|
|
|
62
67
|
resolveMergePolicy(factoryConfig, process.env, { auto: opts.autoMerge }).auto,
|
|
63
68
|
stackMode: resolveSizeGateMode(factoryConfig) === 'stack',
|
|
64
69
|
laneFileHold: (n) => new LaneFileGuard(paths.laneFiles).liveHold(ghRepo, n),
|
|
65
|
-
onDeferred:
|
|
66
|
-
if (deferredIssues.has(issue))
|
|
67
|
-
return;
|
|
68
|
-
deferredIssues.add(issue);
|
|
69
|
-
logEvent(paths.events, 'issue_deferred', issue, message);
|
|
70
|
-
},
|
|
70
|
+
onDeferred: deferrals.onDeferred,
|
|
71
71
|
})),
|
|
72
72
|
onConflict: (issue, verdict) => {
|
|
73
73
|
const line = `#${issue} refused — ${verdict.reason} | repair: ${verdict.repair}`;
|
|
@@ -84,7 +84,6 @@ export async function cmdRun(opts, rt) {
|
|
|
84
84
|
},
|
|
85
85
|
});
|
|
86
86
|
rt.warnQueueDiagnostics(diagnostics);
|
|
87
|
-
const loadGuardPolicy = resolveHostLoadGuard(factoryConfig);
|
|
88
87
|
let knobs;
|
|
89
88
|
let laneBreakerThreshold;
|
|
90
89
|
let baseHealthChecks;
|
|
@@ -182,7 +181,7 @@ export async function cmdRun(opts, rt) {
|
|
|
182
181
|
logEvent(paths.events, 'review_rework_queued', r.issue, `#${r.issue} queued for review rework on lane '${r.lane}' — PR #${r.pr} review ${r.reviewIds.join(', ')} by ${r.reviewer}`, { lane: r.lane });
|
|
183
182
|
}
|
|
184
183
|
else if (r.outcome === 'capped') {
|
|
185
|
-
logEvent(paths.events, 'escalate', r.issue, `#${r.issue} parked: review rework cap ${r.cap} reached (${r.count} runs) — PR #${r.pr} review ${r.reviewIds.join(', ')}`, parkPayload('escalate', r.issue, r.lane, []));
|
|
184
|
+
logEvent(paths.events, 'escalate', r.issue, `#${r.issue} parked: review rework cap ${r.cap} reached (${r.count} runs) — PR #${r.pr} review ${r.reviewIds.join(', ')}`, parkPayload('escalate', workKeyFromIssue(r.issue), r.lane, []));
|
|
186
185
|
}
|
|
187
186
|
else if (r.outcome === 'error') {
|
|
188
187
|
logEvent(paths.events, 'warn', r.issue, `review-rework poll for PR #${r.pr} failed: ${r.detail}`);
|
|
@@ -233,16 +232,19 @@ export async function cmdRun(opts, rt) {
|
|
|
233
232
|
}
|
|
234
233
|
pids.push(runLane(planned.lane, planned.issues, repoRoot, ghRepo, paths, {
|
|
235
234
|
...planned.deps,
|
|
236
|
-
...(notifier ? { emitEvent: withParkNotify(logEvent, notifier) } : {}),
|
|
235
|
+
...(notifier ? { emitEvent: withDiskLowNotify(withParkNotify(logEvent, notifier), notifier) } : {}),
|
|
237
236
|
laneBreakerThreshold,
|
|
238
237
|
octokit: opts.localQueue === true ? undefined : () => rt.getOctokit(),
|
|
239
238
|
pollReviewRework: opts.localQueue === true ? undefined : pollReviewReworkOnce,
|
|
239
|
+
...(opts.localQueue === true
|
|
240
|
+
? {}
|
|
241
|
+
: awaitingCiLaneDeps(() => rt.getOctokit(), ghRepo, paths, factoryConfig)),
|
|
240
242
|
runId,
|
|
241
243
|
readParkSha: (branch) => rt.shellOps
|
|
242
244
|
.exec(`git rev-parse --verify ${JSON.stringify(`refs/remotes/origin/${branch}`)}`, { cwd: repoRoot })
|
|
243
245
|
.then((r) => r.stdout.trim()),
|
|
244
246
|
activeIssues: inFlightIssues,
|
|
245
|
-
|
|
247
|
+
...hostClaimGuards(factoryConfig, { repoRoot, ghRepo, stateRoot: paths.root }, opts.localQueue === true),
|
|
246
248
|
baseHoldGate: opts.localQueue === true
|
|
247
249
|
? undefined
|
|
248
250
|
: createBaseHoldGate({
|
|
@@ -275,7 +277,7 @@ export async function cmdRun(opts, rt) {
|
|
|
275
277
|
closeParkedPr: (issue, branch, reason) => settleParkedPullRequest({
|
|
276
278
|
octokit: rt.getOctokit(),
|
|
277
279
|
repo: ghRepo,
|
|
278
|
-
issue,
|
|
280
|
+
issue: workKeyFromIssue(issue),
|
|
279
281
|
branch,
|
|
280
282
|
reason,
|
|
281
283
|
greenAndChecked: false,
|
|
@@ -289,6 +291,8 @@ export async function cmdRun(opts, rt) {
|
|
|
289
291
|
await Promise.allSettled(pids);
|
|
290
292
|
controller.abort();
|
|
291
293
|
await watchdog;
|
|
294
|
+
if (opts.localQueue !== true)
|
|
295
|
+
await settleDeferredOnly(paths, ghRepo, rt.getOctokit, lanes, deferrals.prerequisite);
|
|
292
296
|
logEvent(paths.events, 'run-done', 'all', 'all lanes finished');
|
|
293
297
|
if (notifier) {
|
|
294
298
|
notifier.notify({
|
package/dist/cli/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export interface SelfUpdateApplyResult {
|
|
|
26
26
|
}
|
|
27
27
|
export type ApplyExec = NonNullable<SelfUpdateDeps['exec']>;
|
|
28
28
|
export type SelfUpdateApplyDeps = SelfUpdateDeps;
|
|
29
|
-
/** Slugs of attached repos whose run lock is held by a live pid. */
|
|
29
|
+
/** Slugs of attached repos whose run lock (checkout or per-issue) is held by a live pid. */
|
|
30
30
|
export declare function attachedRunLocks(registryFile?: string): Promise<string[]>;
|
|
31
31
|
export interface SelfUpdateApplyOpts {
|
|
32
32
|
to: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-update-apply.d.ts","sourceRoot":"","sources":["../../src/cli/self-update-apply.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"self-update-apply.d.ts","sourceRoot":"","sources":["../../src/cli/self-update-apply.ts"],"names":[],"mappings":"AAOA,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAA8C,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMnG,0IAA0I;AAC1I,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,eAAe,IAAI,CAAC;AAEjC,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAEhH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,iBAAiB,GAAG,SAAS,CAAC;IACjG,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,uJAAuJ;IACvJ,OAAO,EAAE,UAAU,GAAG,WAAW,GAAG,aAAa,GAAG,QAAQ,GAAG,IAAI,CAAC;IACpE,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5D,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAEjD,4FAA4F;AAC5F,wBAAsB,gBAAgB,CAAC,YAAY,GAAE,MAA8B,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOtG;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,6FAA6F;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,uGAAuG;AACvG,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAM3D;AAED,+FAA+F;AAC/F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAU5D;AAWD,0HAA0H;AAC1H,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAGnG;AAYD,iJAAiJ;AACjJ,wBAAsB,eAAe,CACnC,IAAI,EAAE,mBAAmB,EACzB,IAAI,GAAE,mBAAwB,GAC7B,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,CAAC,CAgH1D;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,qBAAqB,GAAG,MAAM,CAsBlE;AAKD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,EAAE,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBnH"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// packages/cli/src/cli/self-update-apply.ts — factory self-update --to <version> (#2355)
|
|
2
2
|
import { execFile } from 'node:child_process';
|
|
3
3
|
import { delimiter, join } from 'node:path';
|
|
4
|
-
import { daemonRuntimePaths, defaultRegistryPath, listRepos, loadRegistry
|
|
5
|
-
import {
|
|
4
|
+
import { daemonRuntimePaths, defaultRegistryPath, listRepos, loadRegistry } from '@on-par/factory-core/internal';
|
|
5
|
+
import { repoHasLiveRunLock } from './repo-live-run-lock.js';
|
|
6
6
|
import { detectInstall } from './daemon.js';
|
|
7
7
|
import { EXIT_UP_TO_DATE, PACKAGE_NAME, parseSemver } from './self-update.js';
|
|
8
8
|
import { recordUpdateResult, updateStatePath } from './update-state.js';
|
|
@@ -12,14 +12,13 @@ import { recordUpdateResult, updateStatePath } from './update-state.js';
|
|
|
12
12
|
export const EXIT_APPLY_FAILED = 1;
|
|
13
13
|
export const EXIT_APPLY_REFUSED = 2;
|
|
14
14
|
export const EXIT_APPLY_BUSY = 3;
|
|
15
|
-
/** Slugs of attached repos whose run lock is held by a live pid. */
|
|
15
|
+
/** Slugs of attached repos whose run lock (checkout or per-issue) is held by a live pid. */
|
|
16
16
|
export async function attachedRunLocks(registryFile = defaultRegistryPath()) {
|
|
17
17
|
const active = [];
|
|
18
18
|
for (const e of listRepos(await loadRegistry(registryFile))) {
|
|
19
19
|
if (e.state === 'detached')
|
|
20
20
|
continue;
|
|
21
|
-
|
|
22
|
-
if (holder && defaultIsPidAlive(holder.pid))
|
|
21
|
+
if (repoHasLiveRunLock(e))
|
|
23
22
|
active.push(e.slug);
|
|
24
23
|
}
|
|
25
24
|
return active;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-update-apply.js","sourceRoot":"","sources":["../../src/cli/self-update-apply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"self-update-apply.js","sourceRoot":"","sources":["../../src/cli/self-update-apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { type IssueRunStateBase, type RunStateUpdate } from '@on-par/factory-core/internal';
|
|
2
|
+
import { type FailurePhase } from '@on-par/factory-core';
|
|
2
3
|
/** Persists `state/runs/issue-<n>.json` on every update. The previous record lives in the closure, so
|
|
3
4
|
* `startedAt` and the other fixed fields come from `base` and no stale file from an earlier run leaks in. */
|
|
4
5
|
export declare function runStateRecorder(runsDir: string, base: IssueRunStateBase): (update: RunStateUpdate) => Promise<void>;
|
|
6
|
+
/** RunPorts.recordPhase: stamps the phase snapshot with the current time as both update and activity. */
|
|
7
|
+
export declare function phaseRecorder(runsDir: string, issue: number): (phase: FailurePhase) => Promise<void>;
|
|
8
|
+
/** Bumps the per-issue heartbeat on the phase snapshot (what a live merge wait uses to read as alive). */
|
|
9
|
+
export declare function touchIssueActivity(runsDir: string, issue: number): Promise<void>;
|
|
5
10
|
//# sourceMappingURL=ship-run-state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-run-state.d.ts","sourceRoot":"","sources":["../../src/cli/ship-run-state.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ship-run-state.d.ts","sourceRoot":"","sources":["../../src/cli/ship-run-state.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAE9B;8GAC8G;AAC9G,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAWpH;AAED,yGAAyG;AACzG,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAUpG;AAED,0GAA0G;AAC1G,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhF"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
// packages/cli/src/cli/ship-run-state.ts — RunPorts.recordRunState for shipIssue (#3194); keeps steers appended mid-run (#3401)
|
|
2
2
|
import { nextIssueRunState, readIssueRunState, runStateFile, writeIssueRunState, } from '@on-par/factory-core/internal';
|
|
3
|
+
import { phaseSnapshotFile, touchRunActivity, workKeyFromIssue, writePhaseSnapshot, } from '@on-par/factory-core';
|
|
3
4
|
/** Persists `state/runs/issue-<n>.json` on every update. The previous record lives in the closure, so
|
|
4
5
|
* `startedAt` and the other fixed fields come from `base` and no stale file from an earlier run leaks in. */
|
|
5
6
|
export function runStateRecorder(runsDir, base) {
|
|
6
7
|
let current;
|
|
7
8
|
return async (update) => {
|
|
8
9
|
current = nextIssueRunState(current, base, update, new Date().toISOString());
|
|
9
|
-
const file = runStateFile(runsDir, base.issue);
|
|
10
|
+
const file = runStateFile(runsDir, workKeyFromIssue(base.issue));
|
|
10
11
|
const onDisk = await readIssueRunState(file);
|
|
11
12
|
// `factory steer` appends to the file while the run is in flight (#3401); keep those steers.
|
|
12
13
|
if (onDisk?.startedAt === base.startedAt && onDisk.steers !== undefined)
|
|
@@ -14,4 +15,20 @@ export function runStateRecorder(runsDir, base) {
|
|
|
14
15
|
await writeIssueRunState(file, current);
|
|
15
16
|
};
|
|
16
17
|
}
|
|
18
|
+
/** RunPorts.recordPhase: stamps the phase snapshot with the current time as both update and activity. */
|
|
19
|
+
export function phaseRecorder(runsDir, issue) {
|
|
20
|
+
return (phase) => {
|
|
21
|
+
const now = new Date().toISOString();
|
|
22
|
+
return writePhaseSnapshot(phaseSnapshotFile(runsDir, workKeyFromIssue(issue)), {
|
|
23
|
+
issue,
|
|
24
|
+
phase,
|
|
25
|
+
updatedAt: now,
|
|
26
|
+
lastActivityAt: now,
|
|
27
|
+
});
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
/** Bumps the per-issue heartbeat on the phase snapshot (what a live merge wait uses to read as alive). */
|
|
31
|
+
export function touchIssueActivity(runsDir, issue) {
|
|
32
|
+
return touchRunActivity(phaseSnapshotFile(runsDir, workKeyFromIssue(issue)), new Date().toISOString());
|
|
33
|
+
}
|
|
17
34
|
//# sourceMappingURL=ship-run-state.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-run-state.js","sourceRoot":"","sources":["../../src/cli/ship-run-state.ts"],"names":[],"mappings":"AAAA,gIAAgI;AAChI,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,GAInB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ship-run-state.js","sourceRoot":"","sources":["../../src/cli/ship-run-state.ts"],"names":[],"mappings":"AAAA,gIAAgI;AAChI,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,GAInB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,GAEnB,MAAM,sBAAsB,CAAC;AAE9B;8GAC8G;AAC9G,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,IAAuB;IACvE,IAAI,OAAkC,CAAC;IACvC,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,OAAO,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC7C,6FAA6F;QAC7F,IAAI,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;YACrE,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAClD,MAAM,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC,CAAC;AACJ,CAAC;AAED,yGAAyG;AACzG,MAAM,UAAU,aAAa,CAAC,OAAe,EAAE,KAAa;IAC1D,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,OAAO,kBAAkB,CAAC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE;YAC7E,KAAK;YACL,KAAK;YACL,SAAS,EAAE,GAAG;YACd,cAAc,EAAE,GAAG;SACpB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,0GAA0G;AAC1G,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,KAAa;IAC/D,OAAO,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AACzG,CAAC"}
|
package/dist/cli/ship-steps.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Octokit } from '@octokit/rest';
|
|
2
2
|
import type { EventKind, FactoryConfig, LocalOnlyPolicy, RunOutcome, RunPorts, RunRequest, SandboxPolicy, Workspace, WorkRequest, WorkRequestSourceKind, resolveEfficiencyPolicy, resolveSandboxPolicy, getFactoryPaths } from '@on-par/factory-core';
|
|
3
|
-
import type { CheckResumeRecord, WorktreeSandbox } from '@on-par/factory-core/internal';
|
|
3
|
+
import type { CheckResumeRecord, ProviderOrder, WorktreeSandbox } from '@on-par/factory-core/internal';
|
|
4
4
|
import { resolveReviewFloorRules } from '@on-par/factory-core/internal';
|
|
5
5
|
import type { CliDeps, ConfigLoaderKey, GitOpKey } from './index.js';
|
|
6
6
|
export declare const TERMINAL_EVENT_KINDS: Set<EventKind>;
|
|
@@ -93,6 +93,8 @@ export interface RunRequestInput {
|
|
|
93
93
|
activeSandboxPolicy: SandboxPolicy | undefined;
|
|
94
94
|
processGroupGraceMs: number;
|
|
95
95
|
paths: ReturnType<typeof getFactoryPaths>;
|
|
96
|
+
/** models.providerOrder from the repo file, refused providers filtered (#3338); undefined = off. */
|
|
97
|
+
providerOrder?: ProviderOrder;
|
|
96
98
|
}
|
|
97
|
-
export declare function buildRunRequest({ issueNum, ghRepo, repoRoot, branch, specPath, work, product, runStartedAt, lane, opts, ctx, autoRework, planApprovalEnabled, factoryConfig, repoConfig, classifierPolicy, loaders, efficiency, sizeGateMode, maxSlices, timeouts, modelPins, codexOff, failoverSettings, activeSandboxPolicy, processGroupGraceMs, paths, }: RunRequestInput): RunRequest;
|
|
99
|
+
export declare function buildRunRequest({ issueNum, ghRepo, repoRoot, branch, specPath, work, product, runStartedAt, lane, opts, ctx, autoRework, planApprovalEnabled, factoryConfig, repoConfig, classifierPolicy, loaders, efficiency, sizeGateMode, maxSlices, timeouts, modelPins, codexOff, failoverSettings, activeSandboxPolicy, processGroupGraceMs, paths, providerOrder, }: RunRequestInput): RunRequest;
|
|
98
100
|
//# sourceMappingURL=ship-steps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-steps.d.ts","sourceRoot":"","sources":["../../src/cli/ship-steps.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EAEb,eAAe,EACf,UAAU,EACV,QAAQ,EACR,UAAU,EACV,aAAa,EACb,SAAS,EACT,WAAW,EACX,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAY9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ship-steps.d.ts","sourceRoot":"","sources":["../../src/cli/ship-steps.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/ship-steps.js
CHANGED
|
@@ -24,6 +24,7 @@ export const TERMINAL_EVENT_KINDS = new Set([
|
|
|
24
24
|
'conflict',
|
|
25
25
|
'config',
|
|
26
26
|
'sandbox-env',
|
|
27
|
+
'check-infra',
|
|
27
28
|
'ci-failed',
|
|
28
29
|
'ci-infra',
|
|
29
30
|
'timeout',
|
|
@@ -168,7 +169,7 @@ export function finishOutcome({ outcome, opts, ctx, paths, issueNum, worktree, t
|
|
|
168
169
|
? { failureSignature: outcome.failureSignature, failingChecks: outcome.failingChecks }
|
|
169
170
|
: undefined);
|
|
170
171
|
}
|
|
171
|
-
export function buildRunRequest({ issueNum, ghRepo, repoRoot, branch, specPath, work, product, runStartedAt, lane, opts, ctx, autoRework, planApprovalEnabled, factoryConfig, repoConfig, classifierPolicy, loaders, efficiency, sizeGateMode, maxSlices, timeouts, modelPins, codexOff, failoverSettings, activeSandboxPolicy, processGroupGraceMs, paths, }) {
|
|
172
|
+
export function buildRunRequest({ issueNum, ghRepo, repoRoot, branch, specPath, work, product, runStartedAt, lane, opts, ctx, autoRework, planApprovalEnabled, factoryConfig, repoConfig, classifierPolicy, loaders, efficiency, sizeGateMode, maxSlices, timeouts, modelPins, codexOff, failoverSettings, activeSandboxPolicy, processGroupGraceMs, paths, providerOrder, }) {
|
|
172
173
|
const { repoConfigFileFor } = shipRuntime();
|
|
173
174
|
return {
|
|
174
175
|
issue: issueNum,
|
|
@@ -223,6 +224,7 @@ export function buildRunRequest({ issueNum, ghRepo, repoRoot, branch, specPath,
|
|
|
223
224
|
},
|
|
224
225
|
processGroupGraceMs,
|
|
225
226
|
preferredRoute: repoConfig?.route,
|
|
227
|
+
...(providerOrder ? { providerOrder } : {}),
|
|
226
228
|
...(ctx?.resumeFrom
|
|
227
229
|
? {
|
|
228
230
|
resumeFrom: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-steps.js","sourceRoot":"","sources":["../../src/cli/ship-steps.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ship-steps.js","sourceRoot":"","sources":["../../src/cli/ship-steps.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/ship.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { LocalOnlyPolicy, RunOutcome, WorkRequest, WorkRequestSourceKind } from '@on-par/factory-core';
|
|
2
2
|
import { getFactoryPaths, type SizeGateMode } from '@on-par/factory-core';
|
|
3
|
-
import {
|
|
3
|
+
import { shipHostBuildSlot } from './host-slot.js';
|
|
4
4
|
import type { CheckResumeRecord } from '@on-par/factory-core/internal';
|
|
5
5
|
import type { CliDeps, ConfigLoaderKey, CoreOpKey, GitOpKey, ShellOpKey } from './index.js';
|
|
6
6
|
type ShipArgs = Parameters<typeof shipIssueFrom> extends [string, ...infer Rest] ? Rest : never;
|
|
@@ -44,10 +44,12 @@ declare function shipIssueFrom(repoRoot: string, issueNum: number, opts: {
|
|
|
44
44
|
/** Local-only policy (#508): run in this caller-provided workspace, no worktree, no publishing, no SHIP phase. */
|
|
45
45
|
localOnly?: LocalOnlyPolicy;
|
|
46
46
|
/** Per-run BUILD/CHECK slot gate shared by every lane of one run (#3049); absent = host cap only. */
|
|
47
|
-
runSlots?: Parameters<typeof
|
|
47
|
+
runSlots?: Parameters<typeof shipHostBuildSlot>[3]['slots'];
|
|
48
48
|
/** Benchmark artifact directory (#509) — only set for local-only runs. */
|
|
49
49
|
artifactsDir?: string;
|
|
50
50
|
resumeFrom?: CheckResumeRecord;
|
|
51
|
+
/** Aborts when the lane loses this issue's claim lease (#3146); becomes RunPorts.claimSignal. */
|
|
52
|
+
signal?: AbortSignal;
|
|
51
53
|
}, deps?: Pick<CliDeps, 'octokit' | 'planPhase' | 'buildPhase' | 'checkPhase' | 'shipPhase' | 'checkBaseHealth' | ConfigLoaderKey | GitOpKey | ShellOpKey | CoreOpKey>): Promise<string>;
|
|
52
54
|
export {};
|
|
53
55
|
//# sourceMappingURL=ship.d.ts.map
|
package/dist/cli/ship.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/cli/ship.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/cli/ship.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,eAAe,EACf,UAAU,EAGV,WAAW,EACX,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,eAAe,EAiBf,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAmB,MAAM,+BAA+B,CAAC;AAwBxF,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAgB5F,KAAK,QAAQ,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEhG;gHACgH;AAChH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EACjB,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EACjB,IAAI,GAAE,QAAQ,CAAC,CAAC,CAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,iBAAe,aAAa,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE;IACJ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2FAA2F;IAC3F,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wFAAwF;IACxF,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uGAAuG;IACvG,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,EACD,GAAG,CAAC,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,0FAA0F;IAC1F,KAAK,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qFAAqF;IACrF,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;yEACqE;IACrE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;IAC1C,mGAAmG;IACnG,UAAU,CAAC,EAAE;QAAE,IAAI,EAAE,qBAAqB,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAC9D,kHAAkH;IAClH,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,qGAAqG;IACrG,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC5D,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,iGAAiG;IACjG,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,EACD,IAAI,GAAE,IAAI,CACR,OAAO,EACL,SAAS,GACT,WAAW,GACX,YAAY,GACZ,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,eAAe,GACf,QAAQ,GACR,UAAU,GACV,SAAS,CACP,GACL,OAAO,CAAC,MAAM,CAAC,CA+UjB"}
|
package/dist/cli/ship.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// packages/cli/src/cli/ship.ts — issue-level ship flow: resolve config, build RunRequest/RunPorts, run runIssue, map the outcome (#2788)
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
3
|
import { styleText } from 'node:util';
|
|
4
|
-
import { applyRepoConfig, closedWorkSkipReason, createDefaultWorkSourceRegistry, createFileApprovalGate, drainSteering, getFactoryPaths, GITHUB_ISSUE_SOURCE, LaneFileGuard, phaseSnapshotFile, resolveAutoFailover, resolveCodexDisabled, resolveEfficiencyPolicy, resolveEnvironmentPorts, resolveEnvironmentProxy, resolvePlanApproval, resolveProcessGroupGraceMs, resolveSandboxPolicy, resolveSizeGateMaxSlices, resolveSizeGateMode, ReworkHistory, runIssue, summarizeEvent, touchLastEvent, touchRunActivity,
|
|
5
|
-
import {
|
|
4
|
+
import { applyRepoConfig, closedWorkSkipReason, createDefaultWorkSourceRegistry, createFileApprovalGate, drainSteering, getFactoryPaths, GITHUB_ISSUE_SOURCE, LaneFileGuard, phaseSnapshotFile, workKeyFromIssue, resolveAutoFailover, resolveCodexDisabled, resolveEfficiencyPolicy, resolveEnvironmentPorts, resolveEnvironmentProxy, resolvePlanApproval, resolveProcessGroupGraceMs, resolveSandboxPolicy, resolveSizeGateMaxSlices, resolveSizeGateMode, ReworkHistory, runIssue, summarizeEvent, touchLastEvent, touchRunActivity, } from '@on-par/factory-core';
|
|
5
|
+
import { shipHostBuildSlot } from './host-slot.js';
|
|
6
6
|
import { claimReworkRequests } from './ship-review-rework.js';
|
|
7
7
|
import { createCheckResumeStore, createGithubLaneClaimStalenessProbe, createPlanReuseStore, egressHostMessage, egressSummaryMessage, holdRunConfigSnapshot, logCost, logEvent, readIssueRunState, recordLocalAuthFailure, resolveBaseHealthChecks, resolveDraftPrPolicy, resolveEffectiveConfig, resolvePrClassifierPolicy, runStateFile, shouldProxyEgress, startEgressProxy, worktreeSandboxFor, } from '@on-par/factory-core/internal';
|
|
8
8
|
import { baseChecksVerdict, baseHealthWithCi } from './base-health-ci.js';
|
|
@@ -10,9 +10,9 @@ import { formatDeprecation } from './octokit.js';
|
|
|
10
10
|
import { restoredLoggingBreaker } from './provider-restored-log.js';
|
|
11
11
|
import { resolveRunBranch } from './run-branch.js';
|
|
12
12
|
import { shipRuntime } from './ship-runtime.js';
|
|
13
|
-
import { runStateRecorder } from './ship-run-state.js';
|
|
13
|
+
import { phaseRecorder, runStateRecorder } from './ship-run-state.js';
|
|
14
14
|
import { maybeWriteBenchmarkArtifacts, maybeWriteLocalRunReport } from './ship-reports.js';
|
|
15
|
-
import { applyMeteredGuard, modelOverrideMessages } from './model-override-messages.js';
|
|
15
|
+
import { applyMeteredGuard, modelOverrideMessages, resolveProviderOrder } from './model-override-messages.js';
|
|
16
16
|
import { buildRunRequest, decomposeQueue, finishOutcome, logSandboxPolicy, setupRunWorkspace, stubAwareShipPhase, TERMINAL_EVENT_KINDS, } from './ship-steps.js';
|
|
17
17
|
/** Every one-shot entry point (ship, run-issue, run-brief, run lanes, resume --from check) runs here with the source
|
|
18
18
|
* checkout's repo config snapshotted, so CHECK in a worktree without `.factory/` runs its `checks` (#3600). */
|
|
@@ -124,7 +124,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
124
124
|
}
|
|
125
125
|
logEvent(paths.events, type, issueNum, msg, { ...extra, lane, phase });
|
|
126
126
|
// Best-effort lastEvent summary (#1327): a write failure is swallowed, not logged (re-entrancy).
|
|
127
|
-
touchLastEvent(phaseSnapshotFile(paths.runs, issueNum), summarizeEvent(type, msg)).catch(() => { });
|
|
127
|
+
touchLastEvent(phaseSnapshotFile(paths.runs, workKeyFromIssue(issueNum)), summarizeEvent(type, msg)).catch(() => { });
|
|
128
128
|
};
|
|
129
129
|
const log = mkLog();
|
|
130
130
|
log('issue-title', issueTitle);
|
|
@@ -187,7 +187,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
187
187
|
const proxySettings = resolveEnvironmentProxy(factoryConfig);
|
|
188
188
|
const resolveBaseUrl = (appPort) => resolveLaneBaseUrl(paths, proxySettings, worktree, appPort);
|
|
189
189
|
// Read before runIssue: the run-state recorder overwrites this file on its first update (#3373).
|
|
190
|
-
const previousAttempt = await readIssueRunState(runStateFile(paths.runs, issueNum));
|
|
190
|
+
const previousAttempt = await readIssueRunState(runStateFile(paths.runs, workKeyFromIssue(issueNum)));
|
|
191
191
|
const reworkClaim = claimReworkRequests(paths, issueNum, ctx?.resumeFrom || ctx?.localOnly || noPr, log);
|
|
192
192
|
const request = {
|
|
193
193
|
...buildRunRequest({
|
|
@@ -218,6 +218,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
218
218
|
activeSandboxPolicy,
|
|
219
219
|
processGroupGraceMs,
|
|
220
220
|
paths,
|
|
221
|
+
providerOrder: resolveProviderOrder(repoConfig, policy.models, log),
|
|
221
222
|
}),
|
|
222
223
|
previousAttempt,
|
|
223
224
|
...reworkClaim,
|
|
@@ -236,7 +237,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
236
237
|
planPhase: phases.planPhase,
|
|
237
238
|
buildPhase: phases.buildPhase,
|
|
238
239
|
checkPhase: phases.checkPhase,
|
|
239
|
-
hostBuildSlot:
|
|
240
|
+
hostBuildSlot: shipHostBuildSlot(factoryConfig, issueNum, log, { repoRoot, ghRepo, paths, slots: ctx?.runSlots }),
|
|
240
241
|
shipPhase: shipPhaseForMode,
|
|
241
242
|
requiredChecksVerdict: baseChecksVerdict(octokit, ghOwner, ghName, baseHealthOpts),
|
|
242
243
|
checkBaseHealth: deps.checkBaseHealth ?? baseHealthWithCi(octokit, ghOwner, ghName, baseHealthOpts),
|
|
@@ -248,15 +249,8 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
248
249
|
reworkHistory,
|
|
249
250
|
laneFileGuard,
|
|
250
251
|
laneClaimStaleness: createGithubLaneClaimStalenessProbe({ octokit, branchPrefix: policy.effective.branchPrefix }),
|
|
251
|
-
recordPhase: (
|
|
252
|
-
|
|
253
|
-
return writePhaseSnapshot(phaseSnapshotFile(paths.runs, issueNum), {
|
|
254
|
-
issue: issueNum,
|
|
255
|
-
phase,
|
|
256
|
-
updatedAt: now,
|
|
257
|
-
lastActivityAt: now,
|
|
258
|
-
});
|
|
259
|
-
},
|
|
252
|
+
recordPhase: phaseRecorder(paths.runs, issueNum),
|
|
253
|
+
claimSignal: ctx?.signal,
|
|
260
254
|
recordRunState: runStateRecorder(paths.runs, {
|
|
261
255
|
issue: issueNum,
|
|
262
256
|
lane: lane ?? '',
|
|
@@ -265,7 +259,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
265
259
|
specPath,
|
|
266
260
|
startedAt: runStartedAt,
|
|
267
261
|
}),
|
|
268
|
-
onActivity: () => touchRunActivity(phaseSnapshotFile(paths.runs, issueNum), new Date().toISOString()),
|
|
262
|
+
onActivity: () => touchRunActivity(phaseSnapshotFile(paths.runs, workKeyFromIssue(issueNum)), new Date().toISOString()),
|
|
269
263
|
onDecomposed: (childIssues) => void decomposeQueue({ issueNum, childIssues, paths, planLog: mkLog('plan') }),
|
|
270
264
|
writeLocalRunReport: (info) => maybeWriteLocalRunReport({
|
|
271
265
|
issueNum,
|