@telora/daemon 0.22.245 → 0.22.290

package/dist/merge/focus-worktree-removal.js

@@ -0,0 +1,288 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/completion/team-exit/teardown-merge-gate.test.ts,
+//   packages/daemon/src/merge/safe-remove-merge-gate.test.ts
+// PINNED-BY-END
+/**
+ * Canonical focus worktree removal: merge-before-remove.
+ *
+ * A focus worktree is removed only after its unmerged commits have been merged
+ * into integration -- and they are merged only when every one of them passed
+ * the focus's review or verify gate (merge/merge-gate-coverage.ts). A held or
+ * failed merge preserves the worktree and the branch with the unmerged work.
+ * The orphan sweep (cleanupOrphanFocusWorktrees) routes every orphan through
+ * the same removal. Worktree creation and the plain git plumbing stay in
+ * worktree/provision.ts and worktree/safety.ts; this module is the part of
+ * removal that merges, so it sits with the merge gate it consults.
+ */
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { runGitSync, mergeToIntegration, sanitizeGitSegment } from '../git/index.js';
+import { focusWorktreeDirName } from '../git/focus-branch-identity.js';
+import { getActiveFocuses } from '../queries/focuses/focus-discovery.js';
+import { branchHasUnmergedCommits, removeWorktree } from '../worktree/safety.js';
+import { removeFocusWorktree as removeFocusWorktreeState } from '../worktree/focus-worktree-state.js';
+import { createUnmergedCaptureEscalationReporter } from '../worktree/unmerged-capture-escalation.js';
+import { readCaptureAttributionInput } from '../worktree/capture-attribution-read.js';
+import { worktreeHasNonScratchChanges } from '../worktree/scratch-guard.js';
+import { createLogger } from '../log/daemon-log.js';
+const log = createLogger({ module: 'worktree' });
+// ── Canonical worktree removal ────────────────────────────────────
+/**
+ * Canonical focus worktree removal: merge-before-remove + conditional cleanup.
+ *
+ * Every code path that removes a focus worktree should route through this
+ * function. It encapsulates the full lifecycle:
+ *   1. Check for unmerged commits on the branch
+ *   2. Attempt merge to integration if needed -- only when every commit it
+ *      would add has passed the focus's review or verify gate
+ *      (merge/merge-gate-coverage.ts; teardownFocus has just captured the
+ *      stopped team's uncommitted work). A hold merges nothing and sets
+ *      mergeHeld, not mergeError, so no merge-conflict escalation is filed.
+ *   3. Call removeWorktree with safety guards (handles uncommitted changes); a
+ *      held or failed merge leaves mergeSucceeded false, so its unmerged-commit
+ *      guard preserves the worktree and the branch keeps the commits
+ *   4. Conditionally clear in-memory state based on whether removal succeeded
+ *
+ * Returns structured result so callers can count cleaned/preserved and log.
+ */
+export async function safeRemoveFocusWorktree(params, deps) {
+    const { config, worktreePath, branchName, deliveryName, deliveryId, focusId } = params;
+    const { repoPath, integrationBranch } = config;
+    // 1. Attempt merge if there are unmerged commits and every one of them is gated
+    let mergeSucceeded = false;
+    let merged = false;
+    let mergeError;
+    let mergeHeld;
+    let admittedBy = '';
+    try {
+        const hasUnmergedCommits = branchHasUnmergedCommits(branchName, integrationBranch, repoPath);
+        if (hasUnmergedCommits) {
+            const gate = await readRemovalGate(deps, {
+                organizationId: config.organizationId,
+                productId: config.productId,
+                focusId: focusId ?? null,
+                branchName,
+                integrationBranch,
+                repoPath,
+            });
+            if (gate.hold !== null)
+                mergeHeld = gate.hold;
+            else
+                admittedBy = gate.admittedBy;
+        }
+        if (mergeHeld !== undefined) {
+            log.info(`[merge-gate] Not merging ${branchName} into ${integrationBranch} before removal: ${mergeHeld}. ` +
+                `The worktree and branch are preserved with the unmerged work.`);
+        }
+        else if (hasUnmergedCommits) {
+            log.info(`Attempting merge for ${branchName} before removal`);
+            const mergeResult = await mergeToIntegration({
+                config,
+                branchName,
+                deliveryName,
+                deliveryId: deliveryId ?? deliveryName,
+            });
+            mergeSucceeded = mergeResult.success;
+            merged = true;
+            if (mergeResult.success) {
+                log.info(`[merge-gate] Merged ${branchName} into ${integrationBranch} before removal (${admittedBy})`);
+            }
+            else {
+                mergeError = mergeResult.error ?? 'unknown';
+                log.warn(`[worktree] Merge failed for ${branchName}: ${mergeError}. ` +
+                    `Safety guards will preserve the branch.`);
+            }
+        }
+        else {
+            mergeSucceeded = true; // Nothing to merge
+        }
+    }
+    catch (err) {
+        mergeError = err.message;
+        log.warn(`Merge attempt failed for ${branchName}: ${mergeError}`);
+    }
+    // 2. Remove worktree (safety guards handle uncommitted changes and unmerged commits)
+    let removed = false;
+    const unmerged = createUnmergedCaptureEscalationReporter({
+        organizationId: config.organizationId,
+        focusId: focusId ?? null,
+        productId: config.productId,
+        focusName: deliveryName,
+    }, deps.worktreeCapture.unmergedEscalation);
+    const attribution = focusId && existsSync(worktreePath) && worktreeHasNonScratchChanges(worktreePath)
+        ? await readCaptureAttributionInput(focusId, deps.worktreeCapture.attributionRead)
+        : undefined;
+    try {
+        removed = removeWorktree(repoPath, worktreePath, {
+            branchName,
+            integrationBranch,
+            deliveryName,
+            mergeSucceeded,
+            reporters: { ...deps.worktreeCapture.refusalReporters, unmerged: unmerged.reporter },
+            attribution,
+        });
+    }
+    catch (err) {
+        log.warn(`Failed to remove worktree ${worktreePath}: ${err.message}`);
+    }
+    await unmerged.flush();
+    // 3. Conditionally clear in-memory state
+    if (focusId) {
+        if (removed) {
+            removeFocusWorktreeState(focusId);
+        }
+        else {
+            log.info(`[worktree] Worktree preserved for focus ${focusId} -- keeping in-memory state`);
+        }
+    }
+    return { removed, merged, mergeError, mergeHeld };
+}
+/** The merge gate's decision; a read that throws holds (fail closed). */
+async function readRemovalGate(deps, target) {
+    try {
+        return await deps.readMergeGate(target);
+    }
+    catch (err) {
+        return { hold: `its gate coverage could not be read (${err.message})` };
+    }
+}
+// ── Orphan focus worktree cleanup ──────────────────────────────
+/**
+ * Clean up orphan focus worktrees on daemon startup.
+ *
+ * Scans the worktree directory and cross-references against active
+ * focuses (those with assigned agent roles and queued deliveries).
+ * Worktrees that don't match any active focus are orphans from a
+ * previous daemon run and are cleaned up.
+ *
+ * Conservative approach:
+ * - Safety-commits any uncommitted changes before removal
+ * - Checks for unmerged commits before deleting
+ * - Logs all actions for auditability
+ *
+ * @returns Count of orphans cleaned up and preserved
+ */
+export async function cleanupOrphanFocusWorktrees(config, deps) {
+    const { worktreeDir, repoPath, organizationId, productId } = config;
+    let cleaned = 0;
+    let preserved = 0;
+    if (!existsSync(worktreeDir)) {
+        return { cleaned, preserved };
+    }
+    // 1. List all subdirectories in the worktree directory
+    let entries;
+    try {
+        entries = readdirSync(worktreeDir).filter((entry) => {
+            try {
+                return statSync(join(worktreeDir, entry)).isDirectory();
+            }
+            catch (e) {
+                log.debug(`Failed to stat ${entry} (may have been deleted):`, e.message);
+                return false;
+            }
+        });
+    }
+    catch (err) {
+        log.warn(`[worktree] Failed to scan worktree directory: ${err instanceof Error ? err.message : String(err)}`);
+        return { cleaned, preserved };
+    }
+    if (entries.length === 0) {
+        return { cleaned, preserved };
+    }
+    // 2. Query active focuses (all focuses with agent role assignments,
+    // regardless of delivery status) to build the set of expected worktree dir names.
+    // Uses getActiveFocuses instead of getReadyFocuses to avoid treating
+    // focuses with all deliveries in done/verify as orphans.
+    let activeFocusBranchDirs;
+    try {
+        const activeFocusesList = await getActiveFocuses(organizationId, productId);
+        // Build the set of expected worktree directory names from active focuses.
+        // Focus branch names follow: agent/{role}/{focus-name}-{id-prefix},
+        // mirroring generateFocusBranchName() in focus-executor.ts.
+        // Worktree dirs are derived from the branch name with '/' replaced by '-'.
+        // We use sanitizeGitSegment (from git/utils.ts) to reconstruct the expected
+        // directory name, falling back to shortId suffix-matching for robustness.
+        activeFocusBranchDirs = new Set();
+        for (const s of activeFocusesList) {
+            const shortId = s.focus_id.slice(0, 8);
+            // Prefer the PINNED branch identity (immune to role renames). The worktree
+            // dir derives from the branch name (join(worktreeDir, branch.replace('/','-'))),
+            // so the pinned branch pins the expected dir. Fall back to reconstructing
+            // from the current role for legacy focuses that have no pin yet.
+            const expectedDir = s.branch_name
+                ? focusWorktreeDirName(s.branch_name)
+                : `agent-${sanitizeGitSegment(s.agent_role_name ?? 'reviewer')}-${sanitizeGitSegment(s.focus_name)}-${shortId}`;
+            if (entries.includes(expectedDir)) {
+                activeFocusBranchDirs.add(expectedDir);
+            }
+            else {
+                // Fallback: match by focus ID prefix in case sanitization differs
+                for (const entry of entries) {
+                    if (entry.endsWith(shortId)) {
+                        activeFocusBranchDirs.add(entry);
+                    }
+                }
+            }
+        }
+    }
+    catch (err) {
+        // Conservative fallback: if we cannot determine active focuses,
+        // skip orphan cleanup entirely rather than risk deleting active worktrees.
+        log.warn(`[worktree] Failed to query active focuses for orphan detection: ` +
+            `${err instanceof Error ? err.message : String(err)}. Skipping orphan cleanup.`);
+        return { cleaned, preserved };
+    }
+    // 3. Identify orphans: agent worktree dirs not matching any active focus
+    const orphanDirs = entries.filter((entry) => {
+        // Only consider agent-* directories (focus worktrees use agent/ branch prefix)
+        if (!entry.startsWith('agent-'))
+            return false;
+        return !activeFocusBranchDirs.has(entry);
+    });
+    if (orphanDirs.length === 0) {
+        log.info('No orphan focus worktrees found');
+        return { cleaned, preserved };
+    }
+    log.info(`Found ${orphanDirs.length} orphan focus worktree(s)`);
+    // 4. Parse git worktree list to get branch names for each path
+    const worktreeListResult = runGitSync(['worktree', 'list', '--porcelain'], repoPath);
+    const pathToBranch = new Map();
+    if (worktreeListResult.success) {
+        let currentPath = null;
+        for (const line of worktreeListResult.output.split('\n')) {
+            if (line.startsWith('worktree ')) {
+                currentPath = line.slice('worktree '.length);
+            }
+            else if (line.startsWith('branch refs/heads/') && currentPath) {
+                pathToBranch.set(resolve(currentPath), line.slice('branch refs/heads/'.length));
+                currentPath = null;
+            }
+            else if (line === '') {
+                currentPath = null;
+            }
+        }
+    }
+    // 5. Clean up each orphan via canonical removal path
+    for (const dir of orphanDirs) {
+        const worktreePath = resolve(join(worktreeDir, dir));
+        const branchName = pathToBranch.get(worktreePath) ?? dir.replace(/-/g, '/');
+        const deliveryName = branchName.split('/').slice(2).join('/') || dir;
+        log.info(`Cleaning up orphan focus worktree: ${worktreePath} [${branchName}]`);
+        const result = await safeRemoveFocusWorktree({
+            config,
+            worktreePath,
+            branchName,
+            deliveryName,
+            deliveryId: dir, // No real delivery ID -- use dir name for traceability
+        }, deps);
+        if (result.removed) {
+            cleaned++;
+        }
+        else {
+            preserved++;
+        }
+    }
+    log.info(`[worktree] Orphan focus worktree cleanup: ${cleaned} cleaned, ${preserved} preserved`);
+    return { cleaned, preserved };
+}
+//# sourceMappingURL=focus-worktree-removal.js.map

