dmux 3.1.1 → 3.3.0

package/dist/actions/merge/issueHandlers/mainDirtyHandler.js

@@ -0,0 +1,72 @@
+/**
+ * Main Dirty Handler
+ * Handles uncommitted changes in the main branch
+ */
+import { handleCommitWithOptions } from '../commitMessageHandler.js';
+import { LogService } from '../../../services/LogService.js';
+export async function handleMainDirty(issue, mainBranch, mainRepoPath, pane, context, retryMerge) {
+    const { stashChanges } = await import('../../../utils/mergeValidation.js');
+    LogService.getInstance().info(`Issue files: ${JSON.stringify(issue.files)}`, 'mainDirtyHandler');
+    const formattedFiles = issue.files.slice(0, 5).map(f => {
+        const formatted = ` •  ${f}`;
+        LogService.getInstance().info(`File: "${f}" → "${formatted}"`, 'mainDirtyHandler');
+        return formatted;
+    });
+    const message = `${mainBranch} has uncommitted changes in:\n${formattedFiles.join('\n')}${issue.files.length > 5 ? '\n  ...' : ''}`;
+    LogService.getInstance().info(`Final message: ${JSON.stringify(message)}`, 'mainDirtyHandler');
+    return {
+        type: 'choice',
+        title: 'Main Branch Has Uncommitted Changes',
+        message,
+        options: [
+            {
+                id: 'commit_automatic',
+                label: 'AI commit (automatic)',
+                description: 'Auto-generate and commit immediately',
+                default: true,
+            },
+            {
+                id: 'commit_ai_editable',
+                label: 'AI commit (editable)',
+                description: 'Generate message from diff, edit before commit',
+            },
+            {
+                id: 'commit_manual',
+                label: 'Manual commit message',
+                description: 'Write your own commit message',
+            },
+            {
+                id: 'stash_main',
+                label: 'Stash changes in main',
+                description: 'Temporarily stash uncommitted changes',
+            },
+            {
+                id: 'cancel',
+                label: 'Cancel merge',
+                description: 'Resolve manually later',
+            },
+        ],
+        onSelect: async (optionId) => {
+            if (optionId === 'cancel') {
+                return { type: 'info', message: 'Merge cancelled', dismissable: true };
+            }
+            if (optionId === 'stash_main') {
+                const result = stashChanges(mainRepoPath);
+                if (!result.success) {
+                    return { type: 'error', message: `Stash failed: ${result.error}`, dismissable: true };
+                }
+                // Retry merge after stashing
+                return retryMerge();
+            }
+            // Handle commit options
+            if (optionId === 'commit_automatic' ||
+                optionId === 'commit_ai_editable' ||
+                optionId === 'commit_manual') {
+                return handleCommitWithOptions(mainRepoPath, optionId, retryMerge);
+            }
+            return { type: 'info', message: 'Unknown option', dismissable: true };
+        },
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=mainDirtyHandler.js.map

package/dist/actions/merge/issueHandlers/mainDirtyHandler.js.map

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

package/dist/actions/merge/issueHandlers/mergeConflictHandler.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Merge Conflict Handler
+ * Handles detected merge conflicts
+ */
+import type { ActionResult, ActionContext } from '../../types.js';
+import type { DmuxPane } from '../../../types.js';
+export interface MergeConflictIssue {
+    type: 'merge_conflict';
+    message: string;
+    files: string[];
+}
+export declare function handleMergeConflict(issue: MergeConflictIssue, mainBranch: string, mainRepoPath: string, pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
+//# sourceMappingURL=mergeConflictHandler.d.ts.map

package/dist/actions/merge/issueHandlers/mergeConflictHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeConflictHandler.d.ts","sourceRoot":"","sources":["../../../../src/actions/merge/issueHandlers/mergeConflictHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,kBAAkB,EACzB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAmDvB"}

package/dist/actions/merge/issueHandlers/mergeConflictHandler.js

@@ -0,0 +1,52 @@
+/**
+ * Merge Conflict Handler
+ * Handles detected merge conflicts
+ */
+export async function handleMergeConflict(issue, mainBranch, mainRepoPath, pane, context) {
+    // Check if we have the fallback message
+    const hasRealFiles = issue.files.length > 0 && !issue.files[0].includes('conflict detection incomplete');
+    const message = hasRealFiles
+        ? `Conflicts detected in:\n${issue.files.slice(0, 5).map(f => ` •  ${f}`).join('\n')}${issue.files.length > 5 ? '\n  ...' : ''}`
+        : `Potential conflicts detected between ${mainBranch} and ${pane.slug}.\n\nThe branches have diverged and may have conflicting changes.\nYou can try AI-assisted merge or resolve manually.`;
+    return {
+        type: 'choice',
+        title: 'Merge Conflicts Detected',
+        message,
+        options: [
+            {
+                id: 'ai_merge',
+                label: 'Try AI-assisted merge',
+                description: 'Let AI intelligently combine both versions',
+                default: true,
+            },
+            {
+                id: 'manual_merge',
+                label: 'Manual resolution',
+                description: 'Jump to pane to resolve conflicts',
+            },
+            {
+                id: 'cancel',
+                label: 'Cancel merge',
+                description: 'Do nothing',
+            },
+        ],
+        onSelect: async (optionId) => {
+            if (optionId === 'cancel') {
+                return { type: 'info', message: 'Merge cancelled', dismissable: true };
+            }
+            if (optionId === 'manual_merge') {
+                // Start the merge process and let user resolve manually
+                const { executeMergeWithConflictHandling } = await import('../mergeExecution.js');
+                return executeMergeWithConflictHandling(pane, context, mainBranch, mainRepoPath, 'manual');
+            }
+            if (optionId === 'ai_merge') {
+                // Attempt AI-assisted merge via new pane
+                const { createConflictResolutionPaneForMerge } = await import('../conflictResolution.js');
+                return createConflictResolutionPaneForMerge(pane, context, mainBranch, mainRepoPath);
+            }
+            return { type: 'info', message: 'Unknown option', dismissable: true };
+        },
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=mergeConflictHandler.js.map

package/dist/actions/merge/issueHandlers/mergeConflictHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeConflictHandler.js","sourceRoot":"","sources":["../../../../src/actions/merge/issueHandlers/mergeConflictHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAyB,EACzB,UAAkB,EAClB,YAAoB,EACpB,IAAc,EACd,OAAsB;IAEtB,wCAAwC;IACxC,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IAEzG,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,2BAA2B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;QAChI,CAAC,CAAC,wCAAwC,UAAU,QAAQ,IAAI,CAAC,IAAI,uHAAuH,CAAC;IAE/L,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,0BAA0B;QACjC,OAAO;QACP,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,UAAU;gBACd,KAAK,EAAE,uBAAuB;gBAC9B,WAAW,EAAE,4CAA4C;gBACzD,OAAO,EAAE,IAAI;aACd;YACD;gBACE,EAAE,EAAE,cAAc;gBAClB,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,mCAAmC;aACjD;YACD;gBACE,EAAE,EAAE,QAAQ;gBACZ,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,YAAY;aAC1B;SACF;QACD,QAAQ,EAAE,KAAK,EAAE,QAAgB,EAAE,EAAE;YACnC,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;YACzE,CAAC;YAED,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;gBAChC,wDAAwD;gBACxD,MAAM,EAAE,gCAAgC,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;gBAClF,OAAO,gCAAgC,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC7F,CAAC;YAED,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC5B,yCAAyC;gBACzC,MAAM,EAAE,oCAAoC,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;gBAC1F,OAAO,oCAAoC,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YACvF,CAAC;YAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACxE,CAAC;QACD,WAAW,EAAE,IAAI;KAClB,CAAC;AACJ,CAAC"}

package/dist/actions/merge/issueHandlers/nothingToMergeHandler.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Nothing To Merge Handler
+ * Handles the case when there are no new commits to merge
+ */
+import type { ActionResult } from '../../types.js';
+export declare function handleNothingToMerge(): ActionResult;
+//# sourceMappingURL=nothingToMergeHandler.d.ts.map

package/dist/actions/merge/issueHandlers/nothingToMergeHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nothingToMergeHandler.d.ts","sourceRoot":"","sources":["../../../../src/actions/merge/issueHandlers/nothingToMergeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,IAAI,YAAY,CAMnD"}

package/dist/actions/merge/issueHandlers/nothingToMergeHandler.js

@@ -0,0 +1,12 @@
+/**
+ * Nothing To Merge Handler
+ * Handles the case when there are no new commits to merge
+ */
+export function handleNothingToMerge() {
+    return {
+        type: 'info',
+        message: 'No new commits to merge',
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=nothingToMergeHandler.js.map

package/dist/actions/merge/issueHandlers/nothingToMergeHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nothingToMergeHandler.js","sourceRoot":"","sources":["../../../../src/actions/merge/issueHandlers/nothingToMergeHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,yBAAyB;QAClC,WAAW,EAAE,IAAI;KAClB,CAAC;AACJ,CAAC"}

package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Worktree Uncommitted Handler
+ * Handles uncommitted changes in the worktree
+ */
+import type { ActionResult, ActionContext } from '../../types.js';
+import type { DmuxPane } from '../../../types.js';
+export interface WorktreeUncommittedIssue {
+    type: 'worktree_uncommitted';
+    message: string;
+    files: string[];
+}
+export declare function handleWorktreeUncommitted(issue: WorktreeUncommittedIssue, pane: DmuxPane, context: ActionContext, retryMerge: () => Promise<ActionResult>): Promise<ActionResult>;
+//# sourceMappingURL=worktreeUncommittedHandler.d.ts.map

package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktreeUncommittedHandler.d.ts","sourceRoot":"","sources":["../../../../src/actions/merge/issueHandlers/worktreeUncommittedHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,wBAAwB,EAC/B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC,YAAY,CAAC,CAkDvB"}

package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.js

@@ -0,0 +1,49 @@
+/**
+ * Worktree Uncommitted Handler
+ * Handles uncommitted changes in the worktree
+ */
+import { handleCommitWithOptions } from '../commitMessageHandler.js';
+export async function handleWorktreeUncommitted(issue, pane, context, retryMerge) {
+    return {
+        type: 'choice',
+        title: 'Worktree Has Uncommitted Changes',
+        message: `Changes in:\n${issue.files.slice(0, 5).map(f => ` •  ${f}`).join('\n')}${issue.files.length > 5 ? '\n  ...' : ''}`,
+        options: [
+            {
+                id: 'commit_automatic',
+                label: 'AI commit (automatic)',
+                description: 'Auto-generate and commit immediately',
+                default: true,
+            },
+            {
+                id: 'commit_ai_editable',
+                label: 'AI commit (editable)',
+                description: 'Generate message from diff, edit before commit',
+            },
+            {
+                id: 'commit_manual',
+                label: 'Manual commit message',
+                description: 'Write your own commit message',
+            },
+            {
+                id: 'cancel',
+                label: 'Cancel merge',
+                description: 'Resolve manually later',
+            },
+        ],
+        onSelect: async (optionId) => {
+            if (optionId === 'cancel') {
+                return { type: 'info', message: 'Merge cancelled', dismissable: true };
+            }
+            // Handle commit options
+            if (optionId === 'commit_automatic' ||
+                optionId === 'commit_ai_editable' ||
+                optionId === 'commit_manual') {
+                return handleCommitWithOptions(pane.worktreePath, optionId, retryMerge);
+            }
+            return { type: 'info', message: 'Unknown option', dismissable: true };
+        },
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=worktreeUncommittedHandler.js.map

package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktreeUncommittedHandler.js","sourceRoot":"","sources":["../../../../src/actions/merge/issueHandlers/worktreeUncommittedHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAQrE,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAA+B,EAC/B,IAAc,EACd,OAAsB,EACtB,UAAuC;IAEvC,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,kCAAkC;QACzC,OAAO,EAAE,gBAAgB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5H,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,kBAAkB;gBACtB,KAAK,EAAE,uBAAuB;gBAC9B,WAAW,EAAE,sCAAsC;gBACnD,OAAO,EAAE,IAAI;aACd;YACD;gBACE,EAAE,EAAE,oBAAoB;gBACxB,KAAK,EAAE,sBAAsB;gBAC7B,WAAW,EAAE,gDAAgD;aAC9D;YACD;gBACE,EAAE,EAAE,eAAe;gBACnB,KAAK,EAAE,uBAAuB;gBAC9B,WAAW,EAAE,+BAA+B;aAC7C;YACD;gBACE,EAAE,EAAE,QAAQ;gBACZ,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,wBAAwB;aACtC;SACF;QACD,QAAQ,EAAE,KAAK,EAAE,QAAgB,EAAE,EAAE;YACnC,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;YACzE,CAAC;YAED,wBAAwB;YACxB,IACE,QAAQ,KAAK,kBAAkB;gBAC/B,QAAQ,KAAK,oBAAoB;gBACjC,QAAQ,KAAK,eAAe,EAC5B,CAAC;gBACD,OAAO,uBAAuB,CAC5B,IAAI,CAAC,YAAa,EAClB,QAAuE,EACvE,UAAU,CACX,CAAC;YACJ,CAAC;YAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACxE,CAAC;QACD,WAAW,EAAE,IAAI;KAClB,CAAC;AACJ,CAAC"}

package/dist/actions/merge/mergeExecution.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Merge Execution - UI logic for merge execution workflows
+ *
+ * This module handles ActionResult flows for executing merges with
+ * conflict handling, cleanup, and post-merge actions.
+ */
+import type { ActionResult, ActionContext } from "../types.js";
+import type { DmuxPane } from "../../types.js";
+/**
+ * Execute merge with conflict handling
+ */
+export declare function executeMergeWithConflictHandling(pane: DmuxPane, context: ActionContext, mainBranch: string, mainRepoPath: string, strategy: "manual" | "ai"): Promise<ActionResult>;
+/**
+ * Execute the actual merge operation (called after all pre-checks pass)
+ * This implements the 2-phase merge:
+ * 1. Merge main INTO worktree (to get latest changes and detect conflicts)
+ * 2. Merge worktree INTO main (to bring changes back)
+ *
+ * @param skipWorktreeMerge - Set to true when resuming after conflict resolution (step 1 already done)
+ */
+export declare function executeMerge(pane: DmuxPane, context: ActionContext, mainBranch: string, mainRepoPath: string, skipWorktreeMerge?: boolean): Promise<ActionResult>;
+//# sourceMappingURL=mergeExecution.d.ts.map

package/dist/actions/merge/mergeExecution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeExecution.d.ts","sourceRoot":"","sources":["../../../src/actions/merge/mergeExecution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAG9C;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,QAAQ,GAAG,IAAI,GACxB,OAAO,CAAC,YAAY,CAAC,CAqEvB;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,iBAAiB,GAAE,OAAe,GACjC,OAAO,CAAC,YAAY,CAAC,CAuIvB"}

package/dist/actions/merge/mergeExecution.js

@@ -0,0 +1,180 @@
+/**
+ * Merge Execution - UI logic for merge execution workflows
+ *
+ * This module handles ActionResult flows for executing merges with
+ * conflict handling, cleanup, and post-merge actions.
+ */
+import { triggerHook } from "../../utils/hooks.js";
+/**
+ * Execute merge with conflict handling
+ */
+export async function executeMergeWithConflictHandling(pane, context, mainBranch, mainRepoPath, strategy) {
+    const { mergeMainIntoWorktree, completeMerge } = await import("../../utils/mergeExecution.js");
+    // Step 1: Merge main into worktree
+    const result = mergeMainIntoWorktree(pane.worktreePath, mainBranch);
+    if (!result.success && result.needsManualResolution) {
+        if (strategy === "ai") {
+            // Try AI resolution
+            const { aiResolveAllConflicts } = await import("../../utils/aiMerge.js");
+            const aiResult = await aiResolveAllConflicts(pane.worktreePath, result.conflictFiles || []);
+            if (aiResult.success) {
+                // AI resolved all conflicts, complete the merge
+                const completeResult = completeMerge(pane.worktreePath, "Merge with AI-resolved conflicts");
+                if (completeResult.success) {
+                    // Continue with the second phase of merge
+                    return executeMerge(pane, context, mainBranch, mainRepoPath);
+                }
+                else {
+                    return {
+                        type: "error",
+                        message: `Failed to complete merge: ${completeResult.error}`,
+                        dismissable: true,
+                    };
+                }
+            }
+            else {
+                // AI couldn't resolve, fall back to manual
+                return {
+                    type: "error",
+                    title: "AI Merge Failed",
+                    message: `AI couldn't resolve conflicts in: ${aiResult.failedFiles.join(", ")}.\nPlease resolve manually.`,
+                    dismissable: true,
+                };
+            }
+        }
+        else {
+            // Manual resolution - jump to pane
+            return {
+                type: "navigation",
+                title: "Manual Conflict Resolution",
+                message: `Conflicts in: ${result.conflictFiles?.join(", ")}.\nResolve in the pane, then try merge again.`,
+                targetPaneId: pane.id,
+                dismissable: true,
+            };
+        }
+    }
+    if (!result.success) {
+        return {
+            type: "error",
+            message: `Merge failed: ${result.error}`,
+            dismissable: true,
+        };
+    }
+    // No conflicts, proceed with the main merge
+    return executeMerge(pane, context, mainBranch, mainRepoPath);
+}
+/**
+ * Execute the actual merge operation (called after all pre-checks pass)
+ * This implements the 2-phase merge:
+ * 1. Merge main INTO worktree (to get latest changes and detect conflicts)
+ * 2. Merge worktree INTO main (to bring changes back)
+ *
+ * @param skipWorktreeMerge - Set to true when resuming after conflict resolution (step 1 already done)
+ */
+export async function executeMerge(pane, context, mainBranch, mainRepoPath, skipWorktreeMerge = false) {
+    const { mergeMainIntoWorktree, mergeWorktreeIntoMain } = await import("../../utils/mergeExecution.js");
+    // Step 1: Merge main into worktree first (get latest changes from main)
+    // Skip this if we're resuming after conflict resolution (already done by agent)
+    if (!skipWorktreeMerge) {
+        const step1 = mergeMainIntoWorktree(pane.worktreePath, mainBranch);
+        if (!step1.success) {
+            // Check if this is a conflict that needs manual resolution
+            if (step1.needsManualResolution &&
+                step1.conflictFiles &&
+                step1.conflictFiles.length > 0) {
+                // Offer AI/manual conflict resolution
+                return {
+                    type: "choice",
+                    title: "Merge Conflicts Detected",
+                    message: `Conflicts occurred while merging ${mainBranch} into worktree:\n${step1.conflictFiles
+                        .slice(0, 5)
+                        .join("\n")}${step1.conflictFiles.length > 5 ? "\n..." : ""}`,
+                    options: [
+                        {
+                            id: "ai_merge",
+                            label: "Try AI-assisted merge",
+                            description: "Let AI intelligently combine both versions",
+                            default: true,
+                        },
+                        {
+                            id: "manual_merge",
+                            label: "Manual resolution",
+                            description: "Resolve conflicts yourself in the pane",
+                        },
+                        {
+                            id: "abort",
+                            label: "Abort merge",
+                            description: "Cancel and clean up",
+                        },
+                    ],
+                    onSelect: async (optionId) => {
+                        if (optionId === "abort") {
+                            // Abort the merge
+                            const { abortMerge } = await import("../../utils/mergeExecution.js");
+                            abortMerge(pane.worktreePath);
+                            return {
+                                type: "info",
+                                message: "Merge aborted",
+                                dismissable: true,
+                            };
+                        }
+                        if (optionId === "manual_merge") {
+                            // Jump to the pane so user can resolve manually
+                            return {
+                                type: "navigation",
+                                title: "Manual Conflict Resolution",
+                                message: `Conflicts in: ${step1.conflictFiles?.join(", ")}.\nResolve in the pane, then try merge again.`,
+                                targetPaneId: pane.id,
+                                dismissable: true,
+                            };
+                        }
+                        if (optionId === "ai_merge") {
+                            // Create conflict resolution pane with AI
+                            const { createConflictResolutionPaneForMerge } = await import("./conflictResolution.js");
+                            return createConflictResolutionPaneForMerge(pane, context, mainBranch, mainRepoPath);
+                        }
+                        return {
+                            type: "info",
+                            message: "Unknown option",
+                            dismissable: true,
+                        };
+                    },
+                    dismissable: true,
+                };
+            }
+            // Non-conflict error (e.g., permission denied, git failure)
+            return {
+                type: "error",
+                title: "Merge Failed",
+                message: `Failed to merge ${mainBranch} into worktree: ${step1.error}`,
+                dismissable: true,
+            };
+        }
+    }
+    // Step 2: Merge worktree into main (bring changes back to main)
+    const step2 = mergeWorktreeIntoMain(mainRepoPath, pane.slug);
+    if (!step2.success) {
+        return {
+            type: "error",
+            title: "Merge Failed",
+            message: `Failed to merge into ${mainBranch}: ${step2.error}`,
+            dismissable: true,
+        };
+    }
+    // Trigger post_merge hook after successful merge
+    console.error(`[mergeExecution] About to trigger post_merge hook for ${pane.slug}`);
+    await triggerHook("post_merge", mainRepoPath, pane, {
+        DMUX_TARGET_BRANCH: mainBranch,
+    });
+    console.error(`[mergeExecution] post_merge hook completed for ${pane.slug}`);
+    // Merge successful! Show cleanup options using the existing closePane dialog
+    // This reuses the CLOSE action which handles everything properly:
+    // - Hooks (before_pane_close, before_worktree_remove, worktree_removed, pane_closed)
+    // - Layout recalculation after pane removal
+    // - Last pane handling (recreates welcome pane)
+    // - Terminal clearing to prevent artifacts
+    console.error(`[mergeExecution] Merge complete for ${pane.slug}, showing cleanup options via closePane`);
+    const { closePane } = await import("../implementations/closeAction.js");
+    return closePane(pane, context);
+}
+//# sourceMappingURL=mergeExecution.js.map

package/dist/actions/merge/mergeExecution.js.map

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

package/dist/actions/paneActions.d.ts

@@ -1,45 +1,8 @@
 /**
  * Standardized Pane Actions
  *
- * Core action implementations that work across all interfaces.
- * Each action returns a standardized ActionResult that interfaces can handle.
+ * Re-exports all action implementations from the implementations directory.
+ * This file maintains backward compatibility while actions are now split into separate files.
  */
-import type { DmuxPane } from '../types.js';
-import type { ActionResult, ActionContext } from './types.js';
-/**
- * View/Jump to a pane
- */
-export declare function viewPane(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
-/**
- * Close a pane - presents options for how to close
- */
-export declare function closePane(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
-/**
- * Merge a worktree into the main branch with comprehensive pre-checks
- */
-export declare function mergePane(pane: DmuxPane, context: ActionContext, params?: {
-    mainBranch?: string;
-}): Promise<ActionResult>;
-/**
- * Rename a pane
- */
-export declare function renamePane(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
-/**
- * Copy worktree path to clipboard
- */
-export declare function copyPath(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
-/**
- * Open worktree in external editor
- */
-export declare function openInEditor(pane: DmuxPane, context: ActionContext, params?: {
-    editor?: string;
-}): Promise<ActionResult>;
-/**
- * Duplicate a pane (create a new pane with the same prompt)
- */
-export declare function duplicatePane(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
-/**
- * Toggle autopilot mode for a pane
- */
-export declare function toggleAutopilot(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
+export { viewPane, closePane, mergePane, renamePane, duplicatePane, copyPath, openInEditor, toggleAutopilot, } from './implementations/index.js';
 //# sourceMappingURL=paneActions.d.ts.map

package/dist/actions/paneActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paneActions.d.ts","sourceRoot":"","sources":["../../src/actions/paneActions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAgB,MAAM,YAAY,CAAC;AAkC5E;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAiBvB;AAED;;GAEG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAqCvB;AAkHD;;GAEG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/B,OAAO,CAAC,YAAY,CAAC,CA2CvB;AA8rBD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA0BvB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3B,OAAO,CAAC,YAAY,CAAC,CA0BvB;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAiBvB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA8BvB"}
+{"version":3,"file":"paneActions.d.ts","sourceRoot":"","sources":["../../src/actions/paneActions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,eAAe,GAChB,MAAM,4BAA4B,CAAC"}