@on-par/factory-cli 0.9.8-next.9 → 0.9.9-next.1

package/dist/cli/index.js

@@ -7,12 +7,16 @@ import { arch, hostname as osHostname, release, platform, userInfo } from 'node:
 import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path';
 import { promisify, styleText } from 'node:util';
 import { INVALID_BRANCH_PREFIX_MESSAGE, resolveBranchPrefixOption } from './branch-prefix.js';
-import { acquirePortLease, aggregateCosts, appendKpiHistoryLine, applyRepoConfig, buildPhase, checkPhase, clearProxyState, computeHealthKpis, ConstitutionLoader, createDefaultWorkSourceRegistry, createLogger, createLaneProxy, defaultFindPortListeners, describeEffectiveConfig, detectPostMergeDefects, diagnoseModels, probeDeclaredHarnesses, estimateTrailingSpend, fetchDefectSources, fetchHumanEventSources, 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, resolveSandboxPolicy, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, runAutoIngest, shipPhase, formatCostTotal, validateQueue, watchUsage, writeLocalRunReport, writeProxyState, } from '@on-par/factory-core';
-import { acquirePidFile, createCheckResumeStore, findSlicePlanComment, upsertSlicePlanComment, withSliceState, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, worktreeSandboxFor, resolveExperimental, resolveLocalOnly, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, normalizeTriageQueue, parseTriageCandidates, recordLocalAuthFailure, } from '@on-par/factory-core/internal';
+import { sweepLaneClaims, warnQueueDiagnostics } from './queue-startup.js';
+import { proposeTriageQueue } from './triage-open-prs.js';
+import { acquirePortLease, aggregateCosts, appendKpiHistoryLine, applyRepoConfig, buildPhase, checkPhase, clearProxyState, computeHealthKpis, ConstitutionLoader, createDefaultWorkSourceRegistry, createLogger, createLaneProxy, defaultFindPortListeners, describeEffectiveConfig, detectPostMergeDefects, diagnoseModels, probeDeclaredHarnesses, estimateTrailingSpend, fetchDefectSources, fetchHumanEventSources, 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, writeProxyState, } from '@on-par/factory-core';
+import { acquirePidFile, createCheckResumeStore, findSlicePlanComment, upsertSlicePlanComment, withSliceState, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapCleanShipWorktree, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, resolveExperimental, resolveLocalOnly, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, parseTriageCandidates, recordLocalAuthFailure, } from '@on-par/factory-core/internal';
 import { runTui } from '@on-par/factory-tui';
 import { admissionStateReaderFor, runQueueReconcile } from './admission.js';
 import { cmdClassifierBacktest, ClassifierBacktestInputError, } from './classifier-backtest.js';
+import { runHarnessCheckCommand } from './harness-check.js';
 import { findOpenPRForIssue, landIssue } from './land.js';
+import { STOP_SET_MESSAGE } from './stop-sentinel.js';
 import { AwaitingReviewError, CiFailedError, CiUnverifiedError, getPullRequestLandState, LandConflictError, LandFailureError, MergeGatedError, } from './land-pr.js';
 import { setLandRuntime } from './land-runtime.js';
 import { cmdRun } from './run.js';
@@ -24,6 +28,7 @@ import { runQueueClear } from './queue-clear.js';
 import { buildProgram } from './program.js';
 import { buildCostJson } from './cost-json.js';
 import { buildQueueAddJson } from './queue-add-json.js';
+import { renderQueueAddLines, renderUnparkLines } from './queue-output.js';
 import { buildQueueListJson } from './queue-list.js';
 import { appendUnparkEvent, runUnpark, UnparkError } from './unpark.js';
 import { buildRunsJson, parseRunsLimit } from './runs.js';
@@ -50,6 +55,7 @@ import { DeepCheckError, createDeepModelRunner, runIssueCheck } from './ready-ch
 import { childRunSucceeded, formatChildRunSummary, runChildrenInOrder } from './run-children.js';
 import { readRunFlagOverrides } from './run-flags.js';
 import { runStalenessGuard } from './staleness.js';
