@telora/daemon 0.21.26 → 0.21.81

package/dist/git/exec.js

@@ -0,0 +1,114 @@
+/**
+ * Git utilities for the daemon.
+ *
+ * Thin barrel re-export that preserves the original import surface.
+ * Actual implementations live in focused sub-modules:
+ *   - git-types.ts: shared types and runGitSync
+ *   - git-merge-lock.ts: merge lock and corruption state
+ *   - git-branch.ts: branch management utilities
+ *   - git-merge.ts: merge operations and focus dispatch
+ *   - git-integration.ts: integration branch sync and advance
+ *   - worktree.ts: worktree management (re-exported here for backward compatibility)
+ */
+// Import worktree functions used locally by initGit
+import { ensureWorktreeDir, pruneWorktrees, ensureMergeWorktree } from '../worktree/provision.js';
+// Import sub-module functions used by initGit
+import { configureMergeLock } from './index.js';
+import { ensureIntegrationBranch, repoHasCommits } from './index.js';
+import { syncIntegrationWithMain } from './index.js';
+import { runGitSync } from './index.js';
+import { ensureInitialCommit } from './index.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'git' });
+// ── Re-exports from sub-modules ─────────────────────────────────
+// git-types.ts: shared types and utilities
+export { runGitSync, DEFAULT_GIT_TIMEOUT_MS } from './index.js';
+// git-merge-lock.ts: merge lock and corruption state
+export { MergeLockTimeoutError, IntegrationCorruptError, isIntegrationCorrupt, getCorruptionDetails, resetCorruptionFlag, configureMergeLock, withMergeLock, resetMergeLock, } from './index.js';
+// git-branch.ts: branch management
+export { branchExists, getDefaultBranch, ensureIntegrationBranch, repoHasCommits, deleteBranch, } from './index.js';
+// git-merge.ts: merge operations
+export { mergeToIntegration, applyMergeStrategy, trySquashMerge, handlePushFailureWithRollback, } from './index.js';
+// git-integration.ts: integration branch operations
+export { syncIntegrationWithMain, } from './index.js';
+// worktree.ts: worktree management (re-exported for backward compatibility)
+export { ensureWorktreeDir, ensureMergeWorktree, getMergeWorktreePath, pruneWorktrees, worktreeExistsForBranch, createWorktree, generateMcpConfigInWorktree, ensureCodexConfigIgnoredInWorktree, generateCodexConfigInWorktree, renderCodexWorktreeConfigToml, worktreeHasUncommittedChanges, branchHasUnmergedCommits, removeWorktree, commitWipChanges, safeRemoveFocusWorktree, cleanupOrphanFocusWorktrees, } from '../worktree/provision.js';
+// ── initGit ─────────────────────────────────────────────────────
+/**
+ * Initialize git subsystem for daemon startup.
+ */
+export async function initGit(config) {
+    log.info('Initializing git subsystem...');
+    // Ensure a git repository exists. New projects may not have one yet.
+    const gitCheck = runGitSync(['rev-parse', '--git-dir'], config.repoPath);
+    if (!gitCheck.success) {
+        log.info('No git repository found -- initializing...');
+        const initResult = runGitSync(['init'], config.repoPath);
+        if (!initResult.success) {
+            log.error(`Failed to initialize git repository: ${initResult.error}`);
+            log.info('Git subsystem initialization aborted');
+            return;
+        }
+        log.info('Git repository initialized');
+    }
+    // Configure merge lock from daemon config
+    configureMergeLock({
+        timeoutMs: config.mergeLockTimeoutMs,
+        contentionWarningMs: config.mergeLockContentionWarningMs,
+    });
+    // Ensure worktree directory exists
+    ensureWorktreeDir(config);
+    // Prune stale worktree entries
+    pruneWorktrees(config.repoPath);
+    // Empty repos need an initial commit before branches or worktrees can be created.
+    // Create one automatically so the full git subsystem initializes immediately.
+    // When the product's active PRD selects a starter repo, seed the genesis
+    // commit from that polished starter instead of an empty commit (focus
+    // 80ecc233) -- the agent then starts ABOVE the UX floor. Falls back to the
+    // empty commit when there is no starter / it cannot be cloned.
+    if (!repoHasCommits(config.repoPath)) {
+        const init = await ensureInitialCommit({
+            repoPath: config.repoPath,
+            productId: config.productId,
+        });
+        if (init.seeded) {
+            const g = init.genesis;
+            log.info(`Genesis commit seeded from starter ${g?.starterRepoId} ` +
+                `(${g?.gitUrl} @ ${g?.ref} -> ${g?.resolvedSha?.slice(0, 12)})`);
+        }
+        else if (init.deferred) {
+            // A starter-selecting PRD is still draft -- leave the repo empty rather
+            // than foreclose genesis with a placeholder. The worktree-provisioning
+            // safety net seeds it once the PRD activates.
+            log.info('Repository has no commits -- deferring initial commit until a ' +
+                'starter-selecting PRD activates (genesis will seed it then)');
+            log.info('Git subsystem initialized (limited -- waiting for starter PRD / first commit)');
+            return;
+        }
+        else if (!init.committed) {
+            log.error('Failed to create initial commit');
+            log.info('Git subsystem initialized (limited -- waiting for first commit)');
+            return;
+        }
+        else {
+            log.info(`Repository has no commits (${init.genesis?.reason}) -- created empty initial commit for Telora`);
+        }
+    }
+    // Ensure integration branch exists
+    await ensureIntegrationBranch(config);
+    // Create persistent merge worktree for branch-switching operations
+    ensureMergeWorktree(config);
+    // Sync integration with main on startup so we start fresh
+    const syncResult = await syncIntegrationWithMain(config);
+    if (syncResult.success) {
+        log.info('Integration branch synced with main on startup');
+    }
+    else {
+        log.warn(`Could not sync integration with main on startup: ${syncResult.error}`);
+        // Non-fatal — stale code is better than not starting
+    }
+    // Orphan focus worktree cleanup is handled by rebuildFocusWorktreeState()
+    // which runs after initGit(). No separate cleanup pass needed here.
+    log.info('Git subsystem initialized');
+}
+//# sourceMappingURL=exec.js.map

