@telora/daemon 0.12.33

package/dist/git-merge-strategies.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Merge strategy implementations.
+ *
+ * Individual merge strategies (fast-forward, rebase, merge-commit, squash)
+ * and the dispatch function that selects the appropriate strategy.
+ */
+import { type MergeResult, type MergeStrategy } from './git-types.js';
+/**
+ * Attempt a fast-forward-only merge.
+ * Returns a MergeResult; on failure, no abort is needed (ff-only is atomic).
+ */
+export declare function tryFastForwardMerge(repoPath: string, sourceBranch: string): MergeResult;
+/**
+ * Attempt a rebase merge.
+ * On conflict, aborts the rebase and returns conflicted file details.
+ */
+export declare function tryRebaseMerge(repoPath: string, sourceBranch: string): MergeResult;
+/**
+ * Attempt a merge-commit merge (--no-ff).
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+export declare function tryMergeCommit(repoPath: string, sourceBranch: string, commitMessage: string): MergeResult;
+/**
+ * Attempt a squash merge: stages all changes from the source branch as a
+ * single commit on the current branch.
+ *
+ * 1. `git merge --squash <sourceBranch>` -- stages all diffs without committing
+ * 2. `git commit -m <commitMessage>` -- creates a single squashed commit
+ * 3. Captures the resulting commit SHA via `git rev-parse HEAD`
+ *
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+export declare function trySquashMerge(repoPath: string, sourceBranch: string, commitMessage: string): MergeResult;
+/**
+ * Dispatch to the appropriate merge strategy helper.
+ * For 'merge-commit', tries fast-forward first, then falls back to --no-ff.
+ */
+export declare function applyMergeStrategy(repoPath: string, sourceBranch: string, targetBranch: string, strategy: MergeStrategy): MergeResult;
+//# sourceMappingURL=git-merge-strategies.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-merge-strategies.d.ts","sourceRoot":"","sources":["../src/git-merge-strategies.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGlF;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,WAAW,CASb;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,WAAW,CAab;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,WAAW,CA4Bb;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,WAAW,CA8Cb;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,aAAa,GACtB,WAAW,CAmBb"}

package/dist/git-merge-strategies.js

