dmux 3.2.0 → 3.3.0

package/dist/actions/implementations/mergeAction.js

@@ -0,0 +1,84 @@
+/**
+ * MERGE Action - Merge a worktree into the main branch with comprehensive pre-checks
+ *
+ * This is the simplified orchestrator that delegates to specialized modules.
+ */
+import { triggerHook } from '../../utils/hooks.js';
+import { executeMerge } from '../merge/mergeExecution.js';
+import { handleNothingToMerge, handleMainDirty, handleWorktreeUncommitted, handleMergeConflict, } from '../merge/issueHandlers/index.js';
+/**
+ * Merge a worktree into the main branch with comprehensive pre-checks
+ */
+export async function mergePane(pane, context, params) {
+    // 1. Validation
+    if (!pane.worktreePath) {
+        return {
+            type: 'error',
+            message: 'This pane has no worktree to merge',
+            dismissable: true,
+        };
+    }
+    // 2. Pre-merge validation
+    const { validateMerge } = await import('../../utils/mergeValidation.js');
+    const mainRepoPath = pane.worktreePath.replace(/\/\.dmux\/worktrees\/[^/]+$/, '');
+    const validation = validateMerge(mainRepoPath, pane.worktreePath, pane.slug);
+    // 3. Handle detected issues
+    if (!validation.canMerge) {
+        return handleMergeIssues(pane, context, validation, mainRepoPath);
+    }
+    // 4. No issues detected, proceed with merge confirmation
+    return {
+        type: 'confirm',
+        title: 'Merge Worktree',
+        message: `Merge "${pane.slug}" into ${validation.mainBranch}?`,
+        confirmLabel: 'Merge',
+        cancelLabel: 'Cancel',
+        onConfirm: async () => {
+            // Trigger pre_merge hook before starting merge
+            await triggerHook('pre_merge', mainRepoPath, pane, {
+                DMUX_TARGET_BRANCH: validation.mainBranch,
+            });
+            return executeMerge(pane, context, validation.mainBranch, mainRepoPath);
+        },
+        onCancel: async () => {
+            return {
+                type: 'info',
+                message: 'Merge cancelled',
+                dismissable: true,
+            };
+        },
+    };
+}
+/**
+ * Handle detected merge issues by delegating to specialized handlers
+ */
+async function handleMergeIssues(pane, context, validation, mainRepoPath) {
+    const { issues, mainBranch } = validation;
+    // Create retry function that re-runs the merge
+    const retryMerge = () => mergePane(pane, context, { mainBranch });
+    // Find and handle specific issue types
+    const nothingToMerge = issues.find((i) => i.type === 'nothing_to_merge');
+    if (nothingToMerge) {
+        return handleNothingToMerge();
+    }
+    const mainDirty = issues.find((i) => i.type === 'main_dirty');
+    if (mainDirty) {
+        return handleMainDirty(mainDirty, mainBranch, mainRepoPath, pane, context, retryMerge);
+    }
+    const worktreeUncommitted = issues.find((i) => i.type === 'worktree_uncommitted');
+    if (worktreeUncommitted) {
+        return handleWorktreeUncommitted(worktreeUncommitted, pane, context, retryMerge);
+    }
+    const mergeConflict = issues.find((i) => i.type === 'merge_conflict');
+    if (mergeConflict) {
+        return handleMergeConflict(mergeConflict, mainBranch, mainRepoPath, pane, context);
+    }
+    // Generic fallback for unknown issues
+    return {
+        type: 'error',
+        title: 'Merge Issues Detected',
+        message: issues.map((i) => i.message).join('\n'),
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=mergeAction.js.map

package/dist/actions/implementations/mergeAction.js.map

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

package/dist/actions/implementations/openInEditorAction.d.ts

@@ -0,0 +1,12 @@
+/**
+ * OPEN_IN_EDITOR Action - Open worktree in external editor
+ */
+import type { DmuxPane } from '../../types.js';
+import type { ActionResult, ActionContext } from '../types.js';
+/**
+ * Open worktree in external editor
+ */
+export declare function openInEditor(pane: DmuxPane, context: ActionContext, params?: {
+    editor?: string;
+}): Promise<ActionResult>;
+//# sourceMappingURL=openInEditorAction.d.ts.map

package/dist/actions/implementations/openInEditorAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openInEditorAction.d.ts","sourceRoot":"","sources":["../../../src/actions/implementations/openInEditorAction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D;;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"}

package/dist/actions/implementations/openInEditorAction.js

@@ -0,0 +1,33 @@
+/**
+ * OPEN_IN_EDITOR Action - Open worktree in external editor
+ */
+import { execSync } from 'child_process';
+/**
+ * Open worktree in external editor
+ */
+export async function openInEditor(pane, context, params) {
+    if (!pane.worktreePath) {
+        return {
+            type: 'error',
+            message: 'This pane has no worktree to open',
+            dismissable: true,
+        };
+    }
+    const editor = params?.editor || process.env.EDITOR || 'code';
+    try {
+        execSync(`${editor} "${pane.worktreePath}"`, { stdio: 'pipe' });
+        return {
+            type: 'success',
+            message: `Opened in ${editor}`,
+            dismissable: true,
+        };
+    }
+    catch (error) {
+        return {
+            type: 'error',
+            message: `Failed to open in editor: ${error}`,
+            dismissable: true,
+        };
+    }
+}
+//# sourceMappingURL=openInEditorAction.js.map

package/dist/actions/implementations/openInEditorAction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openInEditorAction.js","sourceRoot":"","sources":["../../../src/actions/implementations/openInEditorAction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,IAAc,EACd,OAAsB,EACtB,MAA4B;IAE5B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACvB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,mCAAmC;YAC5C,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC;IAE9D,IAAI,CAAC;QACH,QAAQ,CAAC,GAAG,MAAM,KAAK,IAAI,CAAC,YAAY,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAEhE,OAAO;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,aAAa,MAAM,EAAE;YAC9B,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,6BAA6B,KAAK,EAAE;YAC7C,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/actions/implementations/renameAction.d.ts

@@ -0,0 +1,13 @@
+/**
+ * RENAME Action - Rename a pane
+ * NOTE: Renaming is disabled because pane names are tied to git worktree branches.
+ * Renaming would require renaming the branch and moving the worktree directory,
+ * which is complex and error-prone.
+ */
+import type { DmuxPane } from '../../types.js';
+import type { ActionResult, ActionContext } from '../types.js';
+/**
+ * Rename a pane (currently disabled - shows info message)
+ */
+export declare function renamePane(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
+//# sourceMappingURL=renameAction.d.ts.map

package/dist/actions/implementations/renameAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renameAction.d.ts","sourceRoot":"","sources":["../../../src/actions/implementations/renameAction.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAOvB"}

package/dist/actions/implementations/renameAction.js

@@ -0,0 +1,18 @@
+/**
+ * RENAME Action - Rename a pane
+ * NOTE: Renaming is disabled because pane names are tied to git worktree branches.
+ * Renaming would require renaming the branch and moving the worktree directory,
+ * which is complex and error-prone.
+ */
+/**
+ * Rename a pane (currently disabled - shows info message)
+ */
+export async function renamePane(pane, context) {
+    return {
+        type: 'info',
+        title: 'Rename Not Supported',
+        message: 'Pane names are tied to git worktree branches and cannot be renamed after creation.\n\nThe pane name always matches the worktree directory and git branch name.',
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=renameAction.js.map

package/dist/actions/implementations/renameAction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renameAction.js","sourceRoot":"","sources":["../../../src/actions/implementations/renameAction.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAc,EACd,OAAsB;IAEtB,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,sBAAsB;QAC7B,OAAO,EAAE,gKAAgK;QACzK,WAAW,EAAE,IAAI;KAClB,CAAC;AACJ,CAAC"}

package/dist/actions/implementations/toggleAutopilotAction.d.ts

@@ -0,0 +1,10 @@
+/**
+ * TOGGLE_AUTOPILOT Action - Toggle autopilot mode for a pane
+ */
+import type { DmuxPane } from '../../types.js';
+import type { ActionResult, ActionContext } from '../types.js';
+/**
+ * Toggle autopilot mode for a pane
+ */
+export declare function toggleAutopilot(pane: DmuxPane, context: ActionContext): Promise<ActionResult>;
+//# sourceMappingURL=toggleAutopilotAction.d.ts.map

package/dist/actions/implementations/toggleAutopilotAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toggleAutopilotAction.d.ts","sourceRoot":"","sources":["../../../src/actions/implementations/toggleAutopilotAction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA8BvB"}

package/dist/actions/implementations/toggleAutopilotAction.js

@@ -0,0 +1,33 @@
+/**
+ * TOGGLE_AUTOPILOT Action - Toggle autopilot mode for a pane
+ */
+/**
+ * Toggle autopilot mode for a pane
+ */
+export async function toggleAutopilot(pane, context) {
+    try {
+        // Toggle the autopilot setting
+        const newAutopilotState = !pane.autopilot;
+        // Update the pane
+        const updatedPanes = context.panes.map(p => p.id === pane.id ? { ...p, autopilot: newAutopilotState } : p);
+        // Save the updated panes
+        await context.savePanes(updatedPanes);
+        // Notify about the update
+        if (context.onPaneUpdate) {
+            context.onPaneUpdate({ ...pane, autopilot: newAutopilotState });
+        }
+        return {
+            type: 'success',
+            message: `Autopilot ${newAutopilotState ? 'enabled' : 'disabled'} for "${pane.slug}"`,
+            dismissable: true,
+        };
+    }
+    catch (error) {
+        return {
+            type: 'error',
+            message: `Failed to toggle autopilot: ${error instanceof Error ? error.message : 'Unknown error'}`,
+            dismissable: true,
+        };
+    }
+}
+//# sourceMappingURL=toggleAutopilotAction.js.map

package/dist/actions/implementations/toggleAutopilotAction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toggleAutopilotAction.js","sourceRoot":"","sources":["../../../src/actions/implementations/toggleAutopilotAction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAc,EACd,OAAsB;IAEtB,IAAI,CAAC;QACH,+BAA+B;QAC/B,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;QAE1C,kBAAkB;QAClB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,CAC9D,CAAC;QAEF,yBAAyB;QACzB,MAAM,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAEtC,0BAA0B;QAC1B,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACzB,OAAO,CAAC,YAAY,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,OAAO;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,aAAa,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,SAAS,IAAI,CAAC,IAAI,GAAG;YACrF,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,+BAA+B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE;YAClG,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/actions/implementations/viewAction.d.ts

@@ -0,0 +1,10 @@
+/**
+ * VIEW Action - Jump to/view a pane
+ */
+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>;
+//# sourceMappingURL=viewAction.d.ts.map

package/dist/actions/implementations/viewAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"viewAction.d.ts","sourceRoot":"","sources":["../../../src/actions/implementations/viewAction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAiBvB"}

package/dist/actions/implementations/viewAction.js

@@ -0,0 +1,26 @@
+/**
+ * VIEW Action - Jump to/view a pane
+ */
+import { execSync } from 'child_process';
+/**
+ * View/Jump to a pane
+ */
+export async function viewPane(pane, context) {
+    try {
+        execSync(`tmux select-pane -t '${pane.paneId}'`, { stdio: 'pipe' });
+        return {
+            type: 'navigation',
+            message: `Jumped to pane: ${pane.slug}`,
+            targetPaneId: pane.id,
+            dismissable: true,
+        };
+    }
+    catch (error) {
+        return {
+            type: 'error',
+            message: 'Failed to jump to pane - it may have been closed',
+            dismissable: true,
+        };
+    }
+}
+//# sourceMappingURL=viewAction.js.map

package/dist/actions/implementations/viewAction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"viewAction.js","sourceRoot":"","sources":["../../../src/actions/implementations/viewAction.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,IAAc,EACd,OAAsB;IAEtB,IAAI,CAAC;QACH,QAAQ,CAAC,wBAAwB,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAEpE,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,mBAAmB,IAAI,CAAC,IAAI,EAAE;YACvC,YAAY,EAAE,IAAI,CAAC,EAAE;YACrB,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,kDAAkD;YAC3D,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,27 @@
+/**
+ * Commit Message Handler - UI logic for commit message workflows
+ *
+ * This module handles ActionResult flows for commit message generation,
+ * editing, and manual input. It uses domain logic from utils/ but returns
+ * ActionResult objects suitable for TUI/Web/API consumption.
+ */
+import type { ActionResult } from '../types.js';
+/**
+ * Generate commit message with timeout and error handling
+ * Returns null if it fails, so caller can fall back to manual input
+ */
+export declare function generateCommitMessageSafe(repoPath: string, timeoutMs?: number): Promise<string | null>;
+/**
+ * Prompt for commit message with optional AI generation
+ * @param repoPath - Path to repository
+ * @param mode - 'ai_automatic' | 'ai_editable' | 'manual'
+ * @param onCommit - Callback to execute after commit message is obtained
+ * @returns ActionResult prompting for commit message
+ */
+export declare function promptForCommitMessage(repoPath: string, mode: 'ai_automatic' | 'ai_editable' | 'manual', onCommit: (message: string) => Promise<ActionResult>): Promise<ActionResult>;
+/**
+ * Handle commit with the given options (automatic/editable/manual)
+ * This DRYs up the common pattern of presenting commit options and executing
+ */
+export declare function handleCommitWithOptions(repoPath: string, optionId: 'commit_automatic' | 'commit_ai_editable' | 'commit_manual', onSuccess: () => Promise<ActionResult>): Promise<ActionResult>;
+//# sourceMappingURL=commitMessageHandler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"commitMessageHandler.d.ts","sourceRoot":"","sources":["../../../src/actions/merge/commitMessageHandler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,SAAS,GAAE,MAAc,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,cAAc,GAAG,aAAa,GAAG,QAAQ,EAC/C,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,CA8EvB;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,kBAAkB,GAAG,oBAAoB,GAAG,eAAe,EACrE,SAAS,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GACrC,OAAO,CAAC,YAAY,CAAC,CAevB"}

package/dist/actions/merge/commitMessageHandler.js

@@ -0,0 +1,131 @@
+/**
+ * Commit Message Handler - UI logic for commit message workflows
+ *
+ * This module handles ActionResult flows for commit message generation,
+ * editing, and manual input. It uses domain logic from utils/ but returns
+ * ActionResult objects suitable for TUI/Web/API consumption.
+ */
+import { StateManager } from '../../shared/StateManager.js';
+import { LogService } from '../../services/LogService.js';
+/**
+ * Generate commit message with timeout and error handling
+ * Returns null if it fails, so caller can fall back to manual input
+ */
+export async function generateCommitMessageSafe(repoPath, timeoutMs = 15000) {
+    try {
+        const { generateCommitMessage } = await import('../../utils/aiMerge.js');
+        // Race between generation and timeout
+        const result = await Promise.race([
+            generateCommitMessage(repoPath),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('Timeout')), timeoutMs)),
+        ]);
+        if (!result) {
+            StateManager.getInstance().setDebugMessage('[AI] Commit message generation returned null');
+            LogService.getInstance().warn('AI commit message generation returned null', 'aiMerge');
+        }
+        return result;
+    }
+    catch (error) {
+        const errorMsg = `AI commit message generation error: ${error}`;
+        StateManager.getInstance().setDebugMessage(`[AI] ${errorMsg}`);
+        LogService.getInstance().error(errorMsg, 'aiMerge', undefined, error instanceof Error ? error : undefined);
+        return null;
+    }
+}
+/**
+ * Prompt for commit message with optional AI generation
+ * @param repoPath - Path to repository
+ * @param mode - 'ai_automatic' | 'ai_editable' | 'manual'
+ * @param onCommit - Callback to execute after commit message is obtained
+ * @returns ActionResult prompting for commit message
+ */
+export async function promptForCommitMessage(repoPath, mode, onCommit) {
+    const { stageAllChanges } = await import('../../utils/mergeValidation.js');
+    const { getComprehensiveDiff } = await import('../../utils/aiMerge.js');
+    // Stage all changes first
+    const stageResult = stageAllChanges(repoPath);
+    if (!stageResult.success) {
+        return {
+            type: 'error',
+            message: `Failed to stage changes: ${stageResult.error}`,
+            dismissable: true
+        };
+    }
+    // Handle manual mode (no AI)
+    if (mode === 'manual') {
+        return {
+            type: 'input',
+            title: 'Enter Commit Message',
+            message: 'Write a commit message for the changes:',
+            placeholder: 'feat: add new feature',
+            onSubmit: async (message) => {
+                if (!message || !message.trim()) {
+                    return { type: 'error', message: 'Commit message cannot be empty', dismissable: true };
+                }
+                return onCommit(message.trim());
+            },
+            dismissable: true,
+        };
+    }
+    // AI modes - generate message
+    const { diff, summary } = getComprehensiveDiff(repoPath);
+    StateManager.getInstance().setDebugMessage('[AI] Generating commit message...');
+    const generatedMessage = await generateCommitMessageSafe(repoPath);
+    if (generatedMessage) {
+        StateManager.getInstance().setDebugMessage(`[AI] Generated message: ${generatedMessage.split('\n')[0]}`);
+    }
+    // If AI generation failed, fall back to manual with explanation
+    if (!generatedMessage) {
+        StateManager.getInstance().setDebugMessage('[AI] Generation failed, falling back to manual input');
+        return {
+            type: 'input',
+            title: 'Enter Commit Message',
+            message: `⚠️ Auto-generation failed or timed out. Please write a commit message manually.\n\nFiles changed:\n${summary}`,
+            placeholder: 'feat: add new feature',
+            onSubmit: async (message) => {
+                if (!message || !message.trim()) {
+                    return { type: 'error', message: 'Commit message cannot be empty', dismissable: true };
+                }
+                return onCommit(message.trim());
+            },
+            dismissable: true,
+        };
+    }
+    // AI automatic mode - commit immediately
+    if (mode === 'ai_automatic') {
+        return onCommit(generatedMessage);
+    }
+    // AI editable mode - let user review and edit
+    return {
+        type: 'input',
+        title: 'Review & Edit Commit Message',
+        message: `Files changed:\n${summary}\n\nGenerated message (edit as needed):`,
+        placeholder: 'feat: add new feature',
+        defaultValue: generatedMessage,
+        onSubmit: async (message) => {
+            if (!message || !message.trim()) {
+                return { type: 'error', message: 'Commit message cannot be empty', dismissable: true };
+            }
+            return onCommit(message.trim());
+        },
+        dismissable: true,
+    };
+}
+/**
+ * Handle commit with the given options (automatic/editable/manual)
+ * This DRYs up the common pattern of presenting commit options and executing
+ */
+export async function handleCommitWithOptions(repoPath, optionId, onSuccess) {
+    const { commitChanges } = await import('../../utils/mergeValidation.js');
+    const mode = optionId === 'commit_automatic' ? 'ai_automatic' :
+        optionId === 'commit_ai_editable' ? 'ai_editable' :
+            'manual';
+    return promptForCommitMessage(repoPath, mode, async (message) => {
+        const result = commitChanges(repoPath, message);
+        if (!result.success) {
+            return { type: 'error', message: `Commit failed: ${result.error}`, dismissable: true };
+        }
+        return onSuccess();
+    });
+}
+//# sourceMappingURL=commitMessageHandler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"commitMessageHandler.js","sourceRoot":"","sources":["../../../src/actions/merge/commitMessageHandler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,QAAgB,EAChB,YAAoB,KAAK;IAEzB,IAAI,CAAC;QACH,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAEzE,sCAAsC;QACtC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAChC,qBAAqB,CAAC,QAAQ,CAAC;YAC/B,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAC9B,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAC1D;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,YAAY,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,8CAA8C,CAAC,CAAC;YAC3F,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,4CAA4C,EAAE,SAAS,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAG,uCAAuC,KAAK,EAAE,CAAC;QAChE,YAAY,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,QAAQ,QAAQ,EAAE,CAAC,CAAC;QAC/D,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC3G,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,IAA+C,EAC/C,QAAoD;IAEpD,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC;IAC3E,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAExE,0BAA0B;IAC1B,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,4BAA4B,WAAW,CAAC,KAAK,EAAE;YACxD,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,6BAA6B;IAC7B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EAAE,yCAAyC;YAClD,WAAW,EAAE,uBAAuB;YACpC,QAAQ,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;gBAClC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;oBAChC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gCAAgC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;gBACzF,CAAC;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;YACD,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,8BAA8B;IAC9B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACzD,YAAY,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,mCAAmC,CAAC,CAAC;IAChF,MAAM,gBAAgB,GAAG,MAAM,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAEnE,IAAI,gBAAgB,EAAE,CAAC;QACrB,YAAY,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,2BAA2B,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED,gEAAgE;IAChE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,YAAY,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,sDAAsD,CAAC,CAAC;QACnG,OAAO;YACL,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EAAE,sGAAsG,OAAO,EAAE;YACxH,WAAW,EAAE,uBAAuB;YACpC,QAAQ,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;gBAClC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;oBAChC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gCAAgC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;gBACzF,CAAC;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;YACD,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAED,8CAA8C;IAC9C,OAAO;QACL,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,8BAA8B;QACrC,OAAO,EAAE,mBAAmB,OAAO,yCAAyC;QAC5E,WAAW,EAAE,uBAAuB;QACpC,YAAY,EAAE,gBAAgB;QAC9B,QAAQ,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;YAClC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBAChC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gCAAgC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;YACzF,CAAC;YACD,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,WAAW,EAAE,IAAI;KAClB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,QAAgB,EAChB,QAAqE,EACrE,SAAsC;IAEtC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC;IAEzE,MAAM,IAAI,GACR,QAAQ,KAAK,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAClD,QAAQ,KAAK,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YACnD,QAAQ,CAAC;IAEX,OAAO,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;QACtE,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACzF,CAAC;QACD,OAAO,SAAS,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC"}

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

@@ -0,0 +1,13 @@
+/**
+ * Conflict Resolution - UI logic for conflict resolution workflows
+ *
+ * This module handles ActionResult flows for creating conflict resolution panes
+ * with AI agents to help resolve merge conflicts.
+ */
+import type { ActionResult, ActionContext } from '../types.js';
+import type { DmuxPane } from '../../types.js';
+/**
+ * Create a new pane for AI-assisted conflict resolution
+ */
+export declare function createConflictResolutionPaneForMerge(pane: DmuxPane, context: ActionContext, targetBranch: string, targetRepoPath: string): Promise<ActionResult>;
+//# sourceMappingURL=conflictResolution.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"conflictResolution.d.ts","sourceRoot":"","sources":["../../../src/actions/merge/conflictResolution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C;;GAEG;AACH,wBAAsB,oCAAoC,CACxD,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,YAAY,CAAC,CAiDvB"}

package/dist/actions/merge/conflictResolution.js

@@ -0,0 +1,134 @@
+/**
+ * Conflict Resolution - UI logic for conflict resolution workflows
+ *
+ * This module handles ActionResult flows for creating conflict resolution panes
+ * with AI agents to help resolve merge conflicts.
+ */
+import { TmuxService } from '../../services/TmuxService.js';
+/**
+ * Create a new pane for AI-assisted conflict resolution
+ */
+export async function createConflictResolutionPaneForMerge(pane, context, targetBranch, targetRepoPath) {
+    // First, check which agents are available
+    const { findClaudeCommand, findOpencodeCommand } = await import('../../utils/agentDetection.js');
+    const availableAgents = [];
+    if (await findClaudeCommand())
+        availableAgents.push('claude');
+    if (await findOpencodeCommand())
+        availableAgents.push('opencode');
+    if (availableAgents.length === 0) {
+        return {
+            type: 'error',
+            message: 'No AI agents available. Please install claude or opencode.',
+            dismissable: true,
+        };
+    }
+    // If multiple agents available, ask user to choose
+    if (availableAgents.length > 1) {
+        return {
+            type: 'choice',
+            title: 'Choose AI Agent for Conflict Resolution',
+            message: 'Which agent would you like to use to resolve merge conflicts?',
+            options: availableAgents.map(agent => ({
+                id: agent,
+                label: agent === 'claude' ? 'Claude Code' : 'OpenCode',
+                description: agent === 'claude' ? 'Anthropic Claude' : 'Open-source alternative',
+                default: agent === 'claude',
+            })),
+            onSelect: async (agentId) => {
+                return createAndLaunchConflictPane(pane, context, targetBranch, targetRepoPath, agentId);
+            },
+            dismissable: true,
+        };
+    }
+    // Only one agent available, use it directly
+    return createAndLaunchConflictPane(pane, context, targetBranch, targetRepoPath, availableAgents[0]);
+}
+/**
+ * Actually create and launch the conflict resolution pane
+ */
+async function createAndLaunchConflictPane(pane, context, targetBranch, targetRepoPath, agent) {
+    try {
+        const { createConflictResolutionPane } = await import('../../utils/conflictResolutionPane.js');
+        // Create the new pane
+        // NOTE: We pass the WORKTREE path as targetRepoPath because that's where
+        // the conflicts exist and need to be resolved (not in main repo)
+        const conflictPane = await createConflictResolutionPane({
+            sourceBranch: pane.slug,
+            targetBranch,
+            targetRepoPath: pane.worktreePath, // CRITICAL: Use worktree, not main repo
+            agent,
+            projectName: context.projectName,
+            existingPanes: context.panes,
+        });
+        // Add the new pane to the panes list
+        const updatedPanes = [...context.panes, conflictPane];
+        await context.savePanes(updatedPanes);
+        // Notify about the new pane
+        if (context.onPaneUpdate) {
+            context.onPaneUpdate(conflictPane);
+        }
+        // Start monitoring for conflict resolution completion
+        const { startConflictMonitoring } = await import('../../utils/conflictMonitor.js');
+        startConflictMonitoring({
+            conflictPaneId: conflictPane.paneId,
+            repoPath: pane.worktreePath, // Monitor the WORKTREE, not main repo
+            onResolved: async () => {
+                // Conflicts resolved! Close the conflict pane and trigger cleanup
+                try {
+                    console.error(`[conflictResolution] Conflicts resolved for ${pane.slug}, cleaning up conflict pane ${conflictPane.id}`);
+                    const tmuxService = TmuxService.getInstance();
+                    // Kill the conflict pane first
+                    console.error(`[conflictResolution] Killing conflict pane ${conflictPane.paneId}`);
+                    await tmuxService.killPane(conflictPane.paneId);
+                    // CRITICAL: Read FRESH panes from StateManager, not stale context.panes
+                    // The conflict pane was added to state earlier, and StateManager has the latest list
+                    const { StateManager } = await import('../../shared/StateManager.js');
+                    const stateManager = StateManager.getInstance();
+                    const currentPanes = stateManager.getPanes();
+                    console.error(`[conflictResolution] Current panes: ${currentPanes.map(p => p.id).join(', ')}`);
+                    // Remove conflict pane from state
+                    const panesWithoutConflictPane = currentPanes.filter((p) => p.id !== conflictPane.id);
+                    console.error(`[conflictResolution] Removing conflict pane ${conflictPane.id}, remaining: ${panesWithoutConflictPane.map(p => p.id).join(', ')}`);
+                    await context.savePanes(panesWithoutConflictPane);
+                    // Now trigger the cleanup flow for the original pane
+                    // We need to execute the merge completion flow
+                    const { executeMerge } = await import('../merge/mergeExecution.js');
+                    // Create updated context with current pane list (without conflict pane)
+                    const updatedContext = {
+                        ...context,
+                        panes: panesWithoutConflictPane,
+                    };
+                    // Re-run executeMerge which will now succeed (conflicts are resolved)
+                    // This will return the cleanup confirmation dialog
+                    // IMPORTANT: Pass skipWorktreeMerge=true because agent already resolved conflicts
+                    console.error(`[conflictResolution] Executing merge for original pane ${pane.id} (${pane.slug})`);
+                    const result = await executeMerge(pane, updatedContext, targetBranch, targetRepoPath, true);
+                    // If we have the onActionResult callback, use it to show the dialog
+                    if (context.onActionResult) {
+                        console.error(`[conflictResolution] Showing merge result dialog to user`);
+                        await context.onActionResult(result);
+                    }
+                }
+                catch (error) {
+                    console.error('[conflictResolution] Error in onResolved:', error);
+                }
+            },
+        });
+        return {
+            type: 'navigation',
+            title: 'Conflict Resolution Pane Created',
+            message: `Created pane "${conflictPane.slug}" with ${agent} to help resolve conflicts. Switch to it to see the AI working.`,
+            targetPaneId: conflictPane.id,
+            dismissable: true,
+        };
+    }
+    catch (error) {
+        return {
+            type: 'error',
+            message: `Failed to create conflict resolution pane: ${error instanceof Error ? error.message : String(error)}`,
+            dismissable: true,
+        };
+    }
+}
+//# sourceMappingURL=conflictResolution.js.map

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

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

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

@@ -0,0 +1,11 @@
+/**
+ * Issue Handlers - Barrel export
+ */
+export { handleNothingToMerge } from './nothingToMergeHandler.js';
+export { handleMainDirty } from './mainDirtyHandler.js';
+export type { MainDirtyIssue } from './mainDirtyHandler.js';
+export { handleWorktreeUncommitted } from './worktreeUncommittedHandler.js';
+export type { WorktreeUncommittedIssue } from './worktreeUncommittedHandler.js';
+export { handleMergeConflict } from './mergeConflictHandler.js';
+export type { MergeConflictIssue } from './mergeConflictHandler.js';
+//# sourceMappingURL=index.d.ts.map