package/dist/git/exec.js.map

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

package/dist/git/genesis.js

@@ -29,7 +29,7 @@ import { runGitSync } from './types.js';
 import { repoHasCommits } from './branch.js';
 import { loadActivePrds, hasPendingStarterSelection } from '../queries/prd.js';
 import { loadStarterRepo, } from '../queries/starter-repo.js';
-import { createLogger } from '../log.js';
+import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'git/genesis' });
 const defaultDeps = {
     hasCommits: repoHasCommits,

package/dist/git/genesis.js.map

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

package/dist/git/index.d.ts

@@ -8,20 +8,15 @@
  * - types.ts            -- shared types + runGitSync / getMergeWorktreePath
  * - merge-lock.ts       -- merge lock + integration-corruption state
  * - branch.ts           -- branch management utilities
- * - merge.ts            -- merge operations + focus dispatch
- * - merge-helpers.ts    -- (internal) conflict extraction / rollback helpers
- * - merge-strategies.ts -- (internal) fast-forward / rebase / squash strategies
+ * - merge.ts            -- merge operations + focus dispatch (conflict
+ *                          extraction / rollback / ff-rebase-squash strategy
+ *                          helpers are defined inline here, the canonical source)
  * - integration.ts      -- integration-branch sync
  * - state-detector.ts   -- deterministic git-state detection
  * - activity.ts         -- git-activity scanning
  * - genesis.ts          -- initial-commit / starter-repo genesis
  * - utils.ts            -- diff / ref / segment helpers
  * - fetch.ts            -- fetch-origin + circuit breaker
- *
- * merge-helpers.ts / merge-strategies.ts are internal to the git family and
- * intentionally NOT re-exported here (their `handlePushFailureWithRollback`,
- * `trySquashMerge`, `applyMergeStrategy` names collide with merge.ts, which is
- * the canonical public source).
  */
 export * from './types.js';
 export * from './merge-lock.js';

package/dist/git/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dist/git/index.js

@@ -8,20 +8,15 @@
  * - types.ts            -- shared types + runGitSync / getMergeWorktreePath
  * - merge-lock.ts       -- merge lock + integration-corruption state
  * - branch.ts           -- branch management utilities
- * - merge.ts            -- merge operations + focus dispatch
- * - merge-helpers.ts    -- (internal) conflict extraction / rollback helpers
- * - merge-strategies.ts -- (internal) fast-forward / rebase / squash strategies
+ * - merge.ts            -- merge operations + focus dispatch (conflict
+ *                          extraction / rollback / ff-rebase-squash strategy
+ *                          helpers are defined inline here, the canonical source)
  * - integration.ts      -- integration-branch sync
  * - state-detector.ts   -- deterministic git-state detection
  * - activity.ts         -- git-activity scanning
  * - genesis.ts          -- initial-commit / starter-repo genesis
  * - utils.ts            -- diff / ref / segment helpers
  * - fetch.ts            -- fetch-origin + circuit breaker
- *
- * merge-helpers.ts / merge-strategies.ts are internal to the git family and
- * intentionally NOT re-exported here (their `handlePushFailureWithRollback`,
- * `trySquashMerge`, `applyMergeStrategy` names collide with merge.ts, which is
- * the canonical public source).
  */
 export * from './types.js';
 export * from './merge-lock.js';

package/dist/git/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dist/git/integration.d.ts

@@ -4,7 +4,7 @@
  * Handles syncing integration with main so agents start from the latest code.
  * The daemon never touches main directly — the user merges integration into main.
  */
-import type { DaemonConfig } from '../types.js';
+import type { DaemonConfig } from '../types/index.js';
 /**
  * Sync the integration branch with main so agents start from the latest code.
  *

package/dist/git/integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../src/git/integration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAShD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2E/C"}
+{"version":3,"file":"integration.d.ts","sourceRoot":"","sources":["../../src/git/integration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAStD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2E/C"}

package/dist/git/integration.js

@@ -7,7 +7,7 @@
 import { runGitSync, getMergeWorktreePath } from './types.js';
 import { withMergeLock } from './merge-lock.js';
 import { getDefaultBranch } from './branch.js';
-import { createLogger } from '../log.js';
+import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'git/integration' });
 /**
  * Sync the integration branch with main so agents start from the latest code.

package/dist/git/integration.js.map

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

package/dist/git/merge-lock.js

@@ -1,4 +1,4 @@
-import { createLogger } from '../log.js';
+import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'merge-lock' });
 /**
  * Merge lock and corruption state management for the git subsystem.

package/dist/git/merge-lock.js.map

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

package/dist/git/merge.d.ts

@@ -4,10 +4,10 @@
  * Handles merging agent branches into integration, merge strategy dispatch,
  * push failure handling with rollback, and stash management.
  */
-import type { DaemonConfig, MergeBackResult } from '../types.js';
+import type { DaemonConfig, MergeBackResult } from '../types/index.js';
 import { type MergeResult, type MergeStrategy } from './types.js';
 import { type CorruptionDetails } from './merge-lock.js';
-import { type CiStatusReader, type CiMergeGateDecision } from '../ci-status.js';
+import { type CiStatusReader, type CiMergeGateDecision } from '../ci/ci-status.js';
 /**
  * Classify the post-merge sha observation for a merge that already succeeded.
  * Given whether a commit sha was already captured (e.g. from a --no-ff merge),
@@ -46,6 +46,37 @@ interface PushFailureRollbackParams {
  * branch as corrupt and returns a result indicating the failure.
  */
 export declare function handlePushFailureWithRollback(params: PushFailureRollbackParams): MergeResult;
+/**
+ * Handle UNTRACKED files that block a merge, and CONFIRM the block cleared.
+ *
+ * When agents create new files (e.g. migrations) that also exist as untracked
+ * files in the merge worktree, git refuses the merge with "The following
+ * untracked working tree files would be overwritten by merge". This helper
+ * removes ONLY those untracked files and verifies they are gone.
+ *
+ * Contract (a repair step either clears the block or reports it could not, and
+ * never lets the caller retry against an unchanged blocking state):
+ *   - returns true  ONLY when it removed blocking untracked files AND confirmed
+ *     none remain -- the caller may then retry the merge against a state it has
+ *     confirmed changed.
+ *   - returns false when there is nothing it can fix or the fix did not take:
+ *       * the block is NOT the untracked-overwrite kind. The bare phrase "would
+ *         be overwritten by merge" ALSO appears in git's TRACKED-change refusal
+ *         ("Your local changes to the following files would be overwritten by
+ *         merge"), which `git clean` cannot touch -- so we match only the
+ *         untracked sentinel and refuse the tracked case here.
+ *       * no file paths were parsed.
+ *       * a named file survived `git clean` (it was tracked, or clean failed).
+ *     In every false case the caller must NOT retry.
+ *
+ * Only git's TAB-indented path lines are treated as file names. The surrounding
+ * prose -- "error: ...", the "Merge failed: " prefix the caller prepends, the
+ * "Please ..." / "Aborting" trailer -- is never passed to `git clean` as a
+ * bogus pathspec (the pre-fix code split on trimmed lines, so the prefixed
+ * "Merge failed: error: ..." sentence slipped past the `error:` filter and
+ * became a pathspec).
+ */
+export declare function handleUntrackedFilesBlockingMerge(repoPath: string, errorOutput: string): boolean;
 /**
  * Attempt a squash merge: stages all changes from the source branch as a
  * single commit on the current branch.

package/dist/git/merge.d.ts.map

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

package/dist/git/merge.js

@@ -5,13 +5,14 @@
  * push failure handling with rollback, and stash management.
  */
 import { resolve } from 'node:path';
+import { existsSync } from 'node:fs';
 import { runGitSync, getMergeWorktreePath } from './types.js';
 import { withMergeLock, markIntegrationCorrupt } from './merge-lock.js';
 import { getDefaultBranch } from './branch.js';
 import { resolveRef } from './utils.js';
 import { withRetry, healthEvents } from '@telora/daemon-core';
-import { resolveCiMergeGate, } from '../ci-status.js';
-import { createLogger } from '../log.js';
+import { resolveCiMergeGate, } from '../ci/ci-status.js';
+import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'CI' });
 /**
  * Classify the post-merge sha observation for a merge that already succeeded.
@@ -161,33 +162,106 @@ export function handlePushFailureWithRollback(params) {
     };
 }
 /**
- * Handle untracked files that block a merge.
+ * Handle UNTRACKED files that block a merge, and CONFIRM the block cleared.
  *
- * When agents create new files (e.g. migrations) that also exist as
- * untracked files in the main repo working directory, git refuses to
- * merge. This helper parses the error output, removes the blocking
- * files, and returns true if blocking files were cleaned.
+ * When agents create new files (e.g. migrations) that also exist as untracked
+ * files in the merge worktree, git refuses the merge with "The following
+ * untracked working tree files would be overwritten by merge". This helper
+ * removes ONLY those untracked files and verifies they are gone.
+ *
+ * Contract (a repair step either clears the block or reports it could not, and
+ * never lets the caller retry against an unchanged blocking state):
+ *   - returns true  ONLY when it removed blocking untracked files AND confirmed
+ *     none remain -- the caller may then retry the merge against a state it has
+ *     confirmed changed.
+ *   - returns false when there is nothing it can fix or the fix did not take:
+ *       * the block is NOT the untracked-overwrite kind. The bare phrase "would
+ *         be overwritten by merge" ALSO appears in git's TRACKED-change refusal
+ *         ("Your local changes to the following files would be overwritten by
+ *         merge"), which `git clean` cannot touch -- so we match only the
+ *         untracked sentinel and refuse the tracked case here.
+ *       * no file paths were parsed.
+ *       * a named file survived `git clean` (it was tracked, or clean failed).
+ *     In every false case the caller must NOT retry.
+ *
+ * Only git's TAB-indented path lines are treated as file names. The surrounding
+ * prose -- "error: ...", the "Merge failed: " prefix the caller prepends, the
+ * "Please ..." / "Aborting" trailer -- is never passed to `git clean` as a
+ * bogus pathspec (the pre-fix code split on trimmed lines, so the prefixed
+ * "Merge failed: error: ..." sentence slipped past the `error:` filter and
+ * became a pathspec).
  */