@@ -0,0 +1,127 @@
+/**
+ * Merge strategy implementations.
+ *
+ * Individual merge strategies (fast-forward, rebase, merge-commit, squash)
+ * and the dispatch function that selects the appropriate strategy.
+ */
+import { runGitSync } from './git-types.js';
+import { extractConflictedFiles } from './git-merge-helpers.js';
+/**
+ * Attempt a fast-forward-only merge.
+ * Returns a MergeResult; on failure, no abort is needed (ff-only is atomic).
+ */
+export function tryFastForwardMerge(repoPath, sourceBranch) {
+    const ffResult = runGitSync(['merge', '--ff-only', sourceBranch], repoPath);
+    if (ffResult.success) {
+        return { success: true };
+    }
+    return {
+        success: false,
+        error: `Fast-forward merge not possible: ${ffResult.error}`,
+    };
+}
+/**
+ * Attempt a rebase merge.
+ * On conflict, aborts the rebase and returns conflicted file details.
+ */
+export function tryRebaseMerge(repoPath, sourceBranch) {
+    const rebaseResult = runGitSync(['rebase', sourceBranch], repoPath);
+    if (rebaseResult.success) {
+        return { success: true };
+    }
+    const conflictedFiles = extractConflictedFiles(repoPath);
+    runGitSync(['rebase', '--abort'], repoPath);
+    return {
+        success: false,
+        error: `Rebase failed: ${conflictedFiles.length} file(s) conflicted`,
+        conflictedFiles,
+    };
+}
+/**
+ * Attempt a merge-commit merge (--no-ff).
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+export function tryMergeCommit(repoPath, sourceBranch, commitMessage) {
+    const mergeResult = runGitSync(['merge', sourceBranch, '--no-ff', '-m', commitMessage], repoPath);
+    if (mergeResult.success) {
+        return { success: true };
+    }
+    const isConflict = mergeResult.error.includes('CONFLICT') ||
+        mergeResult.error.includes('Automatic merge failed') ||
+        mergeResult.output.includes('CONFLICT');
+    if (isConflict) {
+        const conflictedFiles = extractConflictedFiles(repoPath);
+        runGitSync(['merge', '--abort'], repoPath);
+        return {
+            success: false,
+            error: `Merge conflict: ${conflictedFiles.length} file(s) conflicted`,
+            conflictedFiles,
+        };
+    }
+    return {
+        success: false,
+        error: `Merge failed: ${mergeResult.error}`,
+    };
+}
+/**
+ * Attempt a squash merge: stages all changes from the source branch as a
+ * single commit on the current branch.
+ *
+ * 1. `git merge --squash <sourceBranch>` -- stages all diffs without committing
+ * 2. `git commit -m <commitMessage>` -- creates a single squashed commit
+ * 3. Captures the resulting commit SHA via `git rev-parse HEAD`
+ *
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+export function trySquashMerge(repoPath, sourceBranch, commitMessage) {
+    const squashResult = runGitSync(['merge', '--squash', sourceBranch], repoPath);
+    if (!squashResult.success) {
+        const isConflict = squashResult.error.includes('CONFLICT') ||
+            squashResult.error.includes('Automatic merge failed') ||
+            squashResult.output.includes('CONFLICT');
+        if (isConflict) {
+            const conflictedFiles = extractConflictedFiles(repoPath);
+            runGitSync(['merge', '--abort'], repoPath);
+            return {
+                success: false,
+                error: `Squash merge conflict: ${conflictedFiles.length} file(s) conflicted`,
+                conflictedFiles,
+            };
+        }
+        return {
+            success: false,
+            error: `Squash merge failed: ${squashResult.error}`,
+        };
+    }
+    // Commit the squashed changes
+    const commitResult = runGitSync(['commit', '-m', commitMessage], repoPath);
+    if (!commitResult.success) {
+        return {
+            success: false,
+            error: `Squash merge commit failed: ${commitResult.error}`,
+        };
+    }
+    // Capture the resulting commit SHA
+    const shaResult = runGitSync(['rev-parse', 'HEAD'], repoPath);
+    const commitSha = shaResult.success ? shaResult.output : undefined;
+    return { success: true, commitSha };
+}
+/**
+ * Dispatch to the appropriate merge strategy helper.
+ * For 'merge-commit', tries fast-forward first, then falls back to --no-ff.
+ */
+export function applyMergeStrategy(repoPath, sourceBranch, targetBranch, strategy) {
+    if (strategy === 'fast-forward') {
+        return tryFastForwardMerge(repoPath, sourceBranch);
+    }
+    if (strategy === 'rebase') {
+        return tryRebaseMerge(repoPath, sourceBranch);
+    }
+    // 'merge-commit': try ff first, fall back to --no-ff
+    const ffResult = tryFastForwardMerge(repoPath, sourceBranch);
+    if (ffResult.success) {
+        return ffResult;
+    }
+    return tryMergeCommit(repoPath, sourceBranch, `Advance ${targetBranch} to ${sourceBranch}`);
+}
+//# sourceMappingURL=git-merge-strategies.js.map

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

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

package/dist/git-merge.d.ts

