@on-par/factory-cli 0.9.28-next.2 → 0.9.28-next.20

package/dist/cli/run-queue.js

@@ -0,0 +1,65 @@
+// packages/cli/src/cli/run-queue.ts — the QueueBackend factory run hands its lanes: GitHub labels, or Linear when tracker.kind is linear (#3918)
+import { styleText } from 'node:util';
+import { resolveMergePolicy, resolveSizeGateMode } from '@on-par/factory-core';
+import { createOctokitQueueClient, logEvent, resolveQueueClaimSettleMs, resolveTrackerConfig, withAdmissionGuard, } from '@on-par/factory-core/internal';
+import { admissionStateReaderFor } from './admission.js';
+import { laneFileHoldLookup } from './lane-file-hold.js';
+import { selectQueueBackend } from './queue-backend-select.js';
+import { reportQueueOrderConflict } from './run-order-conflict.js';
+export function createRunQueue(input) {
+    const { rt, paths, ghRepo, factoryConfig } = input;
+    const githubQueueOptions = () => {
+        const [owner, repo] = ghRepo.split('/');
+        const octokit = rt.getOctokit();
+        return {
+            client: createOctokitQueueClient(octokit),
+            owner,
+            repo,
+            claimSettleMs: resolveQueueClaimSettleMs(factoryConfig),
+            preflight: withAdmissionGuard({
+                reader: admissionStateReaderFor(paths.state),
+                preflight: (issue) => rt.preflightQueuedIssue(issue, rt.createQueuePreflightOps(octokit, owner, repo, {
+                    autoMergeStack: resolveSizeGateMode(factoryConfig) === 'stack' &&
+                        resolveMergePolicy(factoryConfig, process.env, { auto: input.autoMerge }).auto,
+                    stackMode: resolveSizeGateMode(factoryConfig) === 'stack',
+                    laneFileHold: laneFileHoldLookup(paths.laneFiles, ghRepo),
+                    onDeferred: input.deferrals.onDeferred,
+                })),
+                onConflict: (issue, verdict) => {
+                    const line = `#${issue} refused — ${verdict.reason} | repair: ${verdict.repair}`;
+                    console.error(styleText('yellow', `factory: ${line}`));
+                    logEvent(paths.events, 'queue_admission_conflict', String(issue), line);
+                },
+            }),
+            onOrderConflict: (conflict) => reportQueueOrderConflict(paths.events, conflict),
+        };
+    };
+    let selected;
+    const select = () => (selected ??= selectQueueBackend({
+        factoryConfig,
+        ghRepo,
+        env: process.env,
+        github: githubQueueOptions,
+        warn: (m) => logEvent(paths.events, 'warn', '-', m),
+    }));
+    return {
+        queue: () => select().backend,
+        startupLinearReap: async () => {
+            if (resolveTrackerConfig(factoryConfig).kind !== 'linear')
+                return;
+            try {
+                for (const row of await select().backend.reap()) {
+                    if (row.released && 'key' in row) {
+                        logEvent(paths.events, 'claim_expired_released', row.key, `released expired Linear claim ${row.key}`);
+                    }
+                }
+            }
+            catch (err) {
+                const detail = err instanceof Error ? err.message : String(err);
+                logEvent(paths.events, 'warn', '-', `Linear claim reap failed: ${detail}`);
+            }
+        },
+        onUnshippable: (key) => logEvent(paths.events, 'warn', key, `lane claimed Linear issue ${key}; lanes ship only GitHub issue numbers yet — released back to the queue`),
+    };
+}
+//# sourceMappingURL=run-queue.js.map

package/dist/cli/run-queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-queue.js","sourceRoot":"","sources":["../../src/cli/run-queue.ts"],"names":[],"mappings":"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"}

package/dist/cli/run-rework-poll.d.ts

@@ -0,0 +1,15 @@
+import type { Octokit } from '@octokit/rest';
+import type { FactoryConfig } from '@on-par/factory-core';
+export interface ReworkPollDeps {
+    octokit: Octokit;
+    ghRepo: string;
+    branchPrefix: string;
+    factoryConfig: FactoryConfig;
+    paths: {
+        events: string;
+        reviewRework: string;
+        iterate: string;
+    };
+}
+export declare function runReworkPolls(deps: ReworkPollDeps): Promise<void>;
+//# sourceMappingURL=run-rework-poll.d.ts.map

package/dist/cli/run-rework-poll.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-rework-poll.d.ts","sourceRoot":"","sources":["../../src/cli/run-rework-poll.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAkB1D,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClE;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FxE"}

package/dist/cli/run-rework-poll.js