-function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
-    const isUntrackedBlock = errorOutput.includes('untracked working tree files would be overwritten') ||
-        errorOutput.includes('would be overwritten by merge');
-    if (!isUntrackedBlock) {
+export function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
+    if (!errorOutput.includes('untracked working tree files would be overwritten')) {
         return false;
     }
-    const lines = errorOutput.split('\n');
-    const blockingFiles = lines
+    // Git indents each blocking path with a TAB. Take only those lines -- never
+    // the prose sentences around them.
+    const blockingFiles = errorOutput
+        .split('\n')
+        .filter((l) => l.startsWith('\t'))
         .map((l) => l.trim())
-        .filter((l) => l &&
-        !l.startsWith('error:') &&
-        !l.startsWith('Please') &&
-        !l.startsWith('Aborting'));
+        .filter(Boolean);
     if (blockingFiles.length === 0) {
         return false;
     }
     log.info(`Removing ${blockingFiles.length} untracked file(s) blocking merge: ${blockingFiles.join(', ')}`);
     runGitSync(['clean', '-f', '--', ...blockingFiles], repoPath);
+    // CONFIRM the block is cleared: every named path must now be gone. If any
+    // survives (it was tracked, or `git clean` could not remove it), report that
+    // we could NOT clear it so the caller does not retry against an unchanged
+    // blocking state.
+    const remaining = blockingFiles.filter((f) => existsSync(resolve(repoPath, f)));
+    if (remaining.length > 0) {
+        log.warn(`[merge] Untracked-file remedy did not clear the block: ${remaining.length} file(s) ` +
+            `still present after 'git clean' (${remaining.join(', ')}); not retrying the merge.`);
+        return false;
+    }
     return true;
 }
