@on-par/factory-cli 0.9.5-next.1 → 0.9.5-next.2

package/dist/cli/index.js

@@ -9,7 +9,7 @@ import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:pat
 import { promisify, styleText } from 'node:util';
 import { BRANCH_PREFIX_MATCH_OPTION_DESCRIPTION, BRANCH_PREFIX_OPTION_DESCRIPTION, INVALID_BRANCH_PREFIX_MESSAGE, resolveBranchPrefixOption, } from './branch-prefix.js';
 import { acquirePortLease, aggregateCosts, appendKpiHistoryLine, applyRepoConfig, buildPhase, checkPhase, clearProxyState, closedWorkSkipReason, computeHealthKpis, ConstitutionLoader, createDefaultWorkSourceRegistry, createFileApprovalGate, createLogger, createLaneProxy, defaultFindPortListeners, describeEffectiveConfig, detectPostMergeDefects, diagnoseModels, probeDeclaredHarnesses, drainSteering, estimateTrailingSpend, fetchDefectSources, fetchHumanEventSources, fetchSubscriptionUsage, formatKpiLines, formatUsageReport, getConstitutionsDir, getFactoryPaths, GITHUB_ISSUE_SOURCE, hasUnresolvedPark, InvalidArtifactsDirError, InvalidWorkRequestInputError, InvalidWorkspaceError, inspectPortLeases, isCommandAvailable, isProxyRunning, kpiBranchPrefixes, KNOWN_HARNESS_IDS, kpisToHistoryRecord, laneBaseUrl, laneEnv, LaneFileGuard, laneHostLabel, listQueuedSteering, loadFactoryConfig, loadFactoryConfigForRepo, loadModelsConfig, loadRepoConfig, loadRoutesConfig, LOCAL_BRIEF_SOURCE, localOnlyWorkspace, joinClassifierOutcomes, mergeClassifierOutcomes, parseClassifierOutcomes, summarizeClassifierOutcomes, formatClassifierReport, mergedPrRefs, ModelRegistry, ModelRouter, parkReasonFor, parseKpiHistory, parseQueue, partitionLocalQueueByActivity, phaseSnapshotFile, planPhase, provisionLaneContainer, ProviderBreaker, readEvents, readPortLeases, readQueue, readUsage, reapOrphanProcesses, reapStalePortLeases, reconstructKpiEvents, recordLeasePgid, releasePortLease, renderKpiReport, renderKpiTrend, resolveAutoFailover, resolveCodexDisabled, resolveDefectWindowDays, resolveBuildPublish, resolveSizeGateMode, parseSizeGateMode, parseMaxSlices, resolveSizeGateMaxSlices, SIZE_GATE_MODES, resolveDesignRegressionBlock, resolveReadinessUpdateIssueBody, resolveEffectiveBuildRoute, resolveEffectiveModelPins, resolveEfficiencyPolicy, resolveLaneBreakerThreshold, resolveEnvironmentPorts, resolveEnvironmentProxy, resolveArtifactsDir, resolveIngestConfig, resolveLocalOnlyPolicy, resolveMergePolicy, resolvePlanApproval, resolveProcessGroupGraceMs, resolveSandboxPolicy, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, ReworkHistory, rewriteQueueForDecomposition, runAutoIngest, runIssue, shipPhase, summarizeEvent, formatCostTotal, touchLastEvent, touchRunActivity, validateQueue, watchUsage, worktreeWorkspace, writeBenchmarkArtifacts, writeLocalRunReport, writePhaseSnapshot, writeProxyState, } from '@on-par/factory-core';