@@ -0,0 +1,80 @@
+/**
+ * Merge operations for the git subsystem.
+ *
+ * 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 MergeResult, type MergeStrategy } from './git-types.js';
+import { type CorruptionDetails } from './git-merge-lock.js';
+interface PushFailureRollbackParams {
+    repoPath: string;
+    branch: string;
+    preMergeRef: string;
+    pushError: string;
+    sourceBranch: string;
+    targetBranch: string;
+    onRollbackFailure?: (details: CorruptionDetails) => void;
+}
+/**
+ * Handle a push failure with rollback. If rollback also fails, marks the
+ * branch as corrupt and returns a result indicating the failure.
+ */
+export declare function handlePushFailureWithRollback(params: PushFailureRollbackParams): MergeResult;
+/**
+ * Attempt a squash merge: stages all changes from the source branch as a
+ * single commit on the current branch.
+ *
+ * 1. `git merge --squash <sourceBranch>` -- stages all diffs without committing
+ * 2. `git commit -m <commitMessage>` -- creates a single squashed commit
+ * 3. Captures the resulting commit SHA via `git rev-parse HEAD`
+ *
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+export declare function trySquashMerge(repoPath: string, sourceBranch: string, commitMessage: string): MergeResult;
+/**
+ * Dispatch to the appropriate merge strategy helper.
+ * For 'merge-commit', tries fast-forward first, then falls back to --no-ff.
+ */
+export declare function applyMergeStrategy(repoPath: string, sourceBranch: string, targetBranch: string, strategy: MergeStrategy): MergeResult;
+export interface MergeToIntegrationParams {
+    config: DaemonConfig;
+    branchName: string;
+    deliveryName: string;
+    deliveryId: string;
+    onRollbackFailure?: (details: {
+        branch: string;
+        attemptedRollbackRef: string;
+        currentHead: string;
+    }) => void;
+}
+/**
+ * Merge an agent branch into the integration branch.
+ *
+ * Operates entirely within the persistent merge worktree -- the main
+ * repo working tree is never touched (no stash, no branch switch).
+ *
+ * Returns structured result with conflict details when merge fails.
+ * Serialized via the merge lock to prevent concurrent checkout races.
+ */
+export declare function mergeToIntegration(params: MergeToIntegrationParams): Promise<MergeResult>;
+export interface MergeBackFromIntegrationParams {
+    /** Path to the strategy/delivery worktree. */
+    worktreePath: string;
+    /** Name of the integration branch (e.g., 'integration'). */
+    integrationBranch: string;
+}
+/**
+ * Merge the latest integration HEAD into the current branch of a worktree.
+ *
+ * This is the "prevent conflicts" layer: by syncing integration changes into
+ * the strategy branch before merging to integration, we guarantee the final
+ * merge will be conflict-free (or surface conflicts early for agent resolution).
+ *
+ * On conflict: does NOT abort -- leaves conflict markers in the worktree
+ * so the agent can resolve them (see Delivery 3/4).
+ * On error (e.g., dirty working tree): returns error status.
+ */
+export declare function mergeBackFromIntegration(params: MergeBackFromIntegrationParams): Promise<MergeBackResult>;
+export {};
+//# sourceMappingURL=git-merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-merge.d.ts","sourceRoot":"","sources":["../src/git-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAyC,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCpG,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,WAAW,CA8C5F;AA0HD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,WAAW,CA8Cb;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,aAAa,GACtB,WAAW,CAmBb;AAID,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9G;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,WAAW,CAAC,CA+FtB;AAID,MAAM,WAAW,8BAA8B;IAC7C,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,eAAe,CAAC,CAgE1B"}

package/dist/git-merge.js

