dmux 3.3.1 → 3.5.0

package/dist/actions/merge/multiMergeOrchestrator.js

@@ -0,0 +1,452 @@
+/**
+ * Multi-Merge Orchestrator
+ *
+ * Coordinates merging multiple worktrees in sequence with proper
+ * dialog handling and error recovery.
+ */
+import { getWorktreeDisplayLabel } from '../../utils/worktreeDiscovery.js';
+/**
+ * Build the merge queue from detected worktrees
+ * - Runs validation on each worktree
+ * - Filters to only those with changes to merge
+ * - Already sorted by depth (deepest first from detectAllWorktrees)
+ */
+export async function buildMergeQueue(worktrees) {
+    const { validateMerge } = await import('../../utils/mergeValidation.js');
+    const queue = [];
+    for (const worktree of worktrees) {
+        const validation = validateMerge(worktree.parentRepoPath, worktree.worktreePath, worktree.branch);
+        // Include if there's something to merge (has issues that can be resolved, or can merge)
+        // Exclude only if the ONLY issue is 'nothing_to_merge'
+        const hasNothingToMerge = validation.issues.some(i => i.type === 'nothing_to_merge');
+        const hasOnlyNothingToMerge = validation.issues.length === 1 && hasNothingToMerge;
+        if (!hasOnlyNothingToMerge) {
+            queue.push({
+                worktree,
+                validation,
+                status: 'pending',
+            });
+        }
+    }
+    return queue;
+}
+/**
+ * Execute multi-merge with sequential dialogs
+ * Returns ActionResult that chains through each merge
+ */
+export async function executeMultiMerge(pane, context, queue) {
+    // Start with confirmation dialog
+    return showMultiMergeConfirmation(pane, context, queue);
+}
+/**
+ * Show initial confirmation dialog listing all worktrees to merge
+ */
+function showMultiMergeConfirmation(pane, context, queue) {
+    const worktreeList = queue
+        .map((item, idx) => {
+        const label = getWorktreeDisplayLabel(item.worktree);
+        const issues = item.validation.issues
+            .filter(i => i.type !== 'nothing_to_merge')
+            .map(i => i.type.replace(/_/g, ' '))
+            .join(', ');
+        return ` ${idx + 1}. ${label}${issues ? ` [${issues}]` : ''}`;
+    })
+        .join('\n');
+    return {
+        type: 'confirm',
+        title: 'Multi-Repository Merge',
+        message: `Merge ${queue.length} repositor${queue.length === 1 ? 'y' : 'ies'}?\n\n${worktreeList}`,
+        confirmLabel: 'Start Merge',
+        cancelLabel: 'Cancel',
+        onConfirm: async () => {
+            // Initialize result tracking
+            const result = {
+                totalWorktrees: queue.length,
+                successful: 0,
+                failed: 0,
+                skipped: 0,
+                results: [],
+            };
+            // Start processing the queue
+            return processNextInQueue(pane, context, queue, 0, result);
+        },
+        onCancel: async () => {
+            return {
+                type: 'info',
+                message: 'Multi-merge cancelled',
+                dismissable: true,
+            };
+        },
+    };
+}
+/**
+ * Process the next item in the merge queue
+ */
+async function processNextInQueue(pane, context, queue, currentIndex, result) {
+    // Check if we're done
+    if (currentIndex >= queue.length) {
+        return showMultiMergeSummary(pane, context, result);
+    }
+    const item = queue[currentIndex];
+    const worktreeLabel = getWorktreeDisplayLabel(item.worktree);
+    // Show progress
+    console.error(`[multiMerge] Processing ${currentIndex + 1}/${queue.length}: ${worktreeLabel}`);
+    // Update status
+    item.status = 'in_progress';
+    // Execute the merge for this worktree
+    return executeSingleWorktreeMerge(pane, context, item, currentIndex, queue.length, async (success, error) => {
+        // Record result
+        if (success) {
+            item.status = 'completed';
+            result.successful++;
+            result.results.push({
+                worktree: item.worktree,
+                status: 'completed',
+            });
+        }
+        else if (error === 'skipped') {
+            item.status = 'skipped';
+            result.skipped++;
+            result.results.push({
+                worktree: item.worktree,
+                status: 'skipped',
+            });
+        }
+        else {
+            item.status = 'failed';
+            item.error = error;
+            result.failed++;
+            result.results.push({
+                worktree: item.worktree,
+                status: 'failed',
+                error,
+            });
+        }
+        // Process next item
+        return processNextInQueue(pane, context, queue, currentIndex + 1, result);
+    });
+}
+/**
+ * Execute merge for a single worktree in the queue
+ */
+async function executeSingleWorktreeMerge(pane, context, item, currentIndex, totalCount, onComplete) {
+    const { validation, worktree } = item;
+    const worktreeLabel = getWorktreeDisplayLabel(worktree);
+    const progressPrefix = `[${currentIndex + 1}/${totalCount}] ${worktreeLabel}`;
+    // Handle issues first (same as single merge flow)
+    if (!validation.canMerge) {
+        return handleWorktreeMergeIssues(pane, context, item, progressPrefix, onComplete);
+    }
+    // No issues - show confirmation for this worktree
+    return {
+        type: 'confirm',
+        title: progressPrefix,
+        message: `Merge "${worktree.branch}" into ${validation.mainBranch}?`,
+        confirmLabel: 'Merge',
+        cancelLabel: 'Skip',
+        onConfirm: async () => {
+            return performWorktreeMerge(pane, context, item, progressPrefix, onComplete);
+        },
+        onCancel: async () => {
+            // Skip this worktree, continue with others
+            return onComplete(false, 'skipped');
+        },
+    };
+}
+/**
+ * Handle merge issues for a single worktree in multi-merge context
+ */
+async function handleWorktreeMergeIssues(pane, context, item, progressPrefix, onComplete) {
+    const { validation, worktree } = item;
+    const { issues, mainBranch } = validation;
+    // Create retry function for this specific worktree
+    const retryMerge = async () => {
+        // Re-validate
+        const { validateMerge } = await import('../../utils/mergeValidation.js');
+        item.validation = validateMerge(worktree.parentRepoPath, worktree.worktreePath, worktree.branch);
+        if (item.validation.canMerge) {
+            return performWorktreeMerge(pane, context, item, progressPrefix, onComplete);
+        }
+        else {
+            return handleWorktreeMergeIssues(pane, context, item, progressPrefix, onComplete);
+        }
+    };
+    // Check for nothing to merge
+    const nothingToMerge = issues.find(i => i.type === 'nothing_to_merge');
+    if (nothingToMerge) {
+        return onComplete(false, 'skipped');
+    }
+    // Check for main dirty
+    const mainDirty = issues.find(i => i.type === 'main_dirty');
+    if (mainDirty) {
+        return handleMainDirtyForWorktree(item, progressPrefix, mainBranch, retryMerge, onComplete);
+    }
+    // Check for worktree uncommitted
+    const worktreeUncommitted = issues.find(i => i.type === 'worktree_uncommitted');
+    if (worktreeUncommitted) {
+        return handleUncommittedForWorktree(item, progressPrefix, retryMerge, onComplete);
+    }
+    // Check for merge conflict
+    const mergeConflict = issues.find(i => i.type === 'merge_conflict');
+    if (mergeConflict) {
+        return handleConflictForWorktree(pane, context, item, progressPrefix, mainBranch, onComplete);
+    }
+    // Unknown issue - skip with error
+    return onComplete(false, issues.map(i => i.message).join('; '));
+}
+/**
+ * Handle main branch dirty for a worktree in multi-merge
+ */
+async function handleMainDirtyForWorktree(item, progressPrefix, mainBranch, retryMerge, onComplete) {
+    const { worktree, validation } = item;
+    const issue = validation.issues.find(i => i.type === 'main_dirty');
+    const files = issue.files || [];
+    return {
+        type: 'choice',
+        title: `${progressPrefix}: Main Branch Has Changes`,
+        message: `${mainBranch} in ${worktree.repoName} has uncommitted changes:\n${files.slice(0, 3).map(f => ` • ${f}`).join('\n')}${files.length > 3 ? '\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, edit before commit',
+            },
+            {
+                id: 'commit_manual',
+                label: 'Manual commit message',
+                description: 'Write your own commit message',
+            },
+            {
+                id: 'skip',
+                label: 'Skip this repo',
+                description: 'Continue with other repositories',
+            },
+        ],
+        onSelect: async (optionId) => {
+            if (optionId === 'skip') {
+                return onComplete(false, 'skipped');
+            }
+            if (optionId === 'commit_automatic' ||
+                optionId === 'commit_ai_editable' ||
+                optionId === 'commit_manual') {
+                const { handleCommitWithOptions } = await import('./commitMessageHandler.js');
+                return handleCommitWithOptions(worktree.parentRepoPath, optionId, retryMerge);
+            }
+            return onComplete(false, 'Unknown option');
+        },
+        dismissable: false,
+    };
+}
+/**
+ * Handle uncommitted changes in worktree for multi-merge
+ */
+async function handleUncommittedForWorktree(item, progressPrefix, retryMerge, onComplete) {
+    const { worktree, validation } = item;
+    const issue = validation.issues.find(i => i.type === 'worktree_uncommitted');
+    const files = issue.files || [];
+    return {
+        type: 'choice',
+        title: `${progressPrefix}: Uncommitted Changes`,
+        message: `${worktree.repoName} worktree has uncommitted changes:\n${files.slice(0, 3).map(f => ` • ${f}`).join('\n')}${files.length > 3 ? '\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, edit before commit',
+            },
+            {
+                id: 'commit_manual',
+                label: 'Manual commit message',
+                description: 'Write your own commit message',
+            },
+            {
+                id: 'skip',
+                label: 'Skip this repo',
+                description: 'Continue with other repositories',
+            },
+        ],
+        onSelect: async (optionId) => {
+            if (optionId === 'skip') {
+                return onComplete(false, 'skipped');
+            }
+            if (optionId === 'commit_automatic' ||
+                optionId === 'commit_ai_editable' ||
+                optionId === 'commit_manual') {
+                const { handleCommitWithOptions } = await import('./commitMessageHandler.js');
+                return handleCommitWithOptions(worktree.worktreePath, optionId, retryMerge);
+            }
+            return onComplete(false, 'Unknown option');
+        },
+        dismissable: false,
+    };
+}
+/**
+ * Handle merge conflict for a worktree in multi-merge
+ */
+async function handleConflictForWorktree(pane, context, item, progressPrefix, mainBranch, onComplete) {
+    const { worktree, validation } = item;
+    const issue = validation.issues.find(i => i.type === 'merge_conflict');
+    const files = issue.files || [];
+    return {
+        type: 'choice',
+        title: `${progressPrefix}: Merge Conflicts`,
+        message: `Conflicts detected in ${worktree.repoName}:\n${files.slice(0, 3).map(f => ` • ${f}`).join('\n')}${files.length > 3 ? '\n  ...' : ''}`,
+        options: [
+            {
+                id: 'skip',
+                label: 'Skip this repo',
+                description: 'Resolve conflicts manually later',
+                default: true,
+            },
+            {
+                id: 'abort',
+                label: 'Stop multi-merge',
+                description: 'Abort remaining merges',
+            },
+        ],
+        onSelect: async (optionId) => {
+            if (optionId === 'skip') {
+                return onComplete(false, 'skipped');
+            }
+            if (optionId === 'abort') {
+                return {
+                    type: 'info',
+                    title: 'Multi-Merge Aborted',
+                    message: `Stopped at ${worktree.repoName} due to conflicts.`,
+                    dismissable: true,
+                };
+            }
+            return onComplete(false, 'Unknown option');
+        },
+        dismissable: false,
+    };
+}
+/**
+ * Actually perform the merge for a worktree
+ */
+async function performWorktreeMerge(pane, context, item, progressPrefix, onComplete) {
+    const { worktree, validation } = item;
+    const { mainBranch } = validation;
+    const { mergeMainIntoWorktree, mergeWorktreeIntoMain } = await import('../../utils/mergeExecution.js');
+    const { triggerHook } = await import('../../utils/hooks.js');
+    // Trigger pre_merge hook
+    await triggerHook('pre_merge', worktree.parentRepoPath, pane, {
+        DMUX_TARGET_BRANCH: mainBranch,
+        DMUX_WORKTREE_PATH: worktree.worktreePath,
+        DMUX_REPO_NAME: worktree.repoName,
+    });
+    // Step 1: Merge main into worktree
+    const step1 = mergeMainIntoWorktree(worktree.worktreePath, mainBranch);
+    if (!step1.success) {
+        if (step1.needsManualResolution && step1.conflictFiles?.length) {
+            // Conflict occurred during merge
+            return {
+                type: 'choice',
+                title: `${progressPrefix}: Merge Conflict`,
+                message: `Conflict while merging ${mainBranch} into worktree:\n${step1.conflictFiles.slice(0, 3).map(f => ` • ${f}`).join('\n')}`,
+                options: [
+                    {
+                        id: 'skip',
+                        label: 'Skip this repo',
+                        description: 'Abort this merge, continue with others',
+                        default: true,
+                    },
+                    {
+                        id: 'abort_all',
+                        label: 'Stop multi-merge',
+                        description: 'Stop processing remaining repos',
+                    },
+                ],
+                onSelect: async (optionId) => {
+                    const { abortMerge } = await import('../../utils/mergeExecution.js');
+                    abortMerge(worktree.worktreePath);
+                    if (optionId === 'abort_all') {
+                        return {
+                            type: 'info',
+                            title: 'Multi-Merge Aborted',
+                            message: `Stopped due to conflicts in ${worktree.repoName}`,
+                            dismissable: true,
+                        };
+                    }
+                    return onComplete(false, 'skipped');
+                },
+                dismissable: false,
+            };
+        }
+        return onComplete(false, `Merge failed: ${step1.error}`);
+    }
+    // Step 2: Merge worktree into main
+    const step2 = mergeWorktreeIntoMain(worktree.parentRepoPath, worktree.branch);
+    if (!step2.success) {
+        return onComplete(false, `Failed to merge into ${mainBranch}: ${step2.error}`);
+    }
+    // Trigger post_merge hook
+    await triggerHook('post_merge', worktree.parentRepoPath, pane, {
+        DMUX_TARGET_BRANCH: mainBranch,
+        DMUX_WORKTREE_PATH: worktree.worktreePath,
+        DMUX_REPO_NAME: worktree.repoName,
+    });
+    console.error(`[multiMerge] Successfully merged ${worktree.repoName}`);
+    return onComplete(true);
+}
+/**
+ * Show final summary of multi-merge operation
+ */
+function showMultiMergeSummary(pane, context, result) {
+    const summaryLines = result.results.map(r => {
+        const label = getWorktreeDisplayLabel(r.worktree);
+        const icon = r.status === 'completed' ? '✓' : r.status === 'skipped' ? '○' : '✗';
+        const suffix = r.error && r.status === 'failed' ? ` (${r.error})` : '';
+        return ` ${icon} ${label}${suffix}`;
+    });
+    const message = [
+        `Completed: ${result.successful}`,
+        result.skipped > 0 ? `Skipped: ${result.skipped}` : null,
+        result.failed > 0 ? `Failed: ${result.failed}` : null,
+        '',
+        ...summaryLines,
+    ]
+        .filter(Boolean)
+        .join('\n');
+    // If all successful, offer to close pane
+    if (result.failed === 0 && result.successful > 0) {
+        return {
+            type: 'confirm',
+            title: 'Multi-Merge Complete',
+            message,
+            confirmLabel: 'Close Pane',
+            cancelLabel: 'Keep Open',
+            onConfirm: async () => {
+                const { closePane } = await import('../implementations/closeAction.js');
+                return closePane(pane, context);
+            },
+            onCancel: async () => {
+                return {
+                    type: 'success',
+                    message: 'Merges complete. Pane kept open.',
+                    dismissable: true,
+                };
+            },
+        };
+    }
+    // Some failures - just show info
+    return {
+        type: 'info',
+        title: result.failed > 0 ? 'Multi-Merge Partial' : 'Multi-Merge Complete',
+        message,
+        dismissable: true,
+    };
+}
+//# sourceMappingURL=multiMergeOrchestrator.js.map

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

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

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