package/dist/merge/focus-worktree-removal.js.map

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

package/dist/merge/merge-back-conflict.d.ts

@@ -8,34 +8,40 @@
  * worktree (MERGE_HEAD, unmerged paths, partial edits) is preserved as a named
  * ref + patch and restored to the committed focus HEAD captured before the
  * merge-back, so no automatic path stays blocked on a dirty tree and the next
- * actor starts from a sane worktree (Nexus request 8679bae1, 2026-09-17).
+ * actor starts from a sane worktree.
+ * History: docs/daemon/history-platform.md (merge/merge-back-conflict.ts).
  *
  * Restore runs only when no live resolver still owns the tree: always after the
  * fallback agent (it has exited or been killed by the time it returns), and on
  * the team-lead path only once the lead is no longer alive.
  *
- * Sliced out of focus-merge.ts (file-size limit). It deliberately does NOT call
+ * Kept apart from focus-merge.ts (file-size limit). It deliberately does NOT call
  * mergeBackFromIntegration -- MERGE_OWNERSHIP_POLICY keeps that entry point in
  * focus-merge.ts -- and the team-lead collaborators defined in focus-merge.ts are
  * injected, so this module imports nothing from it and closes no cycle.
  */
 import type { DaemonConfig, FocusTeamState, MergeConflictResolutionResult } from '../types/index.js';
 import { preserveAndRestoreFocusWorktree, type PreserveAndRestoreResult } from '../git/index.js';