@@ -0,0 +1,373 @@
+/**
+ * Merge operations for the git subsystem.
+ *
+ * Handles merging agent branches into integration, merge strategy dispatch,
+ * push failure handling with rollback, and stash management.
+ */
+import { runGitSync } from './git-types.js';
+import { withMergeLock, markIntegrationCorrupt } from './git-merge-lock.js';
+import { withRetry } from '@telora/daemon-core';
+import { getMergeWorktreePath } from './worktree.js';
+// ── Internal helpers (non-exported) ──────────────────────────────
+/**
+ * Returns true if the repo at repoPath has an 'origin' remote configured.
+ * Used to gate all network operations so the daemon works in remote-less repos.
+ */
+function hasOriginRemote(repoPath) {
+    return runGitSync(['remote', 'get-url', 'origin'], repoPath, { timeoutMs: 3_000 }).success;
+}
+/**
+ * Extract the list of conflicted files from git status.
+ * Returns an empty array if the command fails or there are no conflicts.
+ */
+function extractConflictedFiles(repoPath) {
+    const statusResult = runGitSync(['diff', '--name-only', '--diff-filter=U'], repoPath);
+    if (!statusResult.success) {
+        return [];
+    }
+    return statusResult.output.split('\n').filter(Boolean);
+}
+/**
+ * Hard-reset the current branch to a given ref.
+ * Returns whether the rollback succeeded.
+ */
+function rollbackToRef(repoPath, ref) {
+    const result = runGitSync(['reset', '--hard', ref], repoPath);
+    return result.success;
+}
+/**
+ * Handle a push failure with rollback. If rollback also fails, marks the
+ * branch as corrupt and returns a result indicating the failure.
+ */
+export function handlePushFailureWithRollback(params) {
+    const { repoPath, branch, preMergeRef, pushError, sourceBranch, targetBranch, onRollbackFailure } = params;
+    console.error(`Push to origin failed for ${branch}: ${pushError}`);
+    const rollbackSuccess = rollbackToRef(repoPath, preMergeRef);
+    if (rollbackSuccess) {
+        console.log(`Rolled back local merge to ${preMergeRef.slice(0, 8)}`);
+        return {
+            success: false,
+            error: `Push failed (local merge rolled back): ${pushError}. Branch ${sourceBranch} preserved for retry.`,
+            sourceBranch,
+            targetBranch,
+        };
+    }
+    // Rollback also failed -- mark as corrupt
+    const currentHeadResult = runGitSync(['rev-parse', 'HEAD'], repoPath);
+    const currentHead = currentHeadResult.success ? currentHeadResult.output : 'unknown';
+    const details = {
+        branch,
+        attemptedRollbackRef: preMergeRef,
+        currentHead,
+    };
+    markIntegrationCorrupt(details);
+    console.error(`[merge-lock] CRITICAL: Push failed AND rollback failed for "${branch}". ` +
+        `Branch is in a corrupt state. Attempted rollback to ${preMergeRef}, ` +
+        `current HEAD: ${currentHead}. All further merge operations will be rejected ` +
+        `until manual recovery and daemon restart.`);
+    if (onRollbackFailure) {
+        onRollbackFailure(details);
+    }
+    return {
+        success: false,
+        error: `Push failed AND rollback failed. Branch "${branch}" is corrupt. ` +
+            `Manual recovery required: git reset --hard origin/${branch}`,
+        sourceBranch,
+        targetBranch,
+        rollbackFailed: true,
+    };
+}
+/**
+ * Handle untracked files that block a merge.
+ *
+ * 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.
+ */
+function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
+    const isUntrackedBlock = errorOutput.includes('untracked working tree files would be overwritten') ||
+        errorOutput.includes('would be overwritten by merge');
+    if (!isUntrackedBlock) {
+        return false;
+    }
+    const lines = errorOutput.split('\n');
+    const blockingFiles = lines
+        .map((l) => l.trim())
+        .filter((l) => l &&
+        !l.startsWith('error:') &&
+        !l.startsWith('Please') &&
+        !l.startsWith('Aborting'));
+    if (blockingFiles.length === 0) {
+        return false;
+    }
+    console.log(`Removing ${blockingFiles.length} untracked file(s) blocking merge: ${blockingFiles.join(', ')}`);
+    runGitSync(['clean', '-f', '--', ...blockingFiles], repoPath);
+    return true;
+}
+/**
+ * Attempt a fast-forward-only merge.
+ * Returns a MergeResult; on failure, no abort is needed (ff-only is atomic).
+ */
+function tryFastForwardMerge(repoPath, sourceBranch) {
+    const ffResult = runGitSync(['merge', '--ff-only', sourceBranch], repoPath);
+    if (ffResult.success) {
+        return { success: true };
+    }
+    return {
+        success: false,
+        error: `Fast-forward merge not possible: ${ffResult.error}`,
+    };
+}
+/**
+ * Attempt a rebase merge.
+ * On conflict, aborts the rebase and returns conflicted file details.
+ */
+function tryRebaseMerge(repoPath, sourceBranch) {
+    const rebaseResult = runGitSync(['rebase', sourceBranch], repoPath);
+    if (rebaseResult.success) {
+        return { success: true };
+    }
+    const conflictedFiles = extractConflictedFiles(repoPath);
+    runGitSync(['rebase', '--abort'], repoPath);
+    return {
+        success: false,
+        error: `Rebase failed: ${conflictedFiles.length} file(s) conflicted`,
+        conflictedFiles,
+    };
+}
+/**
+ * Attempt a merge-commit merge (--no-ff).
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+function tryMergeCommit(repoPath, sourceBranch, commitMessage) {
+    const mergeResult = runGitSync(['merge', sourceBranch, '--no-ff', '-m', commitMessage], repoPath);
+    if (mergeResult.success) {
+        return { success: true };
+    }
+    const isConflict = mergeResult.error.includes('CONFLICT') ||
+        mergeResult.error.includes('Automatic merge failed') ||
+        mergeResult.output.includes('CONFLICT');
+    if (isConflict) {
+        const conflictedFiles = extractConflictedFiles(repoPath);
+        runGitSync(['merge', '--abort'], repoPath);
+        return {
+            success: false,
+            error: `Merge conflict: ${conflictedFiles.length} file(s) conflicted`,
+            conflictedFiles,
+        };
+    }
+    return {
+        success: false,
+        error: `Merge failed: ${mergeResult.error}`,
+    };
+}
+/**
+ * Attempt a squash merge: stages all changes from the source branch as a
+ * single commit on the current branch.
+ *
+ * 1. `git merge --squash <sourceBranch>` -- stages all diffs without committing
+ * 2. `git commit -m <commitMessage>` -- creates a single squashed commit
+ * 3. Captures the resulting commit SHA via `git rev-parse HEAD`
+ *
+ * On conflict, aborts the merge and returns conflicted file details.
+ */
+export function trySquashMerge(repoPath, sourceBranch, commitMessage) {
+    const squashResult = runGitSync(['merge', '--squash', sourceBranch], repoPath);
+    if (!squashResult.success) {
+        const isConflict = squashResult.error.includes('CONFLICT') ||
+            squashResult.error.includes('Automatic merge failed') ||
+            squashResult.output.includes('CONFLICT');
+        if (isConflict) {
+            const conflictedFiles = extractConflictedFiles(repoPath);
+            runGitSync(['merge', '--abort'], repoPath);
+            return {
+                success: false,
+                error: `Squash merge conflict: ${conflictedFiles.length} file(s) conflicted`,
+                conflictedFiles,
+            };
+        }
+        return {
+            success: false,
+            error: `Squash merge failed: ${squashResult.error}`,
+        };
+    }
+    // Commit the squashed changes
+    const commitResult = runGitSync(['commit', '-m', commitMessage], repoPath);
+    if (!commitResult.success) {
+        return {
+            success: false,
+            error: `Squash merge commit failed: ${commitResult.error}`,
+        };
+    }
+    // Capture the resulting commit SHA
+    const shaResult = runGitSync(['rev-parse', 'HEAD'], repoPath);
+    const commitSha = shaResult.success ? shaResult.output : undefined;
+    return { success: true, commitSha };
+}
+/**
+ * Dispatch to the appropriate merge strategy helper.
+ * For 'merge-commit', tries fast-forward first, then falls back to --no-ff.
+ */
+export function applyMergeStrategy(repoPath, sourceBranch, targetBranch, strategy) {
+    if (strategy === 'fast-forward') {
+        return tryFastForwardMerge(repoPath, sourceBranch);
+    }
+    if (strategy === 'rebase') {
+        return tryRebaseMerge(repoPath, sourceBranch);
+    }
+    // 'merge-commit': try ff first, fall back to --no-ff
+    const ffResult = tryFastForwardMerge(repoPath, sourceBranch);
+    if (ffResult.success) {
+        return ffResult;
+    }
+    return tryMergeCommit(repoPath, sourceBranch, `Advance ${targetBranch} to ${sourceBranch}`);
+}
+/**
+ * Merge an agent branch into the integration branch.
+ *
+ * Operates entirely within the persistent merge worktree -- the main
+ * repo working tree is never touched (no stash, no branch switch).
+ *
+ * Returns structured result with conflict details when merge fails.
+ * Serialized via the merge lock to prevent concurrent checkout races.
+ */
+export function mergeToIntegration(params) {
+    const { config, branchName, deliveryName, deliveryId, onRollbackFailure } = params;
+    return withMergeLock(async () => {
+        const mwt = getMergeWorktreePath(config);
+        const withRemote = hasOriginRemote(config.repoPath);
+        // Fetch latest refs so the merge worktree sees agent branches and remote state
+        if (withRemote) {
+            runGitSync(['fetch', 'origin'], config.repoPath);
+        }
+        // Checkout integration branch in the merge worktree
+        const checkoutResult = runGitSync(['checkout', config.integrationBranch], mwt);
+        if (!checkoutResult.success) {
+            return {
+                success: false,
+                error: `Failed to checkout integration branch: ${checkoutResult.error}`,
+                sourceBranch: branchName,
+                targetBranch: config.integrationBranch,
+            };
+        }
+        // Pull latest integration from remote (only if remote exists)
+        if (withRemote) {
+            runGitSync(['pull', 'origin', config.integrationBranch], mwt);
+        }
+        // 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}]`;
+        // 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
+        // `git log integration..<branch>` to detect unmerged commits.
+        let result = tryFastForwardMerge(mwt, branchName);
+        if (!result.success) {
+            result = tryMergeCommit(mwt, branchName, commitMessage);
+        }
+        if (!result.success && result.error && handleUntrackedFilesBlockingMerge(mwt, result.error)) {
+            result = tryMergeCommit(mwt, branchName, commitMessage);
+        }
+        if (!result.success) {
+            return {
+                ...result,
+                error: `${result.error ?? 'Unknown error'} (merging ${branchName} into ${config.integrationBranch})`,
+                sourceBranch: branchName,
+                targetBranch: config.integrationBranch,
+            };
+        }
+        // Capture the merge commit SHA (from --no-ff merge or ff HEAD)
+        const shaResult = runGitSync(['rev-parse', 'HEAD'], mwt);
+        if (!result.commitSha && shaResult.success) {
+            result = { ...result, commitSha: shaResult.output };
+        }
+        // Push to remote (only if remote exists)
+        if (withRemote) {
+            const pushResult = runGitSync(['push', 'origin', config.integrationBranch], mwt);
+            if (!pushResult.success) {
+                if (preMergeRef.success) {
+                    return handlePushFailureWithRollback({
+                        repoPath: mwt,
+                        branch: config.integrationBranch,
+                        preMergeRef: preMergeRef.output,
+                        pushError: pushResult.error,
+                        sourceBranch: branchName,
+                        targetBranch: config.integrationBranch,
+                        onRollbackFailure,
+                    });
+                }
+                return {
+                    success: false,
+                    error: `Push failed (no pre-merge ref for rollback): ${pushResult.error}`,
+                    sourceBranch: branchName,
+                    targetBranch: config.integrationBranch,
+                };
+            }
+        }
+        console.log(`Successfully merged ${branchName} into ${config.integrationBranch}`);
+        return { success: true, commitSha: result.commitSha };
+    }, `mergeToIntegration:${deliveryName}`);
+}
+/**
+ * Merge the latest integration HEAD into the current branch of a worktree.
+ *
+ * This is the "prevent conflicts" layer: by syncing integration changes into
+ * the strategy branch before merging to integration, we guarantee the final
+ * merge will be conflict-free (or surface conflicts early for agent resolution).
+ *
+ * On conflict: does NOT abort -- leaves conflict markers in the worktree
+ * so the agent can resolve them (see Delivery 3/4).
+ * On error (e.g., dirty working tree): returns error status.
+ */
+export async function mergeBackFromIntegration(params) {
+    const { worktreePath, integrationBranch } = params;
+    // Step 1: Fetch latest integration HEAD from remote (if origin exists)
+    const withRemote = hasOriginRemote(worktreePath);
+    if (withRemote) {
+        try {
+            await withRetry(async () => {
+                const fetchResult = runGitSync(['fetch', 'origin', integrationBranch], worktreePath);
+                if (!fetchResult.success) {
+                    throw new Error(`git fetch failed: ${fetchResult.error}`);
+                }
+            }, { maxAttempts: 3, label: `merge-back-fetch-${integrationBranch}` });
+        }
+        catch (err) {
+            return {
+                status: 'error',
+                message: `Failed to fetch integration branch: ${err.message}`,
+            };
+        }
+    }
+    // Step 2: Merge integration into the current branch.
+    // Use origin/<branch> when remote exists (ensures we merge the pushed tip),
+    // otherwise merge the local branch directly.
+    const mergeRef = withRemote ? `origin/${integrationBranch}` : integrationBranch;
+    const mergeResult = runGitSync(['merge', mergeRef], worktreePath);
+    if (mergeResult.success) {
+        return {
+            status: 'clean',
+            message: `Merged ${mergeRef} cleanly`,
+        };
+    }
+    // Step 3: Determine if this is a conflict or an error
+    const isConflict = mergeResult.error.includes('CONFLICT') ||
+        mergeResult.error.includes('Automatic merge failed') ||
+        mergeResult.output.includes('CONFLICT');
+    if (isConflict) {
+        // Do NOT abort -- leave conflict markers for agent resolution
+        const conflictFiles = extractConflictedFiles(worktreePath);
+        return {
+            status: 'conflict',
+            conflictFiles,
+            message: `Merge conflict: ${conflictFiles.length} file(s) conflicted when merging origin/${integrationBranch}`,
+        };
+    }
+    // Non-conflict error (e.g., dirty working tree, merge already in progress)
+    return {
+        status: 'error',
+        message: `Merge failed: ${mergeResult.error}`,
+    };
+}
+//# sourceMappingURL=git-merge.js.map

package/dist/git-merge.js.map

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