-import { acquirePidFile, createCheckResumeStore, createPlanReuseStore, checkBaseHealth, currentSlice, egressHostMessage, egressSummaryMessage, findSlicePlanComment, upsertSlicePlanComment, withSliceState, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, formatWorktreeLocation, laneWorktreePath, resolveWorktreeRoot, migrateRepoConfigToYaml, REPO_CONFIG_YAML_HEADER, branchFor, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, getIssueTitle, LEGACY_BRANCH_PREFIX, createDockerEngine, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, DEFAULT_FACTORYD_PORT, defaultRegistryPath, ensureDir, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, formatGcReport, gitFetch, isAutoMergeBlocked, listMicroVms, listOrphanContainers, logCost, logEvent, microVmName, planQueueMigration, readCosts, readGithubQueueSnapshot, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, worktreeSandboxFor, resolveExperimental, resolveFilingPolicy, resolveLocalOnly, resolvePrClassifierPolicy, resolveRunUsageHarness, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, findOpenPR, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, shouldProxyEgress, slugify, startEgressProxy, sweepWorktrees, watchChecks, watchChecksWithInfraRerun, withAdmissionGuard, withFileLock, withGitLock, withRunLock, wrapCommandInSandbox, writePortFile, buildTriagePrompt, normalizeTriageQueue, parseTriageCandidates, codexChatgptSessionState, hasClaudeLoginEvidence, hasOpencodeLoginEvidence, } from '@on-par/factory-core/internal';
+import { acquirePidFile, createCheckResumeStore, createPlanReuseStore, checkBaseHealth, currentSlice, egressHostMessage, egressSummaryMessage, findSlicePlanComment, recordSliceMerged, upsertSlicePlanComment, withSliceState, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, formatWorktreeLocation, laneWorktreePath, resolveWorktreeRoot, migrateRepoConfigToYaml, REPO_CONFIG_YAML_HEADER, branchFor, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, getIssueTitle, LEGACY_BRANCH_PREFIX, createDockerEngine, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, DEFAULT_FACTORYD_PORT, defaultRegistryPath, ensureDir, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, formatGcReport, gitFetch, isAutoMergeBlocked, listMicroVms, listOrphanContainers, logCost, logEvent, microVmName, planQueueMigration, readCosts, readGithubQueueSnapshot, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, worktreeSandboxFor, resolveExperimental, resolveFilingPolicy, resolveLocalOnly, resolvePrClassifierPolicy, resolveRunUsageHarness, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, findOpenPR, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, shouldProxyEgress, slugify, startEgressProxy, sweepWorktrees, watchChecks, watchChecksWithInfraRerun, withAdmissionGuard, withFileLock, withGitLock, withRunLock, wrapCommandInSandbox, writePortFile, buildTriagePrompt, normalizeTriageQueue, parseTriageCandidates, codexChatgptSessionState, hasClaudeLoginEvidence, claudeStoredSessionState, localAuthFailureSinceLogin, recordLocalAuthFailure, hasOpencodeLoginEvidence, } from '@on-par/factory-core/internal';
 import { runTui } from '@on-par/factory-tui';
 import { Command } from 'commander';
 import { admissionStateReaderFor, runQueueReconcile } from './admission.js';
@@ -902,6 +902,7 @@ async function cmdCheck(issueRaw, opts) {
         const repoConfig = configLoaders.loadRepoConfig(repoRoot);
         const effective = resolveEffectiveConfig(repoConfig);
         const router = new coreOps.ModelRouter(applyRepoConfig(configLoaders.loadModelsConfig(), repoConfig), configLoaders.loadRoutesConfig(), false, undefined, effective.allowExperimental, effective.localOnly);
+        router.setLocalAuthSink?.(recordLocalAuthFailure);
         runModel = createDeepModelRunner(router, repoRoot);
     }
     let report;
