@on-par/factory-cli 0.9.28-next.9 → 0.9.29-next.1

package/dist/cli/index.js

@@ -11,13 +11,15 @@ import { INVALID_BRANCH_PREFIX_MESSAGE, resolveBranchPrefixOption } from './bran
 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, InvalidWorkRequestInputError, isCommandAvailable, isProxyRunning, kpiBranchPrefixes, kpisToHistoryRecord, laneBaseUrl, laneEnv, laneHostLabel, loadFactoryConfigForRepo, loadModelsConfig, loadRepoConfig, loadRoutesConfig, 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, resolveMergePolicy, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, runAutoIngest, shipPhase, formatCostTotal, validateQueue, watchUsage, writeLocalRunReport, issueNumberOf, 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, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, writePortFile, buildTriagePrompt, parseTriageCandidates, laneSlug, formatStopMarker, readStopMarker, detectClaudePlan, findSlicePlanComment, listBlockedBy, aliasDeprecatedSizeGateMode, checkResumeBaseDrift, formatBaseMovedRefusal, } from '@on-par/factory-core/internal';
+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, InvalidWorkRequestInputError, isCommandAvailable, isProxyRunning, kpiBranchPrefixes, kpisToHistoryRecord, laneBaseUrl, laneEnv, laneHostLabel, loadFactoryConfigForRepo, loadModelsConfig, loadRepoConfig, loadRoutesConfig, 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, resolveMergePolicy, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, runAutoIngest, shipPhase, formatCostTotal, validateQueue, watchUsage, writeLocalRunReport, isNumericWorkKey, issueNumberOf, 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, runOvernightQueue, parseRemoteSlug, setupWorktree, checkInPlaceCheckout, setupInPlaceCheckout, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, writePortFile, buildTriagePrompt, parseTriageCandidates, laneSlug, formatStopMarker, readStopMarker, detectClaudePlan, findSlicePlanComment, listBlockedBy, aliasDeprecatedSizeGateMode, checkResumeBaseDrift, formatBaseMovedRefusal, } from '@on-par/factory-core/internal';
 import { CliExitError } from './errors.js';
-import { baseBranchConflict, baseBranchOrExit } from './ship-options.js';
+import { baseBranchConflict, baseBranchOrExit, inPlaceConflict, resolveWorkspaceMode } from './ship-options.js';
 import { runIssueStack } from './stack-run.js';
 import { withRepoRunLock } from './repo-run-lock.js';
 export { CliExitError, withRepoRunLock };
+import { resolveAwaitingCiCapMs } from '@on-par/factory-core/internal';
+import { driveToMerge, exitForMerge, shouldDriveAfterShipFailure, validateMergeFlags } from './run-issue-merge.js';
 import { formatSteerabilityReport } from '@on-par/factory-core/internal';
 import { buildTierEvidence, formatTierEvidence, resolveTrustTier } from '@on-par/factory-core/internal';
 import { runTui } from '@on-par/factory-tui';
@@ -72,6 +74,8 @@ import { readRunFlagOverrides, recordDraftPrFlag } from './run-flags.js';
 import { runStalenessGuard } from './staleness.js';
 import { cmdBaselineClear } from './baseline.js';
 import { cmdBreakerReset } from './breaker.js';
+import { cmdRespond } from './respond-command.js';
+import { withShutdown } from './shutdown.js';
 import { runWorktreeKeep, runWorktreeRelease } from './worktree-keep.js';
 import { gcWorktreeSandbox, reapParkedLane, reapPrlessShip } from './worktree-reap.js';
 const DEFAULT_CONFIG_LOADERS = {
@@ -104,7 +108,14 @@ function resolveConfigLoaders(overrides, base = configLoaders) {
         resolveEffectiveModelPins: overrides.resolveEffectiveModelPins ?? base.resolveEffectiveModelPins,
     };
 }
-const DEFAULT_GIT_OPS = { setupWorktree, cleanupWorktree, gitFetch, checkResumeBaseDrift };
+const DEFAULT_GIT_OPS = {
+    setupWorktree,
+    cleanupWorktree,
+    gitFetch,
+    checkResumeBaseDrift,
+    checkInPlaceCheckout,
+    setupInPlaceCheckout,
+};
 /** Git worktree/fetch ops for the current main() or cmdLand invocation; DEFAULT_GIT_OPS outside them. */
 let gitOps = DEFAULT_GIT_OPS;
 /** Per-field `??` so an explicit `undefined` override falls back instead of replacing the default. */