-import { reportGitState } from '../queries/deliveries.js';
-import { spawnResolutionAgent } from '../spawn/lifecycle.js';
-import { escalateMergeConflict } from './merge-conflict-escalation.js';
+import { reportGitState } from '../queries/deliveries/deliveries.js';
+import type { spawnResolutionAgent } from './resolution-agent.js';
+import type { MergeConflictParams } from './merge-conflict-escalation.js';
+import type { ReadFocusOwnDelta } from '../git/focus-integration-sync.js';
 /** Collaborators of the merge-back conflict handler. */
 export interface MergeBackConflictDeps {
     requestTeamLeadResolution: (teamState: FocusTeamState, conflictFiles: string[], branchName: string, integrationBranch: string) => Promise<MergeConflictResolutionResult>;
     isResolverStillAlive: (teamState: FocusTeamState) => boolean;
-    spawnResolutionAgent: typeof spawnResolutionAgent;
+    /** The fallback resolver spawn, its effects bound at the composition root. */
+    spawnResolutionAgent: (params: Parameters<typeof spawnResolutionAgent>[0]) => ReturnType<typeof spawnResolutionAgent>;
     preserveAndRestore: typeof preserveAndRestoreFocusWorktree;
-    escalateMergeConflict: typeof escalateMergeConflict;
+    /** The merge-conflict escalation (merge/merge-conflict-escalation.ts), its collaborators bound at the composition root. */
+    escalateMergeConflict: (params: MergeConflictParams) => Promise<void>;
     reportGitState: typeof reportGitState;
     /** Current HEAD of a worktree, or null when unreadable. */
     readHead: (worktreePath: string) => string | null;
     /** Clock for the per-branch resolver attempt bound (merge/merge-back-followup.ts). */
     now: () => number;
+    /** The focus branch's own delta against integration (decides whether merge-back moves it at all). */
+    readFocusOwnDelta: ReadFocusOwnDelta;
 }
 /** Whether a worktree's HEAD already contains the integration tip (origin/<branch> when the repo has an origin). */
 export declare function integrationMergedIntoHead(worktreePath: string, integrationBranch: string): boolean;