@@ -0,0 +1,79 @@
+// packages/cli/src/cli/run-rework-poll.ts — one pass of the review-rework, `/factory rework` and `/factory iterate` polls a run's lanes share (#3563, #3625, #3882)
+import { createFileIterateStore, createFileReviewReworkStore, createOctokitCollaboratorPermissionClient, createOctokitIterateGitHub, createOctokitQueueClient, createOctokitReviewReworkGitHub, logEvent, parkPayload, pollCommentRework, pollIterateCommands, pollReviewRework, publishParkComment, resolveMaxReviewReworkRuns, } from '@on-par/factory-core/internal';
+import { workKeyFromIssue } from '@on-par/factory-core';
+export async function runReworkPolls(deps) {
+    const { octokit, ghRepo, branchPrefix, factoryConfig, paths } = deps;
+    const [owner = '', repo = ''] = ghRepo.split('/');
+    const results = await pollReviewRework({
+        github: createOctokitReviewReworkGitHub(octokit, owner, repo),
+        queue: createOctokitQueueClient(octokit),
+        owner,
+        repo,
+        branchPrefix,
+        trustedApprovers: factoryConfig.intake?.trustedApprovers,
+        permissions: createOctokitCollaboratorPermissionClient(octokit),
+        store: createFileReviewReworkStore(paths.reviewRework),
+        maxRuns: resolveMaxReviewReworkRuns(factoryConfig),
+        publishParkComment: (input) => publishParkComment({ octokit, repo: ghRepo, input }),
+    });
+    const logReworkResults = (list) => {
+        for (const r of list) {
+            if (r.outcome === 'queued') {
+                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 });
+            }
+            else if (r.outcome === 'capped') {
+                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, []));
+            }
+            else if (r.outcome === 'error') {
+                logEvent(paths.events, 'warn', r.issue, `review-rework poll for PR #${r.pr} failed: ${r.detail}`);
+            }
+        }
+    };
+    logReworkResults(results);
+    // #3882: `/factory rework` comments; a failure only warns so the review results above stand.
+    try {
+        logReworkResults(await pollCommentRework({
+            github: createOctokitIterateGitHub(octokit, owner, repo),
+            queue: createOctokitQueueClient(octokit),
+            owner,
+            repo,
+            branchPrefix,
+            trustedApprovers: factoryConfig.intake?.trustedApprovers,
+            permissions: createOctokitCollaboratorPermissionClient(octokit),
+            store: createFileReviewReworkStore(paths.reviewRework),
+            maxRuns: resolveMaxReviewReworkRuns(factoryConfig),
+            publishParkComment: (input) => publishParkComment({ octokit, repo: ghRepo, input }),
+        }));
+    }
+    catch (err) {
+        logEvent(paths.events, 'warn', 0, `comment-rework poll failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    // #3625: `/factory iterate` comments; a failure only warns so the review-rework results above stand.
+    try {
+        const iterated = await pollIterateCommands({
+            github: createOctokitIterateGitHub(octokit, owner, repo),
+            queue: createOctokitQueueClient(octokit),
+            owner,
+            repo,
+            branchPrefix,
+            trustedApprovers: factoryConfig.intake?.trustedApprovers,
+            permissions: createOctokitCollaboratorPermissionClient(octokit),
+            store: createFileIterateStore(paths.iterate),
+        });
+        for (const r of iterated) {
+            if (r.outcome === 'queued' || r.outcome === 'already-queued') {
+                logEvent(paths.events, 'iterate_queued', r.issue, `#${r.issue} queued for iterate on lane '${r.lane}' — PR #${r.pr} comment ${r.commentId} by ${r.actor}`, { lane: r.lane });
+            }
+            else if (r.outcome === 'rejected') {
+                logEvent(paths.events, 'iterate_rejected', r.issue, `iterate on PR #${r.pr} rejected: ${r.detail}`);
+            }
+            else {
+                logEvent(paths.events, 'warn', r.issue, `iterate poll for PR #${r.pr} failed: ${r.detail}`);
+            }
+        }
+    }
+    catch (err) {
+        logEvent(paths.events, 'warn', 0, `iterate poll failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+//# sourceMappingURL=run-rework-poll.js.map

package/dist/cli/run-rework-poll.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-rework-poll.js","sourceRoot":"","sources":["../../src/cli/run-rework-poll.ts"],"names":[],"mappings":"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"}

package/dist/cli/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAGL,eAAe,EAShB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AA6BzG,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EACV,OAAO,EACP,YAAY,EAEZ,uBAAuB,EACvB,YAAY,EACZ,oBAAoB,EACpB,sBAAsB,EACtB,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,eAAe,EAChB,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,6GAA6G;AAC7G,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,QAAQ,CACrB,IAAI,CAAC,OAAO,EAAE,0BAA0B,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,2BAA2B,CAAC,CAChH,CAAC;IACF,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC;IACjE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5E,eAAe,EAAE,OAAO,eAAe,CAAC;IACxC,iBAAiB,EAAE,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GAAG,MAAM,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,oBAAoB,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnG,iBAAiB,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChG,iBAAiB,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChG,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;IAClD,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;IACxD,oBAAoB,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IAC/D,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,kBAAkB,EAAE,CAClB,IAAI,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,EAC3E,SAAS,EAAE,QAAQ,GAAG,UAAU,KAC7B,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,qBAAqB,EAAE,OAAO,qBAAqB,CAAC;IACpD,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;IAC/C,cAAc,EAAE,OAAO,cAAc,CAAC;IACtC,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,6BAA6B,EAAE,CAC7B,MAAM,EAAE,YAAY,EAAE,EACtB,YAAY,EAAE,MAAM,KACjB,OAAO,CAAC,iBAAiB,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACtE,iBAAiB,EAAE,CACjB,KAAK,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EACzC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU,EAChB,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KACzB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,YAAY,EAAE,OAAO,YAAY,CAAC;CACnC;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuW5E"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}

package/dist/cli/run.js

@@ -2,21 +2,21 @@
 import { randomUUID } from 'node:crypto';
 import { existsSync, readFileSync } from 'node:fs';
 import { styleText } from 'node:util';
-import { applyRepoConfig, clearProxyState, getFactoryPaths, provisionLaneContainer, resolveCodexDisabled, resolveEffectiveBuildRoute, resolveEnvironmentProxy, resolveLaneBreakerThreshold, resolveMergePolicy, resolveSizeGateMode, workKeyFromIssue, } from '@on-par/factory-core';
-import { createDockerEngine, createQueueBackend, createFileIterateStore, createFileReviewReworkStore, createOctokitCollaboratorPermissionClient, createOctokitQueueClient, createOctokitIterateGitHub, createOctokitReviewReworkGitHub, logEvent, parkPayload, pollIterateCommands, pollReviewRework, publishParkComment, recordSliceMerged, resolveBaseHealthChecks, resolveLocalOnly, resolveMaxReviewReworkRuns, resolveQueueClaimSettleMs, resolveRunUsageHarness, settleParkedPullRequest, slugify, withAdmissionGuard, } from '@on-par/factory-core/internal';
-import { admissionStateReaderFor } from './admission.js';
+import { applyRepoConfig, clearProxyState, getFactoryPaths, provisionLaneContainer, resolveCodexDisabled, resolveEffectiveBuildRoute, resolveEnvironmentProxy, resolveLaneBreakerThreshold, workKeyFromIssue, } from '@on-par/factory-core';
+import { createRunQueue } from './run-queue.js';
+import { createDockerEngine, logEvent, recordSliceMerged, resolveBaseHealthChecks, resolveLaneDiscoveryIntervalMs, resolveLocalOnly, resolveRunUsageHarness, settleParkedPullRequest, slugify, resolveTrackerConfig, } from '@on-par/factory-core/internal';
 import { baseChecksVerdict } from './base-health-ci.js';
 import { createBaseHoldGate, formatBaseHoldCleared } from './base-hold.js';
 import { keychainPreflightError } from './doctor.js';
 import { awaitingCiLaneDeps } from './awaiting-ci-wiring.js';
 import { runEndOfRunKpiSnapshot } from './kpi-sweep.js';
-import { laneFileHoldLookup } from './lane-file-hold.js';
-import { reportQueueOrderConflict } from './run-order-conflict.js';
 import { waitForMerge } from './land.js';
 import { hostClaimGuards } from './host-claim-guards.js';
 import { DRAIN_MESSAGE, createNotifier, resolveNotifyCommand, withDiskLowNotify, withParkNotify } from './notify.js';
 import { createDeferralTracker, settleDeferredOnly } from './queue-startup.js';
+import { discoverQueuedLanes, superviseLanes } from './run-lane-discovery.js';
 import { runLane } from './run-lane.js';
+import { runReworkPolls } from './run-rework-poll.js';
 import { restackFromSlicePlan } from './run-restack.js';
 import { writeRunFlagOverrides } from './run-flags.js';
 import { shipIssue } from './ship.js';
@@ -48,41 +48,20 @@ export async function cmdRun(opts, rt) {
         }
         await rt.runAutoWorktreeGc(repoRoot, paths, ghRepo, 'all');
         await rt.sweepStaleLaneClaims(paths, ghRepo);
-        if (opts.localQueue !== true)
+        if (opts.localQueue !== true && resolveTrackerConfig(factoryConfig).kind !== 'linear') {
             await rt.reapExpiredClaims(paths, ghRepo);
+        }
         await rt.sweepOrphanDrafts(paths, ghRepo);
+        const runQueue = createRunQueue({ rt, paths, ghRepo, factoryConfig, autoMerge: opts.autoMerge, deferrals });
+        if (opts.localQueue !== true)
+            await runQueue.startupLinearReap();
+        const queue = runQueue.queue;
+        const readLocalQueue = () => (existsSync(paths.queue) ? readFileSync(paths.queue, 'utf-8') : null);
         const { lanes, diagnostics } = await rt.planRunLanes({
             localQueue: opts.localQueue === true,
-            readLocalQueue: () => (existsSync(paths.queue) ? readFileSync(paths.queue, 'utf-8') : null),
-            queue: () => {
-                const [owner, repo] = ghRepo.split('/');
-                const octokit = rt.getOctokit();
-                return createQueueBackend({
-                    kind: 'github',
-                    github: {
-                        client: createOctokitQueueClient(octokit),
-                        owner,
-                        repo,
-                        claimSettleMs: resolveQueueClaimSettleMs(factoryConfig),
-                        preflight: withAdmissionGuard({
-                            reader: admissionStateReaderFor(paths.state),
-                            preflight: (issue) => rt.preflightQueuedIssue(issue, rt.createQueuePreflightOps(octokit, owner, repo, {
-                                autoMergeStack: resolveSizeGateMode(factoryConfig) === 'stack' &&
-                                    resolveMergePolicy(factoryConfig, process.env, { auto: opts.autoMerge }).auto,
-                                stackMode: resolveSizeGateMode(factoryConfig) === 'stack',
-                                laneFileHold: laneFileHoldLookup(paths.laneFiles, ghRepo),
-                                onDeferred: deferrals.onDeferred,
-                            })),
-                            onConflict: (issue, verdict) => {
-                                const line = `#${issue} refused — ${verdict.reason} | repair: ${verdict.repair}`;
-                                console.error(styleText('yellow', `factory: ${line}`));
-                                logEvent(paths.events, 'queue_admission_conflict', String(issue), line);
-                            },
-                        }),
-                        onOrderConflict: (conflict) => reportQueueOrderConflict(paths.events, conflict),
-                    },
-                });
-            },
+            readLocalQueue,
+            queue,
+            onUnshippable: runQueue.onUnshippable,
         });
         rt.warnQueueDiagnostics(diagnostics);
         let knobs;
