@on-par/factory-cli 0.9.18-next.2 → 0.9.18-next.4

package/dist/cli/index.js

@@ -12,7 +12,10 @@ import { startupSweeps, warnQueueDiagnostics } from './queue-startup.js';
 import { proposeTriageQueue } from './triage-open-prs.js';
 import { makeQueuePreflightOps, preflightQueuedIssue, } from './queue-preflight.js';
 import { acquirePortLease, aggregateCosts, appendKpiHistoryLine, applyRepoConfig, buildPhase, checkPhase, clearProxyState, computeHealthKpis, ConstitutionLoader, createDefaultWorkSourceRegistry, createLogger, createLaneProxy, defaultFindPortListeners, describeEffectiveConfig, detectPostMergeDefects, diagnoseModels, probeDeclaredHarnesses, estimateTrailingSpend, fetchDefectSources, fetchSubscriptionUsage, formatUsageReport, getConstitutionsDir, getFactoryPaths, GITHUB_ISSUE_SOURCE, hasUnresolvedPark, InvalidArtifactsDirError, InvalidWorkRequestInputError, InvalidWorkspaceError, isCommandAvailable, isProxyRunning, kpiBranchPrefixes, kpisToHistoryRecord, laneBaseUrl, laneEnv, laneHostLabel, loadFactoryConfigForRepo, loadModelsConfig, loadRepoConfig, loadRoutesConfig, LOCAL_BRIEF_SOURCE, joinClassifierOutcomes, mergeClassifierOutcomes, parseClassifierOutcomes, summarizeClassifierOutcomes, formatClassifierReport, mergedPrRefs, ModelRegistry, ModelRouter, parkReasonFor, parseKpiHistory, parseQueue, planPhase, readEvents, readPortLeases, readQueue, readUsage, reapOrphanProcesses, reconstructKpiEvents, recordLeasePgid, releasePortLease, renderKpiReport, renderKpiTrend, resolveDefectWindowDays, parseSizeGateMode, parseMaxSlices, SIZE_GATE_MODES, resolveEffectiveModelPins, resolveEnvironmentProxy, resolveArtifactsDir, resolveLocalOnlyPolicy, resolveMergePolicy, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, runAutoIngest, shipPhase, formatCostTotal, validateQueue, watchUsage, writeLocalRunReport, workKeyFromIssue, writeProxyState, } from '@on-par/factory-core';
-import { acquirePidFile, createCheckResumeStore, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, readRepoConfigFile, rewriteRepoConfigFile, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, fetchHumanEventSourcesCached, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, listStatelessLaneIssues, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapCleanShipWorktree, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, resolveExperimental, resolveLocalOnly, describeDraftPrPolicy, resolveDraftPrPolicy, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, parseTriageCandidates, laneSlug, formatStopMarker, readStopMarker, detectClaudePlan, } from '@on-par/factory-core/internal';
+import { acquirePidFile, createCheckResumeStore, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, readRepoConfigFile, rewriteRepoConfigFile, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, fetchHumanEventSourcesCached, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, listStatelessLaneIssues, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapCleanShipWorktree, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, resolveExperimental, resolveLocalOnly, describeDraftPrPolicy, resolveDraftPrPolicy, resolvePrClassifierPolicy, resolveReviewFloorRules, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, writePortFile, buildTriagePrompt, parseTriageCandidates, laneSlug, formatStopMarker, readStopMarker, detectClaudePlan, } from '@on-par/factory-core/internal';
+import { CliExitError } from './errors.js';
+import { withRepoRunLock } from './repo-run-lock.js';
+export { CliExitError, withRepoRunLock };
 import { formatSteerabilityReport } from '@on-par/factory-core/internal';
 import { runTui } from '@on-par/factory-tui';
 import { clearSelfUpdateStop } from './self-update-stop.js';
@@ -22,7 +25,7 @@ import { buildSteerabilityReport } from './steerability-report.js';
 import { runHarnessCheckCommand } from './harness-check.js';
 import { landIssue } from './land.js';
 import { STOP_SET_MESSAGE } from './stop-sentinel.js';
-import { AwaitingReviewError, CiFailedError, CiUnverifiedError, LandConflictError, LandFailureError, MergeGatedError, } from './land-pr.js';
+import { AwaitingReviewError, CiFailedError, isCiNotGreen, LandConflictError, LandFailureError, MergeGatedError, } from './land-pr.js';
 import { setLandRuntime } from './land-runtime.js';
 import { cmdRun } from './run.js';
 import { shipIssue } from './ship.js';
@@ -578,15 +581,6 @@ async function cmdMigrate(opts = {}) {
 }
 export class InvalidProductNameError extends Error {
 }