@@ -114,6 +125,8 @@ function resolveGitOps(overrides, base = gitOps) {
         cleanupWorktree: overrides.cleanupWorktree ?? base.cleanupWorktree,
         gitFetch: overrides.gitFetch ?? base.gitFetch,
         checkResumeBaseDrift: overrides.checkResumeBaseDrift ?? base.checkResumeBaseDrift,
+        checkInPlaceCheckout: overrides.checkInPlaceCheckout ?? base.checkInPlaceCheckout,
+        setupInPlaceCheckout: overrides.setupInPlaceCheckout ?? base.setupInPlaceCheckout,
     };
 }
 const DEFAULT_INTERNAL_OPS = {
@@ -222,7 +235,7 @@ function resolvePhaseOps(overrides, base = phaseOps) {
 export const PREREQUISITES_TEXT = `First step: run \`factory doctor\` to check your setup and see what to fix.
 
 Prerequisites:
-  - Claude Code CLI installed and authenticated (Claude subscription): https://claude.com/claude-code
+  - A supported coding agent CLI installed and authenticated: Claude Code, Codex, OpenCode or Pi (\`factory doctor\` shows which are ready)
   - GitHub CLI authenticated: gh auth login
   - GITHUB_TOKEN or GH_TOKEN set (falls back to \`gh auth token\`)
 Run inside a git repository with a GitHub remote.
@@ -1527,7 +1540,7 @@ export function resolveEnvironmentAcquirer(opts) {
         };
     };
 }
-const { sweepStaleLaneClaims, sweepOrphanDrafts, reapExpiredClaims } = startupSweeps(() => hasGitHubToken() ? getOctokit() : undefined);
+const { sweepStaleLaneClaims, sweepOrphanDrafts, sweepCiPendingDrafts, reapExpiredClaims } = startupSweeps(() => hasGitHubToken() ? getOctokit() : undefined);
 /** The autoGcOnRun-gated worktree sweep every pipeline entry point runs before shipping
  *  (`factory run`, and since #1756 the one-shot `factory ship` / `factory run-issue`). Never
  *  throws — a GC failure is a warn, never a reason to abort the command. */
@@ -1643,7 +1656,8 @@ async function cmdRunIssue(issueNum, opts) {
     if (!existsSync(paths.root)) {
         throw new CliExitError(`factory: ${notInitializedMessage()}`, 2);
     }
-    const { runChildren: _removed, sizeGate: rawSizeGate, maxSlices: rawMaxSlices, stack, ...shipOpts } = opts;
+    const { runChildren: _removed, sizeGate: rawSizeGate, maxSlices: rawMaxSlices, stack, merge, mergeTimeout, admin, inPlace: _inPlaceFlag, ...shipOpts } = opts;
+    const mergeTimeoutMs = validateMergeFlags({ merge, mergeTimeout, admin, pr: opts.pr, stack: stack || rawSizeGate === 'stack' }, 'issue');
     const branchPrefix = branchPrefixOrExit(opts.branchPrefix, paths.config);
     const parsedSizeGate = sizeGateOrExit(rawSizeGate);
     if (stack && parsedSizeGate !== undefined && parsedSizeGate !== 'stack') {
@@ -1662,8 +1676,20 @@ async function cmdRunIssue(issueNum, opts) {
     if (opts.pr === false && sizeGate !== undefined && sizeGate !== 'off') {
         throw new CliExitError('factory: --no-pr runs with the size gate off — drop --size-gate or drop --no-pr', 2);
     }
+    const inPlace = resolveWorkspaceMode(opts.inPlace, process.env) === 'in-place';
+    if (inPlace) {
+        const inPlaceMsg = inPlaceConflict({ baseBranch, sizeGate });
+        if (inPlaceMsg)
+            throw new CliExitError(inPlaceMsg, 2);
+    }
     await withRepoRunLock(paths, 'factory run-issue', async () => {
         recordDraftPrFlag(paths.runFlags, opts.draftPr);
+        if (inPlace) {
+            // Refuse before the issue lookup and PLAN, under the run lock (#3904).
+            const problem = await gitOps.checkInPlaceCheckout(repoRoot);
+            if (problem)
+                throw new CliExitError(`factory: ${problem.message}`, 2);
+        }
         const ghRepo = await getGitHubRepo();
         // Pre-flight: resolve the issue through the canonical work-request seam
         // BEFORE any worktree or PR exists — a bad issue exits here.
@@ -1682,7 +1708,9 @@ async function cmdRunIssue(issueNum, opts) {
             throw new CliExitError(`factory: could not resolve issue #${issueNum} in ${ghRepo} (${errorDetail(err)}) — no worktree or PR was created`, 2);
         }
         console.log(styleText('cyan', `one-shot: resolved ${work.id} — running the pipeline (queue untouched)`));
-        await runAutoWorktreeGc(repoRoot, paths, ghRepo, issueNum);
+        // A one-job in-place container has no other lanes to collect.
+        if (!inPlace)
+            await runAutoWorktreeGc(repoRoot, paths, ghRepo, issueNum);
         const priorEvents = readEvents(paths.events, { includeSegments: true });
         if (hasUnresolvedPark(priorEvents, String(issueNum))) {
             logEvent(paths.events, 'human-restarted', issueNum, 'manual retry of a previously parked/failed run', {
@@ -1718,7 +1746,29 @@ async function cmdRunIssue(issueNum, opts) {
                 });
                 return;
             }
-            await shipIssue(issueNum, { ...shipOpts, branchPrefix, sizeGate, explicitStack, maxSlices }, { repoRoot, ghRepo, workRequest: work });
+            let outcome;
+            const drive = async () => exitForMerge(await driveToMerge({
+                issue: issueNum,
+                outcome,
+                repoRoot,
+                ghRepo,
+                paths,
+                timeoutMs: mergeTimeoutMs ?? resolveAwaitingCiCapMs(configLoaders.loadFactoryConfigForRepo(paths.config)),
+                ...(admin ? { admin } : {}),
+            }), `issue #${issueNum}`);
+            try {
+                await shipIssue(issueNum, { ...shipOpts, branchPrefix, sizeGate, explicitStack, maxSlices, inPlace }, { repoRoot, ghRepo, workRequest: work, onOutcome: (o) => (outcome = o) });
+            }
+            catch (err) {
+                if (merge &&
+                    shouldDriveAfterShipFailure(outcome) &&
+                    !(err instanceof CliExitError) &&
+                    !(err instanceof IssueSkippedError))
+                    await drive();
+                throw err;
+            }
+            if (merge)
+                await drive();
         }
         catch (err) {
             if (err instanceof CliExitError)
@@ -2527,10 +2577,15 @@ export function createIngestHook(repoRoot, paths, ingestCfg, deps = {}) {
     };
 }
 /** The lane loop is numeric and GitHub-only in v1 (ADR-0168 §1); this is its single meeting point with the WorkKey seam. */
-export function laneQueueDeps(queue, lane) {
+export function laneQueueDeps(queue, lane, onUnshippable) {
     return {
         claimNext: async () => {
             const claim = await queue.claimNext(lane);
+            if (claim !== null && !isNumericWorkKey(claim.key)) {
+                await queue.release(claim.key, 'queued');
+                onUnshippable?.(claim.key);
+                return null;
+            }
             return claim === null ? null : { issue: issueNumberOf(claim.key), decision: claim.decision };
         },
         releaseIssue: (issue, outcome) => queue.release(workKeyFromIssue(issue), outcome),
@@ -2566,7 +2621,7 @@ export async function planRunLanes(input) {
     const backend = input.queue();
     const lanes = await backend.lanes();
     return {
-        lanes: lanes.map((lane) => ({ lane, issues: [], deps: laneQueueDeps(backend, lane) })),
+        lanes: lanes.map((lane) => ({ lane, issues: [], deps: laneQueueDeps(backend, lane, input.onUnshippable) })),
         diagnostics: [],
     };
 }
@@ -2997,6 +3052,7 @@ function runRun(opts = {}) {
         runAutoWorktreeGc,
         sweepStaleLaneClaims,
         sweepOrphanDrafts,
+        sweepCiPendingDrafts,
         reapExpiredClaims,
         planRunLanes,
         preflightQueuedIssue,
@@ -3065,14 +3121,14 @@ export const PROGRAM_HANDLERS = {
     cmdQueueClear,
     cmdCheck,
     cmdDraft,
-    cmdShip,
-    cmdRunIssue,
-    cmdRunBrief,
+    cmdShip: withShutdown(cmdShip),
+    cmdRunIssue: withShutdown(cmdRunIssue),
+    cmdRunBrief: withShutdown(cmdRunBrief),
     cmdLocalSmallDryRun,
     cmdLocalSmallOvernight,
     cmdLand,
     cmdResumeApproved,
-    cmdRun: runRun,
+    cmdRun: withShutdown(runRun),
     cmdProxy,
     cmdFactoryd,
     cmdDaemonStart,
@@ -3085,8 +3141,9 @@ export const PROGRAM_HANDLERS = {
     cmdWorktreeRelease,
     cmdBaselineClear,
     cmdBreakerReset,
+    cmdRespond,
     cmdReset,
-    cmdSupervise: runSupervise,
+    cmdSupervise: withShutdown(runSupervise),
     cmdStop,
     cmdResume,
     cmdSteer: runSteerCommand,