+import { gcWorktreeSandbox, reapParkedLane, reapPrlessShip } from './worktree-reap.js';
 const DEFAULT_CONFIG_LOADERS = {
     loadModelsConfig,
     loadRoutesConfig,
@@ -96,6 +102,7 @@ const DEFAULT_INTERNAL_OPS = {
     createLocalSmallDryRun,
     readCosts,
     sweepWorktrees,
+    reapCleanShipWorktree,
     releaseStaleClaims,
     pollBlockedParks,
     findUnmergedGreenPrs,
@@ -114,6 +121,7 @@ function resolveInternalOps(overrides, base = internalOps) {
         createLocalSmallDryRun: overrides.createLocalSmallDryRun ?? base.createLocalSmallDryRun,
         readCosts: overrides.readCosts ?? base.readCosts,
         sweepWorktrees: overrides.sweepWorktrees ?? base.sweepWorktrees,
+        reapCleanShipWorktree: overrides.reapCleanShipWorktree ?? base.reapCleanShipWorktree,
         releaseStaleClaims: overrides.releaseStaleClaims ?? base.releaseStaleClaims,
         pollBlockedParks: overrides.pollBlockedParks ?? base.pollBlockedParks,
         findUnmergedGreenPrs: overrides.findUnmergedGreenPrs ?? base.findUnmergedGreenPrs,
@@ -414,7 +422,7 @@ async function cmdInit(opts = {}) {
     // Doctor-style validation (policy=auto, N models reachable) — informational, never fails init.
     const modelsConfig = applyRepoConfig(configLoaders.loadModelsConfig(), configLoaders.loadRepoConfig(repoRoot));
     const registry = new coreOps.ModelRegistry(modelsConfig);
-    const diagnoses = coreOps.diagnoseModels(registry, modelDoctorProbes({ requireOllamaOnPath: true }), resolveExperimental(), resolveLocalOnly());
+    const diagnoses = coreOps.diagnoseModels(registry, modelDoctorProbes(), resolveExperimental(), resolveLocalOnly());
     console.log(formatInitReachability(diagnoses));
     if (!hasReachableWorker(diagnoses)) {
         console.log(styleText('yellow', 'No worker model reachable yet — see `factory doctor` and `factory models --doctor`.'));
@@ -815,8 +823,8 @@ export function formatDoctorReport(diagnoses, repoDefined = new Set()) {
 export function hasReachableWorker(diagnoses) {
     return diagnoses.some((d) => d.reachable && (d.tiers.includes('worker') || d.tiers.includes('worker_fallback')));
 }
-function ollamaModelSet(requireOnPath = false) {
-    if (requireOnPath && !coreOps.isCommandAvailable('ollama'))
+function ollamaModelSet() {
+    if (!coreOps.isCommandAvailable('ollama'))
         return undefined;
     try {
         const out = shellOps.execSync('ollama list', { timeout: 10_000 });
@@ -831,15 +839,21 @@ function ollamaModelSet(requireOnPath = false) {
     }
 }
 /** Probes shared by every doctor-style reachability check (init, models --doctor, overnight
- *  preflight), so their counts agree. init passes `requireOllamaOnPath` so a missing binary never
- *  reaches the shell (#2507). */
-export function modelDoctorProbes(opts = {}) {
-    const ollamaModels = ollamaModelSet(opts.requireOllamaOnPath === true);
+ *  preflight), so their counts agree. The probes never invoke `ollama` unless it is on PATH, so a
+ *  missing binary never reaches the shell (#2507, #2724). */
+export function modelDoctorProbes() {
+    const ollamaModels = ollamaModelSet();
     return {
         commandAvailable: coreOps.isCommandAvailable,
         ollamaModelPresent: ollamaModels ? (model) => ollamaModels.has(model) : undefined,
     };
 }
+async function cmdHarnessCheck(id, opts) {
+    const r = await runHarnessCheckCommand(id, opts, { repoRoot: await getRepoRoot(), ...configLoaders });
+    if (r.exitCode !== 0)
+        throw new CliExitError(r.output, r.exitCode);
+    console.log(r.output);
+}
 async function cmdModels(opts = {}) {
     const repoRoot = await getRepoRoot();
     const repoConfig = configLoaders.loadRepoConfig(repoRoot);
@@ -1190,16 +1204,17 @@ export function resolveUsageKnobs(env = process.env, repoConfig = null, override
     };
 }
 /** Human-readable name for whatever decided the usage-watch gate, used in the `factory run`
- *  and `factory supervise` logs so an explicit operator override is always attributable (#1404). */
-export function usageWatchSourceLabel(source, watch) {
+ *  and `factory supervise` logs so an explicit operator override is always attributable (#1404). `repoConfigLabel` names the
+ *  repo config file that was loaded (#2570). */
+export function usageWatchSourceLabel(source, watch, repoConfigLabel = 'the repo config') {
     switch (source) {
         case 'flag':
             return watch ? 'flag: --usage-watch' : 'flag: --no-usage-watch';
         case 'repo':
-            return '.factory/config.json: budget.watchdog.watch';
+            return `${repoConfigLabel}: budget.watchdog.watch`;
         case 'env':
             return 'env: FACTORY_USAGE_WATCH';
-        default:
+        case 'default':
             return 'default';
     }
 }
@@ -1240,11 +1255,6 @@ export async function cmdUsage(deps = {}, opts = {}) {
         console.log(heuristicLine);
     }
 }
-function warnQueueDiagnostics(diagnostics) {
-    for (const d of diagnostics) {
-        console.error(styleText('yellow', `factory: queue ${d.message} — skipped`));
-    }
-}
 /** GitHub is polled far less often than local files: a queue changes on the order of minutes. */
 const TUI_GITHUB_QUEUE_POLL_MS = 30_000;
 /** The Queue tab's backlog source for `factory tui` (#1362). Mirrors `factory run`: GitHub Issues
@@ -1304,7 +1314,7 @@ async function cmdTui(opts = {}, runTuiImpl = runTui) {
     const effectiveConfigLines = describeEffectiveConfig({
         router,
         repo: repoConfig,
-        repoConfigPath: '.factory/config.json',
+        repoConfigPath: repoConfigFileFor(repoRoot, paths.config).relPath,
         mergePolicy: resolveMergePolicy(configLoaders.loadFactoryConfigForRepo(paths.config), process.env, {
             auto: readRunFlagOverrides(paths.runFlags).autoMerge,
         }),
@@ -1451,6 +1461,7 @@ export function resolveEnvironmentAcquirer(opts) {
         };
     };
 }
+const sweepStaleLaneClaims = (paths, ghRepo) => sweepLaneClaims(paths, ghRepo, () => (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. */
@@ -1479,14 +1490,15 @@ async function runAutoWorktreeGc(repoRoot, paths, ghRepo, eventScope) {
  *  lane holds the land lock so a sweep can never race a merge. Logs worktree-gc only when it
  *  removed something. Never throws. */
 export async function sweepBetweenLaneIssues(issue, lane, repoRoot, ghRepo, paths, deps = {}) {
-    const { loadConfig = configLoaders.loadFactoryConfigForRepo, sweep = internalOps.sweepWorktrees, emitEvent = logEvent, octokit = getOctokit, } = deps;
+    const { loadConfig = configLoaders.loadFactoryConfigForRepo, sweep = internalOps.sweepWorktrees, emitEvent = logEvent, octokit = getOctokit, protectedIssues = () => new Set(), } = deps;
     try {
         const cfg = loadConfig(paths.config);
         if (!cfg.worktree.autoGcOnRun)
             return 'disabled';
         const gcLog = (type, msg) => emitEvent(paths.events, type, issue, msg, { lane });
         const sandbox = gcWorktreeSandbox(cfg.sandbox, repoRoot);
-        const report = await withGitLock(repoRoot, () => withFileLock(paths.mergeLock, () => withFileLock(paths.gitLock, () => sweep({ repoRoot, ttlDays: cfg.worktree.gcTtlDays, repo: ghRepo, branchPrefix: resolveBranchPrefix() }, { log: gcLog, octokit: octokit(), sandbox })), { timeoutMs: 0 }));
+        const gcOpts = { repoRoot, ttlDays: cfg.worktree.gcTtlDays, repo: ghRepo, branchPrefix: resolveBranchPrefix() };
+        const report = await withGitLock(repoRoot, () => withFileLock(paths.mergeLock, () => withFileLock(paths.gitLock, () => sweep({ ...gcOpts, protectedIssues: protectedIssues() }, { log: gcLog, octokit: octokit(), sandbox })), { timeoutMs: 0 }));
         if (report.removed.length > 0) {
             emitEvent(paths.events, 'worktree-gc', issue, `removed ${report.removed.length} stale worktree(s), kept ${report.kept}`, { lane });
             console.log(internalOps.formatGcReport(report));
@@ -1538,6 +1550,9 @@ async function cmdShip(issueNum, opts) {
         catch (err) {
             if (err instanceof IssueSkippedError)
                 return;
+            if (ghRepo && !(err instanceof InvalidWorkRequestInputError) && !(err instanceof LaneEnvironmentPauseError)) {
+                await reapPrlessShipWorktree(issueNum, repoRoot, ghRepo, paths, branchPrefix);
+            }
             // #2492: a pull request number is a usage error, not a failed ship.
             if (err instanceof InvalidWorkRequestInputError)
                 throw new CliExitError(`factory: ${err.message}`, 2);
@@ -1853,30 +1868,23 @@ export async function withRepoRunLock(paths, command, fn, deps = {}) {
         throw err;
     }
 }
-/** The repo's current docker-sandbox descriptor for worktree-gc sweeps, or undefined for
- *  every other runtime/config state (including a fixture config with no `sandbox` key). */
-function gcWorktreeSandbox(sandboxCfg, repoRoot) {
-    if (!sandboxCfg)
-        return undefined;
-    const policy = resolveSandboxPolicy(sandboxCfg, { worktree: repoRoot, repoRoot });
-    return worktreeSandboxFor(policy?.runtime);
-}
-/** Eagerly reaps a parked lane's own worktree inside `factory run` (#1007). All the safety
- *  gates live in reapLaneWorktree; this wrapper resolves the lane's conventional worktree
- *  path and holds the same git+file lock pairing as every other worktree mutation site. A
- *  reap failure is logged as a warn and never surfaces — parking must always succeed. */
 export async function reapParkedLaneWorktree(issue, repoRoot, ghRepo, paths, prefixOverride) {
-    try {
-        const factoryConfig = configLoaders.loadFactoryConfigForRepo(paths.config);
-        const branchPrefix = prefixOverride ?? resolveEffectiveConfig(configLoaders.loadRepoConfig(repoRoot)).branchPrefix;
-        const worktreePath = worktreePathFor(repoRoot, ghRepo, issue, branchPrefix);
-        const log = (type, msg) => logEvent(paths.events, type, issue, msg);
-        const sandbox = gcWorktreeSandbox(factoryConfig.sandbox, repoRoot);
-        await withGitLock(repoRoot, () => withFileLock(paths.gitLock, () => reapLaneWorktree(repoRoot, worktreePath, { issue, branchPrefix, log, sandbox })));
-    }
-    catch (err) {
-        logEvent(paths.events, 'warn', issue, `parked-lane worktree reap failed: ${err?.message ?? String(err)}`);
-    }
+    await reapParkedLane({ configLoaders, worktreePathFor }, reapLaneWorktree, [
+        issue,
+        repoRoot,
+        ghRepo,
+        paths,
+        prefixOverride,
+    ]);
+}
+export async function reapPrlessShipWorktree(issue, repoRoot, ghRepo, paths, prefixOverride) {
+    await reapPrlessShip({ configLoaders, worktreePathFor }, internalOps.reapCleanShipWorktree, [
+        issue,
+        repoRoot,
+        ghRepo,
+        paths,
+        prefixOverride,
+    ]);
 }
 export async function cmdWorktreeGc(opts) {
     const repoRoot = await getRepoRoot();
@@ -2016,7 +2024,7 @@ async function cmdTriage(opts) {
             onLog: (msg) => logEvent(paths.events, 'triage', '-', msg),
         });
         model = result.model;
-        const queue = normalizeTriageQueue(result.output);
+        const queue = await proposeTriageQueue(result.output, ghRepo, paths.events, shellOps.exec);
         if (queue) {
             const header = triageQueueHeader(model, product);
             writeFileSync(paths.queueProposed, header + queue);
@@ -2176,7 +2184,8 @@ export async function cmdUnpark(issueArg, opts = {}) {
         console.log(JSON.stringify(result));
         return;
     }
-    console.log(styleText('green', `#${issue} unparked → lane ${result.lane}, position ${result.order}`));
+    for (const line of renderUnparkLines(result))
+        console.log(line);
 }
 export async function cmdQueueAdd(lane, issueArgs, opts = {}) {
     // Validate + dedupe BEFORE any GitHub call. parseIssueArg throws CliExitError(2) on bad input.
@@ -2215,17 +2224,8 @@ export async function cmdQueueAdd(lane, issueArgs, opts = {}) {
         }
         return;
     }
-    for (const r of results) {
-        if (r.outcome === 'queued') {
-            console.log(styleText('green', `#${r.issue} queued → lane ${lane}, position ${r.position}`));
-        }
-        else if (r.outcome === 'already-queued') {
-            console.log(`#${r.issue} already queued — skipped`);
-        }
-        else {
-            console.error(styleText('red', `#${r.issue} failed — ${r.detail}`));
-        }
-    }
+    for (const line of renderQueueAddLines(lane, results))
+        (line.stream === 'err' ? console.error : console.log)(line.text);
     const failed = results.filter((r) => r.outcome === 'failed');
     if (failed.length > 0) {
         throw new CliExitError(`factory: ${failed.length} issue(s) failed to queue`, 1);
@@ -2235,6 +2235,7 @@ export async function cmdQueueReconcile(opts = {}) {
     const repoRoot = await getRepoRoot();
     const paths = getFactoryPaths(repoRoot);
     const [owner, repo] = (await getGitHubRepo()).split('/');
+    await sweepStaleLaneClaims(paths, `${owner}/${repo}`);
     const client = createOctokitQueueClient(getOctokit());
     const { report, conflicts } = await runQueueReconcile({
         readSnapshot: () => readGithubQueueSnapshot({ client, owner, repo }),
@@ -2849,7 +2850,7 @@ export async function cmdResumeApproved(opts = {}) {
 }
 const USAGE_UNAVAILABLE_LINE = '[factory] supervise: usage signal unavailable — proceeding without resume gate (set FACTORY_USAGE_ESTIMATOR=1 to gate on the heuristic)';
 export async function superviseLoop(deps) {
-    const { cap, resumeAt, pollMs, watch = true, watchSource = 'default', resumeAtSource = 'default', pollSource = 'default', estimator = false, stopFile, eventsFile, now, runQueue, readUsageFn = () => readUsage({ cap, estimator }), pathExists = existsSync, clearStop = (path) => rmSync(path, { force: true }), sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), emitEvent = logEvent, writeLine = (line) => console.log(line), ingest, } = deps;
+    const { cap, resumeAt, pollMs, watch = true, watchSource = 'default', repoConfigLabel, resumeAtSource = 'default', pollSource = 'default', estimator = false, stopFile, eventsFile, now, runQueue, readUsageFn = () => readUsage({ cap, estimator }), pathExists = existsSync, clearStop = (path) => rmSync(path, { force: true }), sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), emitEvent = logEvent, writeLine = (line) => console.log(line), ingest, } = deps;
     let cycle = 0;
     if (resumeAtSource === 'flag') {
         const detail = 'usage watchdog threshold set by flag: --usage-threshold';
@@ -2866,11 +2867,11 @@ export async function superviseLoop(deps) {
         let pct = 0;
         let source = 'unavailable';
         if (!watch) {
-            writeLine(`[factory] supervise: usage watchdog disabled (${usageWatchSourceLabel(watchSource, watch)}) — skipping resume gate`);
+            writeLine(`[factory] supervise: usage watchdog disabled (${usageWatchSourceLabel(watchSource, watch, repoConfigLabel)}) — skipping resume gate`);
         }
         else {
             if (watchSource === 'flag') {
-                writeLine(`[factory] supervise: usage watchdog enabled (${usageWatchSourceLabel(watchSource, watch)}) — enforcing resume gate`);
+                writeLine(`[factory] supervise: usage watchdog enabled (${usageWatchSourceLabel(watchSource, watch, repoConfigLabel)}) — enforcing resume gate`);
             }
             let reading = await readUsageFn();
             if (reading === null) {
@@ -3009,7 +3010,7 @@ export async function cmdStop(opts = {}) {
         console.log(JSON.stringify(buildStopResumeJson({ action: 'stop', repo: json.repo, before, after })));
         return;
     }
-    console.log('STOP set — lanes halt between issues');
+    console.log(STOP_SET_MESSAGE);
 }
 export async function cmdResume(issue, opts = {}) {
     if (issue === undefined && opts.from !== undefined) {
@@ -3095,6 +3096,7 @@ function runSupervise(opts) {
         createIngestHook,
         cmdRun: (o) => runRun(o),
         CliExitError,
+        repoConfigFileFor,
     });
 }
 /** `factory status` (#2798): the handler lives in ./status.ts; this binds its runtime. */
@@ -3111,6 +3113,7 @@ function runStatus(opts = {}) {
         warnQueueDiagnostics,
         errorDetail,
         CliExitError,
+        repoConfigFileFor,
     });
 }
 /** `factory run` (#2800): the handler lives in ./run.ts; this binds its runtime. */
@@ -3126,6 +3129,7 @@ function runRun(opts = {}) {
         branchPrefixOrExit,
         withRepoRunLock,
         runAutoWorktreeGc,
+        sweepStaleLaneClaims,
         planRunLanes,
         preflightQueuedIssue,
         createQueuePreflightOps,
@@ -3165,6 +3169,7 @@ export const PROGRAM_HANDLERS = {
     cmdMigrate,
     cmdConstitution,
     cmdModels,
+    cmdHarnessCheck,
     cmdDoctor: runDoctor,
     cmdCost,
     cmdUsage,