-/** Expected user-facing CLI failure. Thrown by command helpers; only main() maps it to a process exit code. */
-export class CliExitError extends Error {
-    code;
-    constructor(message, code) {
-        super(message);
-        this.code = code;
-        this.name = 'CliExitError';
-    }
-}
 /** Parse a CLI <issue> argument; rejects unsafe integers (#2836), also used by reset. Throws CliExitError(2) before any git/GitHub work runs. */
 export function parseIssueArg(raw) {
     const n = /^\d+$/.test(raw.trim()) ? Number(raw) : NaN;
@@ -1597,7 +1591,7 @@ async function cmdShip(issueNum, opts) {
                 throw new CliExitError(`factory: ${err.message}`, 2);
             throw new CliExitError(`Ship failed for issue #${issueNum}: ${err.message}`, 1);
         }
-    });
+    }, { scope: { kind: 'issue', key: workKeyFromIssue(issueNum) } });
 }
 async function cmdRunIssue(issueNum, opts) {
     if (availableAgentClis(coreOps.isCommandAvailable).length === 0) {
@@ -1659,7 +1653,7 @@ async function cmdRunIssue(issueNum, opts) {
             }
             throw new CliExitError(`Run failed for issue #${issueNum}: ${err.message}`, 1);
         }
-    });
+    }, { scope: { kind: 'issue', key: workKeyFromIssue(issueNum) } });
 }
 /** Runs each decomposed child through the one-shot pipeline in build order, inside the caller's
  *  run lock, then prints a per-child summary. Nested decompositions expand in place and closed
@@ -1684,14 +1678,14 @@ async function runDecomposedChildren(parent, children, opts, env) {
         console.log(styleText('cyan', `one-shot: resolved ${work.id} — running the pipeline (queue untouched)`));
         let outcome;
         try {
-            await shipIssue(child, opts, {
+            await withRepoRunLock(paths, 'factory run-issue', () => shipIssue(child, opts, {
                 repoRoot: env.repoRoot,
                 ghRepo: env.ghRepo,
                 workRequest: work,
                 onOutcome: (o) => {
                     outcome = o;
                 },
-            });
+            }), { scope: { kind: 'issue', key: workKeyFromIssue(child) } });
         }
         catch (err) {
             if (err instanceof IssueDecomposedError) {
@@ -1731,51 +1725,51 @@ async function cmdRunBrief(briefPath, opts) {
         throw new CliExitError(`factory: ${notInitializedMessage()}`, 2);
     }
     const branchPrefix = branchPrefixOrExit(opts.branchPrefix);
-    await withRepoRunLock(paths, 'factory run-brief', async () => {
-        recordDraftPrFlag(paths.runFlags, opts.draftPr);
-        let localOnly;
-        if (opts.workspace !== undefined) {
-            try {
-                localOnly = resolveLocalOnlyPolicy(opts.workspace);
-            }
-            catch (err) {
-                if (err instanceof InvalidWorkspaceError)
-                    throw new CliExitError(`factory: ${err.message}`, 2);
-                throw err;
-            }
+    let localOnly;
+    if (opts.workspace !== undefined) {
+        try {
+            localOnly = resolveLocalOnlyPolicy(opts.workspace);
         }
-        let artifactsDir;
-        if (opts.artifacts !== undefined) {
-            if (!localOnly) {
-                throw new CliExitError('factory: --artifacts requires --workspace (local-only runs only)', 2);
-            }
-            try {
-                artifactsDir = resolveArtifactsDir(opts.artifacts);
-            }
-            catch (err) {
-                if (err instanceof InvalidArtifactsDirError)
-                    throw new CliExitError(`factory: ${err.message}`, 2);
-                throw err;
-            }
-            console.log(styleText('cyan', `local-only: benchmark artifacts will be written to ${artifactsDir}`));
+        catch (err) {
+            if (err instanceof InvalidWorkspaceError)
+                throw new CliExitError(`factory: ${err.message}`, 2);
+            throw err;
+        }
+    }
+    let artifactsDir;
+    if (opts.artifacts !== undefined) {
+        if (!localOnly) {
+            throw new CliExitError('factory: --artifacts requires --workspace (local-only runs only)', 2);
         }
-        // Local-only runs never touch GitHub — no remote required, no mutation possible.
-        const ghRepo = localOnly ? 'local/workspace' : await getGitHubRepo();
-        // Pre-flight: resolve the brief through the canonical work-request seam
-        // BEFORE any worktree or PR exists — a malformed brief exits here, so BUILD never starts.
-        const workSources = createDefaultWorkSourceRegistry({ octokit: getOctokit() });
-        let work;
         try {
-            work = await workSources.resolve(LOCAL_BRIEF_SOURCE, { path: briefPath });
+            artifactsDir = resolveArtifactsDir(opts.artifacts);
         }
         catch (err) {
-            if (err instanceof InvalidWorkRequestInputError) {
+            if (err instanceof InvalidArtifactsDirError)
                 throw new CliExitError(`factory: ${err.message}`, 2);
-            }
-            throw new CliExitError(`factory: could not resolve brief at ${briefPath} (${errorDetail(err)}) — no worktree or PR was created`, 2);
+            throw err;
+        }
+        console.log(styleText('cyan', `local-only: benchmark artifacts will be written to ${artifactsDir}`));
+    }
+    // Local-only runs never touch GitHub — no remote required, no mutation possible.
+    const ghRepo = localOnly ? 'local/workspace' : await getGitHubRepo();
+    // Pre-flight: resolve the brief through the canonical work-request seam
+    // BEFORE any worktree or PR exists — a malformed brief exits here, so BUILD never starts.
+    const workSources = createDefaultWorkSourceRegistry({ octokit: getOctokit() });
+    let work;
+    try {
+        work = await workSources.resolve(LOCAL_BRIEF_SOURCE, { path: briefPath });
+    }
+    catch (err) {
+        if (err instanceof InvalidWorkRequestInputError) {
+            throw new CliExitError(`factory: ${err.message}`, 2);
         }
-        const digest = work.reference?.externalId ?? '';
-        const runNum = briefRunNumber(digest);
+        throw new CliExitError(`factory: could not resolve brief at ${briefPath} (${errorDetail(err)}) — no worktree or PR was created`, 2);
+    }
+    const digest = work.reference?.externalId ?? '';
+    const runNum = briefRunNumber(digest);
+    await withRepoRunLock(paths, 'factory run-brief', async () => {
+        recordDraftPrFlag(paths.runFlags, opts.draftPr);
         console.log(styleText('cyan', `one-shot: resolved ${work.id} — running the pipeline (queue untouched)`));
         logEvent(paths.events, 'work-source', runNum, `inline local brief ${briefPath} (sha256 ${digest})`);
         if (localOnly) {
@@ -1801,7 +1795,7 @@ async function cmdRunBrief(briefPath, opts) {
         catch (err) {
             throw new CliExitError(`Run failed for brief ${briefPath}: ${err.message}`, 1);
         }
-    });
+    }, { scope: { kind: 'issue', key: workKeyFromIssue(runNum) } });
 }
 async function cmdLocalSmallDryRun(issueNum, opts) {
     const repoRoot = await getRepoRoot();
@@ -1891,27 +1885,6 @@ function worktreePathFor(repoRoot, ghRepo, issueNum, prefix, loaders = configLoa
         prefix,
     });
 }
-/** Fences a whole run behind the checkout's `.factory/run.lock` (#598). A live holder is
- *  refused immediately — never queued behind a multi-hour run — and a dead holder's lock is
- *  reclaimed by withRunLock. Nested acquisition inside one process is a pass-through, so
- *  `factory supervise` can hold this across its loop. */
-export async function withRepoRunLock(paths, command, fn, deps = {}) {
-    const { runLock = withRunLock, emitEvent = logEvent } = deps;
-    try {
-        return await runLock(paths.runLock, fn, {
-            command,
-            onReclaim: (pid) => emitEvent(paths.events, 'lock-stolen', '-', `reclaimed ${paths.runLock} from dead holder pid ${pid ?? 'unknown'}`),
-        });
-    }
-    catch (err) {
-        if (err instanceof RunLockHeldError) {
-            emitEvent(paths.events, 'run_lock_conflict', '-', `${command} refused: ${err.message}`);
-            throw new CliExitError(`factory: ${err.message} — stop that run (or wait for it to finish) before starting another. ` +
-                `A dead run's lock is reclaimed automatically; remove ${paths.runLock} only if you are sure no factory run is live.`, 2);
-        }
-        throw err;
-    }
-}
 export async function reapParkedLaneWorktree(issue, repoRoot, ghRepo, paths, prefixOverride) {
     await reapParkedLane({ configLoaders, worktreePathFor }, reapLaneWorktree, [
         issue,
@@ -2033,7 +2006,7 @@ export async function cmdLand(issueNum, opts = {}, deps = {}) {
                 console.log(styleText('yellow', `⏸ PR #${err.prNumber} for issue #${issueNum} awaiting human review — left open`));
                 return;
             }
-            if (err instanceof CiUnverifiedError) {
+            if (isCiNotGreen(err)) {
                 console.log(styleText('yellow', `⏸ PR #${err.prNumber} for issue #${issueNum} — CI never reached a green verdict — left open, not merged`));
                 return;
             }
@@ -3026,7 +2999,7 @@ async function resumeFromCheck(issueNum) {
                 return;
             throw new CliExitError(`Resume failed for issue #${issueNum}: ${err.message}`, 1);
         }
-    });
+    }, { scope: { kind: 'issue', key: workKeyFromIssue(issueNum) } });
 }
 /** index.ts bindings the commander registrations in program*.ts call (#2793); type-only imports there avoid a runtime cycle. */
 /** `factory supervise` (#2797): the handler lives in ./supervise.ts; this binds its runtime. */