@@ -0,0 +1,62 @@
+/**
+ * Multi-Merge Type Definitions
+ *
+ * Types for managing multiple worktree merges in a single operation.
+ */
+import type { MergeValidationResult } from '../../utils/mergeValidation.js';
+/**
+ * Information about a single worktree (either root or sub-worktree)
+ */
+export interface WorktreeInfo {
+    /** Absolute path to the worktree directory */
+    worktreePath: string;
+    /** Absolute path to the parent repo (where the worktree originated from) */
+    parentRepoPath: string;
+    /** Name of the repository (derived from parent repo's directory name) */
+    repoName: string;
+    /** Current branch in this worktree */
+    branch: string;
+    /** Main branch in parent repo (main, master, etc.) */
+    mainBranch: string;
+    /** Whether this is the root worktree (the dmux pane's worktree) */
+    isRoot: boolean;
+    /** Relative path from root worktree (for display), "." for root */
+    relativePath: string;
+    /** Depth level (0 = root, 1 = immediate child, etc.) */
+    depth: number;
+}
+/**
+ * A single item in the merge queue
+ */
+export interface MergeQueueItem {
+    worktree: WorktreeInfo;
+    validation: MergeValidationResult;
+    status: 'pending' | 'in_progress' | 'completed' | 'failed' | 'skipped';
+    error?: string;
+}
+/**
+ * Result of multi-merge operation
+ */
+export interface MultiMergeResult {
+    totalWorktrees: number;
+    successful: number;
+    failed: number;
+    skipped: number;
+    results: Array<{
+        worktree: WorktreeInfo;
+        status: 'completed' | 'failed' | 'skipped';
+        error?: string;
+    }>;
+}
+/**
+ * Options for executing a single worktree merge within a multi-merge context
+ */
+export interface SingleMergeOptions {
+    /** Skip the close pane prompt (for multi-merge where we close after all) */
+    skipClosePrompt?: boolean;
+    /** Callback when merge completes (success or failure) */
+    onComplete?: (success: boolean, error?: string) => Promise<void>;
+    /** Label to display for this worktree in dialogs */
+    worktreeLabel?: string;
+}
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/actions/merge/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;IAErB,4EAA4E;IAC5E,cAAc,EAAE,MAAM,CAAC;IAEvB,yEAAyE;IACzE,QAAQ,EAAE,MAAM,CAAC;IAEjB,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IAEf,sDAAsD;IACtD,UAAU,EAAE,MAAM,CAAC;IAEnB,mEAAmE;IACnE,MAAM,EAAE,OAAO,CAAC;IAEhB,mEAAmE;IACnE,YAAY,EAAE,MAAM,CAAC;IAErB,wDAAwD;IACxD,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,UAAU,EAAE,qBAAqB,CAAC;IAClC,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,CAAC;QACb,QAAQ,EAAE,YAAY,CAAC;QACvB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;QAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,4EAA4E;IAC5E,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,yDAAyD;IACzD,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}

package/dist/actions/merge/types.js

@@ -0,0 +1,7 @@
+/**
+ * Multi-Merge Type Definitions
+ *
+ * Types for managing multiple worktree merges in a single operation.
+ */
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/actions/merge/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}