package/dist/merge/merge-back-conflict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-back-conflict.d.ts","sourceRoot":"","sources":["../../src/merge/merge-back-conflict.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-back-conflict.d.ts","sourceRoot":"","sources":["../../src/merge/merge-back-conflict.ts"],"names":[],"mappings":"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"}

package/dist/merge/merge-back-conflict.js

@@ -6,7 +6,7 @@
 import { runGitSync, hasOriginRemote } from '../git/index.js';
 import { withMergeBackInFlight } from './merge-back-activity.js';
 import { decideResolverAttempt, consumeResolverAttempt, getResolverAttemptState, recordResolverFailure, recordResolverSuccess, MAX_RESOLVER_ATTEMPTS, } from './merge-back-followup.js';
-import { createLogger } from '../shell/log.js';
+import { createLogger } from '../log/daemon-log.js';
 const log = createLogger({ module: 'focus-merge' });
 /** Whether a worktree's HEAD already contains the integration tip (origin/<branch> when the repo has an origin). */
 export function integrationMergedIntoHead(worktreePath, integrationBranch) {

package/dist/merge/merge-back-conflict.js.map

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

package/dist/merge/merge-back-followup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-back-followup.d.ts","sourceRoot":"","sources":["../../src/merge/merge-back-followup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-back-followup.d.ts","sourceRoot":"","sources":["../../src/merge/merge-back-followup.ts"],"names":[],"mappings":"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"}

package/dist/merge/merge-back-followup.js

@@ -7,15 +7,10 @@
 /**
  * Follow-up for a merge-back conflict the fallback resolver could not finish.
  *
- * Before: the fallback resolver failed, the daemon filed a merge_conflict
- * escalation (agent_resolvable) and returned merge_back_conflict_unresolved --
- * and that filing was the only exit. The merge-back loop skipped the branch
- * while it was open, and no coding spawn picked it up because a focus whose
- * deliveries sit in verify is never offered for spawn. The focus parked until
- * an operator reset the worktree and merged by hand (Nexus request 8679bae1,
- * 2026-09-17).
- *
- * Now the filing is a RECORD and this module is the path forward. While a
+ * A merge_conflict filing alone is no exit: the merge-back loop skips a branch
+ * while it is open, and a focus whose deliveries sit in verify is never offered
+ * for a coding spawn. So the filing is a RECORD and this module is the path
+ * forward. While a
  * merge-back merge_conflict is open on a focus branch, the merge-back loop tick
  * (which already runs only on a worktree no team is writing and that is clean)
  * calls {@link runMergeBackFollowUp}. That re-runs merge-back and, on conflict,
@@ -31,7 +26,7 @@
  * cause-keyed observation proposing needs_operator. It names the preserved
  * partial resolution and the attempts spent. The createEscalation chokepoint
  * keeps it in the agent_resolvable lane, and the routing hand-off
- * (queries/agent-resolvable-promotion.ts) gives it to a routing decider, which
+ * (supervision/agent-resolvable-promotion.ts) gives it to a routing decider, which
  * alone may make it human-facing. The daemon has no human-facing route of its
  * own (packages/daemon/CLAUDE.md). A plain merge_conflict filing that no agent
  * session reaches is never handed off, so without this observation an exhausted
@@ -50,11 +45,13 @@
  * A LEAF of the merge cluster: it imports nothing from focus-merge.ts or
  * merge-back-conflict.ts. The attempt itself, which must call
  * mergeBackFromIntegration from its sanctioned module, is injected.
+ *
+ * History: docs/daemon/history-platform.md (merge/merge-back-followup.ts).
  */
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
 import { runGitSync, slugBranchForRef } from '../git/index.js';
-import { createLogger } from '../shell/log.js';
+import { createLogger } from '../log/daemon-log.js';
 const log = createLogger({ module: 'focus-merge' });
 /** Follow-up resolver runs after the inline fallback, per conflict episode. */
 export const MERGE_BACK_FOLLOWUP_MAX_ATTEMPTS = 2;

package/dist/merge/merge-back-followup.js.map

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

package/dist/merge/merge-back-loop.d.ts

@@ -18,17 +18,18 @@
  *   - Otherwise: call mergeFocusBranch with a minimal synthetic teamState
  *     and let the existing escalateMergeConflict path fire on failure.
  *
- * Stuck-branch escalation (Delivery 4) extends this tick with per-branch
+ * Stuck-branch escalation extends this tick with per-branch
  * attempt tracking and creates 'stuck_focus_branch' escalations when a
  * branch sits ahead of integration past a configurable threshold.
  *
  * @module merge-back-loop
  */
 import type { DaemonConfig, FocusDeliveryInfo, PipelineConfig } from '../types/index.js';
-import { mergeFocusBranch as defaultMergeFocusBranch } from './focus-merge.js';
-import { type MergeGateDecision, type MergeGateTarget } from './merge-gate-coverage.js';
-import { listPendingEscalations as defaultListPendingEscalations, markEscalationResolved as defaultMarkEscalationResolved, retireAbsorbedSymptoms as defaultRetireAbsorbedSymptoms } from '../queries/escalations.js';
-import { type FileEscalationIdempotentParams, type FileEscalationIdempotentResult } from '../queries/escalation-suppression.js';
+import type { MergeFocusBranch } from './focus-merge.js';
+import type { MergeGateDecision, MergeGateTarget } from './merge-gate-coverage.js';
+import type { listPendingEscalations, markEscalationResolved } from '../queries/escalations/escalations.js';
+import type { retireAbsorbedSymptoms } from '../supervision/escalation-clearing.js';
+import type { FileEscalationIdempotentParams, FileEscalationIdempotentResult } from '../supervision/escalation-suppression.js';
 import { type MergeFailureClass } from './merge-failure-classify.js';
 export declare const STUCK_FOCUS_BRANCH_KIND = "stuck_focus_branch";
 export interface MergeBackFocusInfo {
@@ -88,23 +89,23 @@ export interface MergeBackLoopDeps {
         } | null;
     }>;
     worktreeHasUncommittedChanges: (worktreePath: string) => boolean;
-    listPendingEscalations: typeof defaultListPendingEscalations;
-    markEscalationResolved: typeof defaultMarkEscalationResolved;
-    retireAbsorbedSymptoms?: typeof defaultRetireAbsorbedSymptoms;
+    listPendingEscalations: typeof listPendingEscalations;
+    markEscalationResolved: typeof markEscalationResolved;
+    retireAbsorbedSymptoms: typeof retireAbsorbedSymptoms;
     /**
      * File the stuck-branch escalation through the cause-keyed idempotent gate:
      * suppresses a re-file while an open OR dismissed row carries the per-branch
      * cause key, so an operator dismissal is not re-filed on the next 30s tick.
      */
     fileEscalation: (params: FileEscalationIdempotentParams) => Promise<FileEscalationIdempotentResult>;
-    mergeFocusBranch: typeof defaultMergeFocusBranch;
+    mergeFocusBranch: MergeFocusBranch;
     /** Hold (an ungated commit or unreadable coverage, with why) or admit (with the anchors that admitted the merge). */
     readMergeGate: (target: MergeGateTarget) => Promise<MergeGateDecision>;
     getFocusDeliveries: (focusId: string) => Promise<FocusDeliveryInfo[]>;
     getOldestUnmergedCommitMs: (branchName: string, integrationBranch: string, repoPath: string) => number | null;
     /** Bounded follow-up resolution for a branch held by a pending merge-conflict record (merge/merge-back-followup.ts). */
-    followUpMergeBackConflict?: (productConfig: DaemonConfig, info: MergeBackFocusInfo) => Promise<unknown>;
-    now?: () => number;
+    followUpMergeBackConflict: (productConfig: DaemonConfig, info: MergeBackFocusInfo) => Promise<unknown>;
+    now: () => number;
 }
 /**
  * Read the unix-epoch milliseconds timestamp of the oldest commit on
@@ -127,5 +128,5 @@ export declare function defaultEnumerateFocusBranchesAhead(config: DaemonConfig)
  * no-op (no info-level log, debug only). When work happens, logs a
  * single info-level summary line.
  */
-export declare function runMergeBackTick(config: DaemonConfig, depOverrides?: Partial<MergeBackLoopDeps>): Promise<MergeBackTickResult>;
+export declare function runMergeBackTick(config: DaemonConfig, deps: MergeBackLoopDeps): Promise<MergeBackTickResult>;
 //# sourceMappingURL=merge-back-loop.d.ts.map

package/dist/merge/merge-back-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-back-loop.d.ts","sourceRoot":"","sources":["../../src/merge/merge-back-loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-back-loop.d.ts","sourceRoot":"","sources":["../../src/merge/merge-back-loop.ts"],"names":[],"mappings":"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"}