+/**
+ * Recover a merge worktree left dirty by an EARLIER failed merge, BEFORE the next
+ * merge runs, so an already-wedged worktree heals itself with no operator. The
+ * residue is detected by a non-empty `git status --porcelain` (staged / unstaged
+ * / untracked) -- deliberately NOT by MERGE_HEAD: the 2026-08-18 wedge held 85
+ * staged files with MERGE_HEAD already cleared and AUTO_MERGE present, so a
+ * MERGE_HEAD probe would miss it. Any residue is discarded via
+ * restoreWorktreeAfterFailedMerge, which moves no branch ref -- focus-branch
+ * commits are untouched. Merge-worktree only; idempotent (a clean worktree is a
+ * no-op).
+ *
+ * CONFIRMS the outcome rather than recovering-and-hoping: it re-reads
+ * `git status --porcelain` AFTER any recovery and reports whether the worktree
+ * is now clean. `clean` is true only when the worktree is empty at exit -- it
+ * was already clean, or the recovery restored it. It is false when residue
+ * survived the recovery attempt, or when status itself could not be read (so
+ * cleanliness cannot be vouched for). A merge must REFUSE to run when this
+ * returns clean:false: running against an unconfirmed worktree is exactly the
+ * wedge this guard exists to prevent.
+ */
+function recoverDirtyMergeWorktree(repoPath) {
+    const status = runGitSync(['status', '--porcelain'], repoPath);
+    if (!status.success) {
+        // Can't read status -> can't confirm clean. Treat as unsafe to merge.
+        return { clean: false, residue: `git status failed: ${status.error}` };
+    }
+    if (status.output.trim().length === 0) {
+        return { clean: true };
+    }
+    log.warn(`[merge] Merge worktree was left dirty by an earlier failed merge ` +
+        `(git status --porcelain non-empty); recovering it before the next merge ` +
+        `so an already-wedged worktree does not require an operator.`);
+    restoreWorktreeAfterFailedMerge(repoPath);
+    // Confirm the recovery actually cleaned the worktree before we let a merge run.
+    const after = runGitSync(['status', '--porcelain'], repoPath);
+    if (after.success && after.output.trim().length === 0) {
+        return { clean: true };
+    }
+    return {
+        clean: false,
+        residue: after.success ? after.output.trim() : `git status failed: ${after.error}`,
+    };
+}
 /**
  * Attempt a fast-forward-only merge.
  * Returns a MergeResult; on failure, no abort is needed (ff-only is atomic).
@@ -219,6 +293,29 @@ function tryRebaseMerge(repoPath, sourceBranch) {
         conflictedFiles,
     };
 }
+/**
+ * Restore the merge worktree to the clean commit + index it had before a failed
+ * merge attempt. The conflict branches abort explicitly; this covers EVERY OTHER
+ * failure -- a commit-msg hook rejection (leaves MERGE_HEAD set + staged), a
+ * squash that staged changes with no MERGE_HEAD, or an unrecognised error --
+ * which git otherwise leaves as a staged, uncommitted merge that NOTHING clears.
+ * Because the merge worktree is shared by every focus in the product, that
+ * residue would fail the next focus's merge too; clearing it here contains one
+ * focus's failure to that focus. It discards ONLY the failed-merge residue --
+ * `git merge --abort` (or, when no merge is in progress, `reset --hard HEAD`)
+ * moves no branch ref, so commits on any focus branch are untouched. Only ever
+ * called against the merge worktree (never a developer checkout).
+ */
+function restoreWorktreeAfterFailedMerge(repoPath) {
+    // MERGE_HEAD present (a --no-ff merge that stopped, e.g. hook-rejected) aborts
+    // cleanly. --squash stages changes WITHOUT a MERGE_HEAD, so abort is a no-op
+    // there; fall back to a hard reset + untracked clean to drop the staged residue.
+    const abort = runGitSync(['merge', '--abort'], repoPath);
+    if (!abort.success) {
+        runGitSync(['reset', '--hard', 'HEAD'], repoPath);
+        runGitSync(['clean', '-fd'], repoPath);
+    }
+}
 /**
  * Attempt a merge-commit merge (--no-ff).
  * On conflict, aborts the merge and returns conflicted file details.
@@ -240,6 +337,10 @@ function tryMergeCommit(repoPath, sourceBranch, commitMessage) {
             conflictedFiles,
         };
     }
+    // Non-conflict failure (hook rejection / unrecognised error) still leaves a
+    // staged, uncommitted merge behind -- restore the worktree so it does not
+    // poison the next focus's merge.
+    restoreWorktreeAfterFailedMerge(repoPath);
     return {
         success: false,
         error: `Merge failed: ${mergeResult.error}`,
@@ -270,6 +371,9 @@ export function trySquashMerge(repoPath, sourceBranch, commitMessage) {
                 conflictedFiles,
             };
         }
+        // Non-conflict squash failure leaves the staged squash residue behind
+        // (no MERGE_HEAD) -- restore so it does not poison the next focus's merge.
+        restoreWorktreeAfterFailedMerge(repoPath);
         return {
             success: false,
             error: `Squash merge failed: ${squashResult.error}`,
@@ -278,6 +382,9 @@ export function trySquashMerge(repoPath, sourceBranch, commitMessage) {
     // Commit the squashed changes
     const commitResult = runGitSync(['commit', '-m', commitMessage], repoPath);
     if (!commitResult.success) {
+        // The squash staged everything; a failed commit (e.g. a rejecting hook)
+        // leaves it staged. Restore so the residue does not wedge the next merge.
+        restoreWorktreeAfterFailedMerge(repoPath);
         return {
             success: false,
             error: `Squash merge commit failed: ${commitResult.error}`,
@@ -319,6 +426,21 @@ export function mergeToIntegration(params) {
     const { config, branchName, deliveryName, deliveryId, onRollbackFailure } = params;
     return withMergeLock(async () => {
         const mwt = getMergeWorktreePath(config);
+        // Self-heal an already-wedged merge worktree before doing anything: an
+        // earlier failed merge (from a crash, or a pre-fix daemon version) may have
+        // left staged residue that would fail this merge too. REFUSE the merge if
+        // the worktree cannot be CONFIRMED clean afterward -- never run against an
+        // unconfirmed worktree.
+        const recovery = recoverDirtyMergeWorktree(mwt);
+        if (!recovery.clean) {
+            return {
+                success: false,
+                error: `Merge worktree could not be confirmed clean before merging ${branchName} into ` +
+                    `${config.integrationBranch}; residue survived recovery: ${recovery.residue ?? 'unknown'}`,
+                sourceBranch: branchName,
+                targetBranch: config.integrationBranch,
+            };
+        }
         const withRemote = hasOriginRemote(config.repoPath);
         // Fetch latest refs so the merge worktree sees agent branches and remote state
         if (withRemote) {
@@ -340,7 +462,13 @@ export function mergeToIntegration(params) {
         }
         // Save pre-merge state so we can rollback if push fails
         const preMergeRef = runGitSync(['rev-parse', 'HEAD'], mwt);
-        const commitMessage = `Merge agent work: ${deliveryName} [${deliveryId}]`;
+        // No bracketed delivery id in the subject: nothing in the repo parses it,
+        // and its presence made the merge path look attributed when a merge carries
+        // no single delivery. Per-delivery attribution lives in the merged commits'
+        // Telora-Delivery trailers; the CI sensor's owning-focus resolution walks the
+        // merge parents to reach them (see ci/ci-sensor-loop.ts). deliveryId is still
+        // used below for logging/bookkeeping, just not stamped into the subject.
+        const commitMessage = `Merge agent work: ${deliveryName}`;
         // Try fast-forward first, fall back to merge commit.
         // We use real merges (not squash) so git preserves the ancestry
         // relationship -- this is critical for worktree cleanup, which uses
@@ -460,6 +588,19 @@ export function mergeIntegrationToMain(params) {
     return withMergeLock(async () => {
         const mwt = getMergeWorktreePath(config);
         const mainBranch = getDefaultBranch(config.repoPath);
+        // Same self-heal as mergeToIntegration: this route shares the merge worktree,
+        // so an earlier failed merge's residue would break the detached checkout
+        // below. REFUSE if the worktree cannot be CONFIRMED clean afterward.
+        const recovery = recoverDirtyMergeWorktree(mwt);
+        if (!recovery.clean) {
+            return {
+                success: false,
+                error: `Merge worktree could not be confirmed clean before merging ${config.integrationBranch} into ` +
+                    `${mainBranch}; residue survived recovery: ${recovery.residue ?? 'unknown'}`,
+                sourceBranch: config.integrationBranch,
+                targetBranch: mainBranch,
+            };
+        }
         const withRemote = hasOriginRemote(config.repoPath);
         // Fail early when a CD push was requested but no remote is configured.
         // Returning a push-failure result (rather than silently skipping) lets