@@ -156,72 +135,17 @@ export async function cmdRun(opts, rt) {
         const workspaceBackend = factoryConfig.workspace?.backend ?? 'host';
         const runId = randomUUID();
         const containerEngine = workspaceBackend === 'disposable-docker' ? createDockerEngine({}) : undefined;
+        let started = [];
         try {
-            // Run lanes in parallel
-            const pids = [];
             // Issues in flight on any lane of this run; every lane's between-issues sweep protects them (#2964).
             const inFlightIssues = new Set();
             // #3563: one shared, coalesced review-rework poll for every lane's pre-claim step (GitHub queue only).
-            const runReviewReworkPoll = async () => {
-                const [owner = '', repo = ''] = ghRepo.split('/');
-                const octokit = rt.getOctokit();
-                const results = await pollReviewRework({
-                    github: createOctokitReviewReworkGitHub(octokit, owner, repo),
-                    queue: createOctokitQueueClient(octokit),
-                    owner,
-                    repo,
-                    branchPrefix,
-                    trustedApprovers: factoryConfig.intake?.trustedApprovers,
-                    permissions: createOctokitCollaboratorPermissionClient(octokit),
-                    store: createFileReviewReworkStore(paths.reviewRework),
-                    maxRuns: resolveMaxReviewReworkRuns(factoryConfig),
-                    publishParkComment: (input) => publishParkComment({ octokit, repo: ghRepo, input }),
-                });
-                for (const r of results) {
-                    if (r.outcome === 'queued') {
-                        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 });
-                    }
-                    else if (r.outcome === 'capped') {
-                        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, []));
-                    }
-                    else if (r.outcome === 'error') {
-                        logEvent(paths.events, 'warn', r.issue, `review-rework poll for PR #${r.pr} failed: ${r.detail}`);
-                    }
-                }
-                // #3625: `/factory iterate` comments; a failure only warns so the review-rework results above stand.
-                try {
-                    const iterated = await pollIterateCommands({
-                        github: createOctokitIterateGitHub(octokit, owner, repo),
-                        queue: createOctokitQueueClient(octokit),
-                        owner,
-                        repo,
-                        branchPrefix,
-                        trustedApprovers: factoryConfig.intake?.trustedApprovers,
-                        permissions: createOctokitCollaboratorPermissionClient(octokit),
-                        store: createFileIterateStore(paths.iterate),
-                    });
-                    for (const r of iterated) {
-                        if (r.outcome === 'queued' || r.outcome === 'already-queued') {
-                            logEvent(paths.events, 'iterate_queued', r.issue, `#${r.issue} queued for iterate on lane '${r.lane}' — PR #${r.pr} comment ${r.commentId} by ${r.actor}`, { lane: r.lane });
-                        }
-                        else if (r.outcome === 'rejected') {
-                            logEvent(paths.events, 'iterate_rejected', r.issue, `iterate on PR #${r.pr} rejected: ${r.detail}`);
-                        }
-                        else {
-                            logEvent(paths.events, 'warn', r.issue, `iterate poll for PR #${r.pr} failed: ${r.detail}`);
-                        }
-                    }
-                }
-                catch (err) {
-                    logEvent(paths.events, 'warn', 0, `iterate poll failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            };
+            const runReviewReworkPoll = () => runReworkPolls({ octokit: rt.getOctokit(), ghRepo, branchPrefix, factoryConfig, paths });
             let reviewPoll = null;
             const pollReviewReworkOnce = () => (reviewPoll ??= runReviewReworkPoll().finally(() => {
                 reviewPoll = null;
             }));
-            for (const planned of lanes) {
-                logEvent(paths.events, 'lane-start', '-', `lane '${planned.lane}' started${planned.issues.length ? ` (${planned.issues.length} issues)` : ''}`, { lane: planned.lane });
+            const startLane = async (planned) => {
                 if (containerEngine) {
                     const provision = await provisionLaneContainer(containerEngine, workspaceBackend, runId, slugify(planned.lane), ghRepo);
                     if (provision.attempted && !provision.created) {
@@ -231,15 +155,13 @@ export async function cmdRun(opts, rt) {
                         logEvent(paths.events, 'warn', '-', `disposable-docker workspace clone failed for lane '${planned.lane}': ${provision.workspaceError}`, { lane: planned.lane });
                     }
                 }
-                pids.push(runLane(planned.lane, planned.issues, repoRoot, ghRepo, paths, {
+                return runLane(planned.lane, planned.issues, repoRoot, ghRepo, paths, {
                     ...planned.deps,
                     ...(notifier ? { emitEvent: withDiskLowNotify(withParkNotify(logEvent, notifier), notifier) } : {}),
                     laneBreakerThreshold,
                     octokit: opts.localQueue === true ? undefined : () => rt.getOctokit(),
                     pollReviewRework: opts.localQueue === true ? undefined : pollReviewReworkOnce,
-                    ...(opts.localQueue === true
-                        ? {}
-                        : awaitingCiLaneDeps(() => rt.getOctokit(), ghRepo, paths, factoryConfig)),
+                    ...(opts.localQueue === true ? {} : awaitingCiLaneDeps(() => rt.getOctokit(), ghRepo, paths, factoryConfig)),
                     runId,
                     readParkSha: (branch) => rt.shellOps
                         .exec(`git rev-parse --verify ${JSON.stringify(`refs/remotes/origin/${branch}`)}`, { cwd: repoRoot })
@@ -287,9 +209,26 @@ export async function cmdRun(opts, rt) {
                     recordStackMerge: (issue, prNumber) => recordSliceMerged({ octokit: rt.getOctokit(), repo: ghRepo, issue, prNumber }).then(() => { }),
                     restack: (issue, merged) => restackFromSlicePlan({ octokit: rt.getOctokit(), repo: ghRepo, repoRoot, issue, merged }),
                     waitMerge: (issue, branch, root, gh, p, d = {}) => waitForMerge(issue, branch, root, gh, p, { ...d, mergeOverrides: { auto: opts.autoMerge } }),
-                }));
-            }
-            await Promise.allSettled(pids);
+                });
+            };
+            ({ started } = await superviseLanes(lanes.map((planned) => ({ planned, keys: planned.issues.map(String) })), {
+                intervalMs: resolveLaneDiscoveryIntervalMs(factoryConfig),
+                startLane,
+                stopRequested: () => readStopFileStatus(paths).present,
+                reapExpiredClaims: opts.localQueue === true
+                    ? undefined
+                    : resolveTrackerConfig(factoryConfig).kind === 'linear'
+                        ? runQueue.startupLinearReap
+                        : () => rt.reapExpiredClaims(paths, ghRepo),
+                discover: () => discoverQueuedLanes({
+                    localQueue: opts.localQueue === true,
+                    readLocalQueue,
+                    queue,
+                    onUnshippable: runQueue.onUnshippable,
+                    planRunLanes: rt.planRunLanes,
+                }),
+                log: (type, msg, lane) => logEvent(paths.events, type, '-', msg, lane ? { lane } : undefined),
+            }));
             controller.abort();
             await watchdog;
             if (opts.localQueue !== true)
@@ -311,7 +250,7 @@ export async function cmdRun(opts, rt) {
                 clearProxyState(paths.proxyState);
             }
         }
-        if (lanes.length > 0)
+        if (lanes.length > 0 || started.length > 0)
             await runEndOfRunKpiSnapshot(paths, repoRoot, branchPrefix, runStartedAt, rt);
     });
 }

package/dist/cli/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cli/run.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAEvF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACvB,2BAA2B,EAC3B,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,uBAAuB,EACvB,8BAA8B,EAC9B,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,OAAO,EACP,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAA4B,MAAM,aAAa,CAAC;AAgB/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACrH,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AA8DpF,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAgB,EAAE,EAAc;IAC3D,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5E,OAAO,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC;YAC9C,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9E,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;SACvD,CAAC,CAAC;QACH,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACtG,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,aAAa,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9E,MAAM,WAAW,GAAG,sBAAsB,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACrE,IAAI,WAAW,EAAE,CAAC;YAChB,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,qBAAqB,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YAClE,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,EAAE,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC7C,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,oBAAoB,CAAC,aAAa,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtF,MAAM,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5G,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;YAAE,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QACjE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAE7B,MAAM,cAAc,GAAG,GAAkB,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClH,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC;YACnD,UAAU,EAAE,IAAI,CAAC,UAAU,KAAK,IAAI;YACpC,cAAc;YACd,KAAK;YACL,aAAa,EAAE,QAAQ,CAAC,aAAa;SACtC,CAAC,CAAC;QACH,EAAE,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAErC,IAAI,KAAiB,CAAC;QACtB,IAAI,oBAA4B,CAAC;QACjC,IAAI,gBAAsC,CAAC;QAC3C,IAAI,CAAC;YACH,KAAK,GAAG,EAAE,CAAC,iBAAiB,CAC1B,OAAO,CAAC,GAAG,EACX,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,EACzC,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CACtC,CAAC;YACF,oBAAoB,GAAG,2BAA2B,CAAC,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC9F,gBAAgB,GAAG,uBAAuB,CAAC,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,EAAE,CAAC,YAAY,CAAC,YAAY,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,KAAK,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,kBAAkB,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,OAAO,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACvI,OAAO,CAAC,GAAG,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAC;YACxC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,KAAK,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,yDAAyD,CAAC;YACzE,OAAO,CAAC,GAAG,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAC;YACxC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,KAAK,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,+CAA+C,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,kBAAkB,MAAM,EAAE,CAAC,CAAC;YACxC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,eAAmC,CAAC;QACxC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC7D,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;gBAChH,MAAM,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,yBAAyB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC3F,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;gBACrC,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;gBACvD,MAAM,KAAK,GAAG,0BAA0B,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;gBACnG,eAAe,GAAG,sBAAsB,CAAC;oBACvC,UAAU,EAAE,KAAK,CAAC,KAAK;oBACvB,gBAAgB,EAAE,KAAK,CAAC,MAAM;oBAC9B,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC;yBAC1C,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;yBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBACvC,aAAa;oBACb,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,eAAe,GAAG,SAAS,CAAC,CAAC,kDAAkD;YACjF,CAAC;QACH,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK;YAC1B,CAAC,CAAC,EAAE,CAAC,OAAO;iBACP,UAAU,CAAC;gBACV,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,KAAK,CAAC,IAAI;gBACpB,UAAU,EAAE,KAAK,CAAC,MAAM;gBACxB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACzD,CAAC;iBACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAClB,gDAAgD;gBAChD,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,2BAA2B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAChF,CAAC,CAAC;YACN,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAEtB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC;QAEzF,MAAM,gBAAgB,GAAG,aAAa,CAAC,SAAS,EAAE,OAAO,IAAI,MAAM,CAAC;QACpE,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,gBAAgB,KAAK,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEtG,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,qGAAqG;YACrG,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;YACzC,uGAAuG;YACvG,MAAM,mBAAmB,GAAG,GAAkB,EAAE,CAC9C,cAAc,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3F,IAAI,UAAU,GAAyB,IAAI,CAAC;YAC5C,MAAM,oBAAoB,GAAG,GAAkB,EAAE,CAC/C,CAAC,UAAU,KAAK,mBAAmB,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;gBACjD,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC,CAAC,CAAC,CAAC;YACN,MAAM,SAAS,GAAG,KAAK,EAAE,OAAoB,EAAiB,EAAE;gBAC9D,IAAI,eAAe,EAAE,CAAC;oBACpB,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAC5C,eAAe,EACf,gBAAgB,EAChB,KAAK,EACL,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EACrB,MAAM,CACP,CAAC;oBACF,IAAI,SAAS,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;wBAC9C,QAAQ,CACN,KAAK,CAAC,MAAM,EACZ,MAAM,EACN,GAAG,EACH,yDAAyD,OAAO,CAAC,IAAI,MAAM,SAAS,CAAC,KAAK,EAAE,EAC5F,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CACvB,CAAC;oBACJ,CAAC;yBAAM,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;wBAC3F,QAAQ,CACN,KAAK,CAAC,MAAM,EACZ,MAAM,EACN,GAAG,EACH,sDAAsD,OAAO,CAAC,IAAI,MAAM,SAAS,CAAC,cAAc,EAAE,EAClG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CACvB,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE;oBACpE,GAAG,OAAO,CAAC,IAAI;oBACf,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnG,oBAAoB;oBACpB,OAAO,EAAE,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE;oBACrE,gBAAgB,EAAE,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB;oBAC7E,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;oBAC5G,KAAK;oBACL,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CACtB,EAAE,CAAC,QAAQ;yBACR,IAAI,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,uBAAuB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;yBACpG,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACjC,YAAY,EAAE,cAAc;oBAC5B,GAAG,eAAe,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC;oBACxG,YAAY,EACV,IAAI,CAAC,UAAU,KAAK,IAAI;wBACtB,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,kBAAkB,CAAC;4BACjB,IAAI,EAAE,KAAK,CAAC,QAAQ;4BACpB,IAAI,EAAE,MAAM;4BACZ,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CACf,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE;gCAClF,IAAI,EAAE,OAAO,CAAC,IAAI;6BACnB,CAAC;4BACJ,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;4BAC5E,qBAAqB,EAAE,CAAC,GAAG,EAAE,EAAE;gCAC7B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gCAC5C,OAAO,iBAAiB,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;oCACzD,MAAM,EAAE,gBAAgB;oCACxB,MAAM,EAAE,KAAK,CAAC,MAAM;oCACpB,IAAI,EAAE,OAAO,CAAC,IAAI;iCACnB,CAAC,CAAC,GAAG,CAAC,CAAC;4BACV,CAAC;yBACF,CAAC;oBACR,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;wBAClC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC5C,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;oBACxG,CAAC;oBACD,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;oBACnG,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CACvB,EAAE;yBACC,sBAAsB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE;wBACpE,eAAe,EAAE,GAAG,EAAE,CAAC,cAAc;qBACtC,CAAC;yBACD,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;oBACnB,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CACtB,EAAE,CAAC,sBAAsB,CACvB,KAAK,EACL,QAAQ,EACR,MAAM,EACN,KAAK,EACL,IAAI,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAC3D;oBACH,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CACvC,uBAAuB,CAAC;wBACtB,OAAO,EAAE,EAAE,CAAC,UAAU,EAAE;wBACxB,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;wBAC9B,MAAM;wBACN,MAAM;wBACN,eAAe,EAAE,KAAK;wBACtB,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;qBACrF,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;oBACnB,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CACpC,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;oBAC/F,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CACzB,oBAAoB,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;oBAC3F,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAChD,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;iBAC/F,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CACjC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EACvE;gBACE,UAAU,EAAE,8BAA8B,CAAC,aAAa,CAAC;gBACzD,SAAS;gBACT,aAAa,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,OAAO;gBACtD,iBAAiB,EACf,IAAI,CAAC,UAAU,KAAK,IAAI;oBACtB,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,IAAI,KAAK,QAAQ;wBACrD,CAAC,CAAC,QAAQ,CAAC,iBAAiB;wBAC5B,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC;gBACjD,QAAQ,EAAE,GAAG,EAAE,CACb,mBAAmB,CAAC;oBAClB,UAAU,EAAE,IAAI,CAAC,UAAU,KAAK,IAAI;oBACpC,cAAc;oBACd,KAAK;oBACL,aAAa,EAAE,QAAQ,CAAC,aAAa;oBACrC,YAAY,EAAE,EAAE,CAAC,YAAY;iBAC9B,CAAC;gBACJ,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC9F,CACF,CAAC,CAAC;YACH,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,MAAM,QAAQ,CAAC;YACf,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI;gBAC1B,MAAM,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;YACxF,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;YAChE,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,MAAM,CAAC;oBACd,IAAI,EAAE,OAAO;oBACb,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oBAC5B,OAAO,EAAE,aAAa;oBACtB,MAAM,EAAE,QAAQ,CAAC,MAAM;iBACxB,CAAC,CAAC;gBACH,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;gBACnB,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YACxC,MAAM,sBAAsB,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/cli/ship-options.d.ts

@@ -1,4 +1,13 @@
-import type { SizeGateMode } from '@on-par/factory-core';
+import { type FactoryConfig, type SizeGateMode } from '@on-par/factory-core';
+export interface ShipSizeGate {
+    noPr: boolean;
+    sizeGateMode: SizeGateMode;
+    explicitStack: boolean;
+    maxSlices: number;
+}
+/** The size gate for one ship (ADR-0147). `--no-pr` never files child issues or slice PRs and `--in-place` builds one
+ *  branch in one checkout (#3904), so both turn it off; `--base-branch` turns it off unless stack mode was asked for. */
+export declare function resolveShipSizeGate(opts: ShipIssueOptions, config: FactoryConfig): ShipSizeGate;
 export interface ShipIssueOptions {
     parkOverBudget?: boolean;
     product?: string;
@@ -21,11 +30,20 @@ export interface ShipIssueOptions {
     pr?: boolean;
     /** --base-branch (#3764): start from origin/<ref> and open the PR against <ref>; undefined = default branch. */
     baseBranch?: string;
+    /** --in-place / FACTORY_WORKSPACE=in-place (#3904): run in the current checkout, no worktree */
+    inPlace?: boolean;
 }
 /** Returns `raw` when it is usable as a git branch name, undefined otherwise. No trimming, no `origin/` stripping. */
 export declare function parseBaseBranch(raw: string): string | undefined;
 /** Validates `--base-branch`; an invalid value exits 2 before any worktree or PR exists. */
 export declare function baseBranchOrExit(raw: string | undefined): string | undefined;
+/** `--in-place` wins; else FACTORY_WORKSPACE ('worktree' | 'in-place'; unset or empty = worktree). */
+export declare function resolveWorkspaceMode(flag: boolean | undefined, env: NodeJS.ProcessEnv): 'in-place' | 'worktree';
+/** A message when `--in-place` is combined with a flag it cannot work with, else undefined. */
+export declare function inPlaceConflict(opts: {
+    baseBranch?: string;
+    sizeGate?: string;
+}): string | undefined;
 /** A message when `--base-branch` is combined with a flag it cannot work with, else undefined. */
 export declare function baseBranchConflict(opts: {
     baseBranch?: string;

package/dist/cli/ship-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ship-options.d.ts","sourceRoot":"","sources":["../../src/cli/ship-options.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,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,2HAA2H;IAC3H,aAAa,CAAC,EAAE,OAAO,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;IACb,gHAAgH;IAChH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAQD,sHAAsH;AACtH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO/D;AAED,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAU5E;AAED,kGAAkG;AAClG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,GAAG,SAAS,CAUrB;AAED,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAEhF"}
+{"version":3,"file":"ship-options.d.ts","sourceRoot":"","sources":["../../src/cli/ship-options.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAI9B,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;yHACyH;AACzH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,YAAY,CAQ/F;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,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,2HAA2H;IAC3H,aAAa,CAAC,EAAE,OAAO,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;IACb,gHAAgH;IAChH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAQD,sHAAsH;AACtH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO/D;AAED,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAU5E;AAED,sGAAsG;AACtG,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,UAAU,GAAG,UAAU,CAM/G;AAED,+FAA+F;AAC/F,wBAAgB,eAAe,CAAC,IAAI,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAQpG;AAED,kGAAkG;AAClG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,GAAG,SAAS,CAUrB;AAED,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAEhF"}

package/dist/cli/ship-options.js

@@ -1,4 +1,17 @@
+// packages/cli/src/cli/ship-options.ts — shipIssue's option bag and the --base-branch flag helpers (#3764)
+import { resolveSizeGateMaxSlices, resolveSizeGateMode, } from '@on-par/factory-core';
+import { isExplicitStackMode } from '@on-par/factory-core/internal';
 import { CliExitError } from './errors.js';
+/** The size gate for one ship (ADR-0147). `--no-pr` never files child issues or slice PRs and `--in-place` builds one
+ *  branch in one checkout (#3904), so both turn it off; `--base-branch` turns it off unless stack mode was asked for. */
+export function resolveShipSizeGate(opts, config) {
+    const noPr = opts.pr === false;
+    const gateOff = noPr || opts.inPlace === true || (opts.baseBranch !== undefined && opts.sizeGate !== 'stack');
+    const sizeGateMode = gateOff ? 'off' : (opts.sizeGate ?? resolveSizeGateMode(config));
+    const explicitStack = sizeGateMode === 'stack' &&
+        (opts.sizeGate !== undefined ? opts.explicitStack === true : isExplicitStackMode(config));
+    return { noPr, sizeGateMode, explicitStack, maxSlices: opts.maxSlices ?? resolveSizeGateMaxSlices(config) };
+}
 const FORBIDDEN_CHARS = /[\s~^:?*[\\]/;
 function hasControlChar(raw) {
     return [...raw].some((ch) => ch.charCodeAt(0) < 0x20 || ch.charCodeAt(0) === 0x7f);
@@ -27,6 +40,27 @@ export function baseBranchOrExit(raw) {
     }
     return parsed;
 }
+/** `--in-place` wins; else FACTORY_WORKSPACE ('worktree' | 'in-place'; unset or empty = worktree). */
+export function resolveWorkspaceMode(flag, env) {
+    if (flag === true)
+        return 'in-place';
+    const raw = env.FACTORY_WORKSPACE;
+    if (raw === undefined || raw === '' || raw === 'worktree')
+        return 'worktree';
+    if (raw === 'in-place')
+        return 'in-place';
+    throw new CliExitError(`factory: unknown FACTORY_WORKSPACE '${raw}' — expected 'worktree' or 'in-place'`, 2);
+}
+/** A message when `--in-place` is combined with a flag it cannot work with, else undefined. */
+export function inPlaceConflict(opts) {
+    if (opts.baseBranch !== undefined) {
+        return 'factory: --in-place runs on the default branch — drop --base-branch or drop --in-place';
+    }
+    if (opts.sizeGate === 'stack') {
+        return 'factory: --in-place builds one branch in the checkout — drop --stack/--size-gate stack or drop --in-place';
+    }
+    return undefined;
+}
 /** A message when `--base-branch` is combined with a flag it cannot work with, else undefined. */
 export function baseBranchConflict(opts) {
     const { baseBranch, sizeGate, workspace } = opts;

package/dist/cli/ship-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"ship-options.js","sourceRoot":"","sources":["../../src/cli/ship-options.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA0B3C,MAAM,eAAe,GAAG,cAAc,CAAC;AAEvC,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;AACrF,CAAC;AAED,sHAAsH;AACtH,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,GAAG;QAAE,OAAO,SAAS,CAAC;IAC9E,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACnH,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACrF,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IACjE,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACpG,OAAO,GAAG,CAAC;AACb,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,gBAAgB,CAAC,GAAuB;IACtD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,YAAY,CACpB,mCAAmC,GAAG,yEAAyE,EAC/G,CAAC,CACF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,kBAAkB,CAAC,IAIlC;IACC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IACjD,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC/C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,0FAA0F,CAAC;IACpG,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzE,OAAO,sGAAsG,CAAC;IAChH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,aAAa,CAAC,UAA8B;IAC1D,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,UAAU,EAAE,CAAC;AACvE,CAAC"}
+{"version":3,"file":"ship-options.js","sourceRoot":"","sources":["../../src/cli/ship-options.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,OAAO,EACL,wBAAwB,EACxB,mBAAmB,GAGpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAS3C;yHACyH;AACzH,MAAM,UAAU,mBAAmB,CAAC,IAAsB,EAAE,MAAqB;IAC/E,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC9G,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IACtF,MAAM,aAAa,GACjB,YAAY,KAAK,OAAO;QACxB,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5F,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;AAC9G,CAAC;AA4BD,MAAM,eAAe,GAAG,cAAc,CAAC;AAEvC,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;AACrF,CAAC;AAED,sHAAsH;AACtH,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,GAAG;QAAE,OAAO,SAAS,CAAC;IAC9E,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACnH,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACrF,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IACjE,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACpG,OAAO,GAAG,CAAC;AACb,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,gBAAgB,CAAC,GAAuB;IACtD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,YAAY,CACpB,mCAAmC,GAAG,yEAAyE,EAC/G,CAAC,CACF,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,sGAAsG;AACtG,MAAM,UAAU,oBAAoB,CAAC,IAAyB,EAAE,GAAsB;IACpF,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IACrC,MAAM,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC;IAClC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,UAAU;QAAE,OAAO,UAAU,CAAC;IAC7E,IAAI,GAAG,KAAK,UAAU;QAAE,OAAO,UAAU,CAAC;IAC1C,MAAM,IAAI,YAAY,CAAC,uCAAuC,GAAG,uCAAuC,EAAE,CAAC,CAAC,CAAC;AAC/G,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,eAAe,CAAC,IAAgD;IAC9E,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,wFAAwF,CAAC;IAClG,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC9B,OAAO,2GAA2G,CAAC;IACrH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,kBAAkB,CAAC,IAIlC;IACC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IACjD,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC/C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,0FAA0F,CAAC;IACpG,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzE,OAAO,sGAAsG,CAAC;IAChH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,aAAa,CAAC,UAA8B;IAC1D,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,UAAU,EAAE,CAAC;AACvE,CAAC"}