@@ -1005,6 +1006,7 @@ async function cmdClassifierBacktestEntry(opts) {
     const repoConfig = configLoaders.loadRepoConfig(repoRoot);
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(applyRepoConfig(configLoaders.loadModelsConfig(), repoConfig), configLoaders.loadRoutesConfig(), false, undefined, effective.allowExperimental, effective.localOnly);
+    router.setLocalAuthSink?.(recordLocalAuthFailure);
     try {
         await cmdClassifierBacktest({ ...opts, branchPrefix }, {
             repoRoot,
@@ -1247,6 +1249,7 @@ export async function cmdStatus(opts = {}) {
     const routesConfig = configLoaders.loadRoutesConfig();
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(modelsConfig, routesConfig, false, undefined, effective.allowExperimental, effective.localOnly);
+    router.setLocalAuthSink?.(recordLocalAuthFailure);
     const product = readActiveProduct(paths.product) ?? '(none)';
     console.log(styleText('bold', `== ${ghRepo} ==`));
     console.log(`Product: ${product}`);
@@ -1425,6 +1428,7 @@ async function cmdTui(opts = {}, runTuiImpl = runTui) {
     const routesConfig = configLoaders.loadRoutesConfig();
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(modelsConfig, routesConfig, false, undefined, effective.allowExperimental, effective.localOnly);
+    router.setLocalAuthSink?.(recordLocalAuthFailure);
     const effectiveConfigLines = describeEffectiveConfig({
         router,
         repo: repoConfig,
@@ -1618,6 +1622,7 @@ export async function shipIssue(issueNum, opts, ctx, deps = {}) {
             : { ...resolveEffectiveConfig(repoConfig), branchPrefix: opts.branchPrefix },
     };
     const router = new core.ModelRouter(policy.models, policy.routes, false, undefined, policy.effective.allowExperimental, policy.effective.localOnly);
+    router.setLocalAuthSink?.(recordLocalAuthFailure);
     router.skipMissingHarnessClis(core.isCommandAvailable);
     let issueSpend = 0;
     let laneSandboxRuntime = 'none';
@@ -2595,7 +2600,10 @@ async function landIssue(issueNum, repoRoot, ghRepo, paths, octokit, skipCI, bra
     // Legacy-prefix (LEGACY_BRANCH_PREFIX) branches are guessed too, after the resolved prefix (#1708).
     const resolved = branchPrefix ?? resolveEffectiveConfig(configLoaders.loadRepoConfig(repoRoot)).branchPrefix;
     const title = await getIssueTitle(ghRepo, issueNum, octokit);
-    const guesses = factoryBranchPrefixes(resolved).map((p) => branchFor(issueNum, title, p));
+    // ADR-0161: a stack layer lands by its exact branch, never by title guess or the Closes PR (the top layer).
+    const guesses = opts.branch
+        ? [opts.branch]
+        : factoryBranchPrefixes(resolved).map((p) => branchFor(issueNum, title, p));
     const guessedBranch = guesses[0];
     let branch = guessedBranch;
     let prNumber;
@@ -2611,7 +2619,7 @@ async function landIssue(issueNum, repoRoot, ghRepo, paths, octokit, skipCI, bra
             return undefined;
         };
         [, prNumber] = await Promise.all([gitOps.gitFetch(repoRoot), findByGuess()]);
-        if (!prNumber) {
+        if (!prNumber && !opts.branch) {
             const fallback = await findOpenPRForIssue(octokit, owner, repoName, issueNum);
             if (fallback) {
                 branch = fallback.branch;
@@ -2723,6 +2731,7 @@ async function cmdTriage(opts) {
     const routesConfig = configLoaders.loadRoutesConfig();
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(modelsConfig, routesConfig, false, undefined, effective.allowExperimental, effective.localOnly);
+    router.setLocalAuthSink?.(recordLocalAuthFailure);
     router.skipMissingHarnessClis(coreOps.isCommandAvailable);
     router.setCostSink((entry) => logCost(paths.costs, { ...entry, issue: '-' }));
     let plannerError;
@@ -3272,7 +3281,10 @@ async function cmdRun(opts = {}) {
                     repo,
                     preflight: withAdmissionGuard({
                         reader: admissionStateReaderFor(paths.state),
-                        preflight: (issue) => preflightQueuedIssue(issue, createQueuePreflightOps(octokit, owner, repo)),
+                        preflight: (issue) => preflightQueuedIssue(issue, createQueuePreflightOps(octokit, owner, repo, {
+                            autoMergeStack: resolveSizeGateMode(factoryConfig) === 'stack' &&
+                                resolveMergePolicy(factoryConfig, process.env, { auto: opts.autoMerge }).auto,
+                        })),
                         onConflict: (issue, verdict) => {
                             const line = `#${issue} refused — ${verdict.reason} | repair: ${verdict.repair}`;
                             console.error(styleText('yellow', `factory: ${line}`));
@@ -3388,6 +3400,7 @@ async function cmdRun(opts = {}) {
                     ship: (issue, o, c) => shipIssue(issue, { ...o, branchPrefix, prClassifier: opts.prClassifier }, c),
                     sweepFinished: (issue) => sweepBetweenLaneIssues(issue, planned.lane, repoRoot, ghRepo, paths).then(() => { }),
                     reapWorktree: (issue) => reapParkedLaneWorktree(issue, repoRoot, ghRepo, paths, opts.branchPrefix === undefined ? undefined : branchPrefix),
+                    recordStackMerge: (issue, prNumber) => recordSliceMerged({ octokit: getOctokit(), repo: ghRepo, issue, prNumber }).then(() => { }),
                     waitMerge: (issue, branch, root, gh, p, d = {}) => waitForMerge(issue, branch, root, gh, p, { ...d, mergeOverrides: { auto: opts.autoMerge } }),
                 }));
             }
@@ -3522,8 +3535,13 @@ export function laneQueueDeps(queue, lane) {
         countRemaining: async () => (await queue.list(lane)).length,
     };
 }
-export function createQueuePreflightOps(octokit, owner, repo) {
+export function createQueuePreflightOps(octokit, owner, repo, opts = {}) {
     return {
+        autoMergeStack: opts.autoMergeStack ?? false,
+        getPullRefs: async (prNumber) => {
+            const { data } = await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber });
+            return { headRef: data.head.ref, baseRef: data.base.ref, headSha: data.head.sha };
+        },
         expectedHeadRepoFullName: `${owner}/${repo}`,
         findOpenPR: (issue) => findOpenPRForIssue(octokit, owner, repo, issue),
         getLandState: (prNumber) => getPullRequestLandState(octokit, owner, repo, prNumber),
@@ -3540,8 +3558,10 @@ export function createQueuePreflightOps(octokit, owner, repo) {
         },
     };
 }
-/** ADR-0147: wait on the current slice PR, record its merge, or park when it was closed unmerged.
- *  Returns undefined to fall through to the Closes-PR preflight. */
+/** ADR-0147/ADR-0161: walk every pr-open slice PR bottom-up. Merged layers are recorded, a closed layer parks
+ *  (naming the layers above it), and the lowest open layer defers, or is adopted when stack auto-merge is on and
+ *  its base is main with green CI on the rebased head. Returns undefined to fall through to the Closes-PR
+ *  preflight only when no slice PR is still open. */
 async function preflightSlice(issue, deps) {
     let lookup;
     try {
@@ -3559,36 +3579,80 @@ async function preflightSlice(issue, deps) {
     if (lookup.status === 'not-found')
         return undefined;
     const { plan } = lookup;
-    const slice = currentSlice(plan);
-    if (slice === undefined || slice.state !== 'pr-open')
+    const n = plan.slices.length;
+    const open = plan.slices.filter((s) => s.state === 'pr-open');
+    if (open.length === 0)
         return undefined;
-    const label = `slice ${slice.index}/${plan.slices.length}`;
-    if (slice.prNumber === undefined) {
-        return { kind: 'park', reason: `${label} of #${issue} is pr-open but the slice plan records no PR number` };
-    }
-    const pr = slice.prNumber;
-    let state;
-    try {
-        state = await deps.getPullState(pr);
-    }
-    catch (err) {
-        return { kind: 'park', reason: `${label} PR #${pr} state lookup failed: ${errorDetail(err)}` };
-    }
-    if (state === 'open')
-        return { kind: 'defer' };
-    if (state === 'closed') {
-        return { kind: 'park', reason: `${label} PR #${pr} was closed without merging` };
-    }
-    try {
-        await deps.saveSlicePlan(issue, withSliceState(plan, slice.index, 'merged', pr));
-    }
-    catch (err) {
-        return {
-            kind: 'park',
-            reason: `${label} PR #${pr} merged but updating the slice plan failed: ${errorDetail(err)}`,
-        };
+    let next = plan;
+    let lastMerged;
+    const save = async () => {
+        if (lastMerged === undefined)
+            return undefined;
+        try {
+            await deps.saveSlicePlan(issue, next);
+        }
+        catch (err) {
+            return {
+                kind: 'park',
+                reason: `${lastMerged.label} PR #${lastMerged.pr} merged but updating the slice plan failed: ${errorDetail(err)}`,
+            };
+        }
+        return undefined;
+    };
+    for (const [at, slice] of open.entries()) {
+        const label = `slice ${slice.index}/${n}`;
+        if (slice.prNumber === undefined) {
+            return { kind: 'park', reason: `${label} of #${issue} is pr-open but the slice plan records no PR number` };
+        }
+        const pr = slice.prNumber;
+        let state;
+        try {
+            state = await deps.getPullState(pr);
+        }
+        catch (err) {
+            return { kind: 'park', reason: `${label} PR #${pr} state lookup failed: ${errorDetail(err)}` };
+        }
+        if (state === 'merged') {
+            next = withSliceState(next, slice.index, 'merged', pr);
+            lastMerged = { label, pr };
+            continue;
+        }
+        if (state === 'closed') {
+            const above = open.slice(at + 1);
+            const suffix = above.length > 0
+                ? `; layers above it: ${above.map((a) => `slice ${a.index}/${n} (#${a.prNumber})`).join(', ')}`
+                : '';
+            return { kind: 'park', reason: `${label} PR #${pr} was closed without merging${suffix}` };
+        }
+        const saved = await save();
+        if (saved)
+            return saved;
+        if (!deps.autoMergeStack)
+            return { kind: 'defer' };
+        let refs;
+        try {
+            refs = await deps.getPullRefs(pr);
+        }
+        catch (err) {
+            return { kind: 'park', reason: `${label} PR #${pr} ref lookup failed: ${errorDetail(err)}` };
+        }
+        // GitHub has not retargeted the layer to main yet: the lower layer is still unmerged.
+        if (refs.baseRef !== 'main')
+            return { kind: 'defer' };
+        let outcome;
+        try {
+            outcome = await deps.watch(refs.headSha);
+        }
+        catch (err) {
+            return { kind: 'park', reason: `CI watch for ${label} PR #${pr} failed: ${errorDetail(err)}` };
+        }
+        if (outcome === 'failure')
+            return { kind: 'park', reason: `CI for ${label} PR #${pr} ended failure` };
+        if (outcome !== 'success')
+            return { kind: 'defer' };
+        return { kind: 'adopt', branch: refs.headRef, stackLayer: { index: slice.index, count: n, prNumber: pr } };
     }
-    return undefined;
+    return (await save()) ?? undefined;
 }
 /** Resolve queued work from GitHub evidence without consuming model or worktree resources. */
 export async function preflightQueuedIssue(issue, deps) {
@@ -3690,7 +3754,7 @@ export function renderLanePausedComment(payload) {
     ].join('\n\n');
 }
 export async function runLane(lane, issues, repoRoot, ghRepo, paths, deps = {}) {
-    const { ship = shipIssue, waitMerge = waitForMerge, pathExists = existsSync, emitEvent = logEvent, claimNext = async () => null, releaseIssue = async () => { }, heartbeat, reapWorktree = async () => { }, sweepFinished = async () => { }, countRemaining, baseHoldGate, laneBreakerThreshold = 0, commentIssue = async () => { }, } = deps;
+    const { ship = shipIssue, waitMerge = waitForMerge, recordStackMerge = async () => { }, pathExists = existsSync, emitEvent = logEvent, claimNext = async () => null, releaseIssue = async () => { }, heartbeat, reapWorktree = async () => { }, sweepFinished = async () => { }, countRemaining, baseHoldGate, laneBreakerThreshold = 0, commentIssue = async () => { }, } = deps;
     let streak = null;
     let merged = 0;
     let awaitingReview = 0;
@@ -3752,6 +3816,7 @@ export async function runLane(lane, issues, repoRoot, ghRepo, paths, deps = {})
             streak = null;
             continue;
         }
+        const layer = decision.kind === 'adopt' ? decision.stackLayer : undefined;
         try {
             const sliceOutcome = {};
             const branch = decision.kind === 'adopt'
@@ -3774,6 +3839,15 @@ export async function runLane(lane, issues, repoRoot, ghRepo, paths, deps = {})
                 await settle(issue, 'queued');
                 continue;
             }
+            if (layer) {
+                // ADR-0161: land exactly this layer's branch, record it, and re-queue for the next layer.
+                await withHeartbeat(issue, heartbeat, () => waitMerge(issue, branch, repoRoot, ghRepo, paths, { landBranch: branch }));
+                await recordStackMerge(issue, layer.prNumber).catch((err) => emitEvent(paths.events, 'warn', issue, `slice ${layer.index}/${layer.count} merged but recording it failed: ${errorDetail(err)}`, { lane }));
+                merged++;
+                streak = null;
+                await settle(issue, layer.index < layer.count ? 'queued' : 'done');
+                continue;
+            }
             await withHeartbeat(issue, heartbeat, () => waitMerge(issue, branch, repoRoot, ghRepo, paths));
             merged++;
             streak = null;
@@ -3785,7 +3859,7 @@ export async function runLane(lane, issues, repoRoot, ghRepo, paths, deps = {})
                 // worktree — this is a clean outcome, not a park; move to the next issue.
                 awaitingReview++;
                 streak = null;
-                await settle(issue, 'done');
+                await settle(issue, layer && layer.index < layer.count ? 'queued' : 'done');
                 continue;
             }
             if (err instanceof IssueSkippedError) {
@@ -4295,7 +4369,7 @@ async function defaultListIssueLabels(octokit, owner, repo, issue) {
     return data.map((label) => label.name);
 }
 export async function waitForMerge(issue, branch, repoRoot, ghRepo, paths, deps = {}) {
-    const { createOctokit = getOctokit, pathExists = existsSync, checkMerged = isPrMerged, loadConfig = configLoaders.loadFactoryConfigForRepo, land = landIssue, listIssueLabels = defaultListIssueLabels, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), emitEvent = logEvent, mergeEnabled, writeLine = (line) => console.log(line), now = () => Date.now(), mergeOverrides, } = deps;
+    const { createOctokit = getOctokit, pathExists = existsSync, checkMerged = isPrMerged, loadConfig = configLoaders.loadFactoryConfigForRepo, land = landIssue, listIssueLabels = defaultListIssueLabels, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), emitEvent = logEvent, mergeEnabled, writeLine = (line) => console.log(line), now = () => Date.now(), mergeOverrides, landBranch, } = deps;
     const factoryConfig = loadConfig(paths.config);
     const isMergeEnabled = mergeEnabled ?? (() => resolveMergePolicy(factoryConfig, process.env, mergeOverrides).auto);
     const skipCI = configLoaders.resolveSkipCI(factoryConfig);
@@ -4353,7 +4427,10 @@ export async function waitForMerge(issue, branch, repoRoot, ghRepo, paths, deps
                 await sleep(120_000);
                 continue;
             }
-            await land(issue, repoRoot, ghRepo, paths, octokit, skipCI);
+            if (landBranch)
+                await land(issue, repoRoot, ghRepo, paths, octokit, skipCI, undefined, { branch: landBranch });
+            else
+                await land(issue, repoRoot, ghRepo, paths, octokit, skipCI);
             return;
         }
         writeLine(`[factory] #${issue} awaiting human merge (poll 120s)`);
@@ -4521,6 +4598,8 @@ async function cmdDoctor(opts = {}) {
             },
             fileExists: existsSync,
         }),
+        claudeSessionState: () => claudeStoredSessionState(),
+        localAuthFailure: (agent) => localAuthFailureSinceLogin(agent),
         opencodeLoggedIn: () => hasOpencodeLoginEvidence(),
         commandHarnesses: () => repoRoot === null
             ? []