dmux 2.2.1 → 3.0.1

package/dist/utils/mergeExecution.js

@@ -0,0 +1,192 @@
+/**
+ * Merge Execution Utilities
+ *
+ * Handles the actual merge operations with proper error handling
+ */
+import { execSync } from 'child_process';
+/**
+ * Merge main branch into worktree branch
+ * This is step 1 of the two-phase merge: get latest changes from main
+ */
+export function mergeMainIntoWorktree(worktreePath, mainBranch) {
+    try {
+        execSync(`git merge ${mainBranch} --no-edit`, {
+            cwd: worktreePath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        // Check if it's a merge conflict
+        if (errorMessage.includes('CONFLICT') || errorMessage.includes('conflict')) {
+            // Get list of conflicting files
+            const conflictFiles = getConflictingFiles(worktreePath);
+            return {
+                success: false,
+                error: 'Merge conflicts detected',
+                conflictFiles,
+                needsManualResolution: true,
+            };
+        }
+        return {
+            success: false,
+            error: errorMessage,
+        };
+    }
+}
+/**
+ * Merge worktree branch into main (should be clean after resolving conflicts)
+ * This is step 2 of the two-phase merge: bring changes back to main
+ */
+export function mergeWorktreeIntoMain(mainRepoPath, worktreeBranch) {
+    try {
+        execSync(`git merge ${worktreeBranch} --no-edit`, {
+            cwd: mainRepoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        // This shouldn't have conflicts if we properly merged main into worktree first
+        if (errorMessage.includes('CONFLICT') || errorMessage.includes('conflict')) {
+            const conflictFiles = getConflictingFiles(mainRepoPath);
+            return {
+                success: false,
+                error: 'Unexpected merge conflicts in main',
+                conflictFiles,
+                needsManualResolution: true,
+            };
+        }
+        return {
+            success: false,
+            error: errorMessage,
+        };
+    }
+}
+/**
+ * Get list of files with merge conflicts
+ */
+export function getConflictingFiles(repoPath) {
+    try {
+        const output = execSync('git diff --name-only --diff-filter=U', {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return output
+            .trim()
+            .split('\n')
+            .filter(line => line.trim());
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Abort an in-progress merge
+ */
+export function abortMerge(repoPath) {
+    try {
+        execSync('git merge --abort', {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+/**
+ * Check if repository is in a merge state
+ */
+export function isInMergeState(repoPath) {
+    try {
+        const output = execSync('git status', {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return output.includes('You have unmerged paths') ||
+            output.includes('All conflicts fixed but you are still merging');
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Complete a merge after conflicts are resolved
+ */
+export function completeMerge(repoPath, message) {
+    try {
+        // Check if all conflicts are resolved
+        const conflictFiles = getConflictingFiles(repoPath);
+        if (conflictFiles.length > 0) {
+            return {
+                success: false,
+                error: 'Not all conflicts have been resolved',
+                conflictFiles,
+                needsManualResolution: true,
+            };
+        }
+        // Complete the merge
+        const commitMsg = message || 'Merge branch with resolved conflicts';
+        execSync(`git commit -m "${commitMsg.replace(/"/g, '\\"')}"`, {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+/**
+ * Clean up worktree and branch after successful merge
+ */
+export function cleanupAfterMerge(mainRepoPath, worktreePath, branchName) {
+    try {
+        // Remove worktree
+        execSync(`git worktree remove "${worktreePath}" --force`, {
+            cwd: mainRepoPath,
+            stdio: 'pipe',
+        });
+        // Delete branch (use -d for safety, it will fail if not merged)
+        execSync(`git branch -d ${branchName}`, {
+            cwd: mainRepoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+/**
+ * Get merge status summary for user display
+ */
+export function getMergeStatus(repoPath) {
+    try {
+        const output = execSync('git status --short', {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return output.trim();
+    }
+    catch {
+        return '';
+    }
+}
+//# sourceMappingURL=mergeExecution.js.map

package/dist/utils/mergeExecution.js.map

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

package/dist/utils/mergeValidation.d.ts

@@ -0,0 +1,67 @@
+/**
+ * Merge Validation Utilities
+ *
+ * Provides comprehensive pre-merge validation to detect issues before attempting merge
+ */
+export interface MergeValidationResult {
+    canMerge: boolean;
+    issues: MergeIssue[];
+    mainBranch: string;
+    worktreeBranch: string;
+}
+export interface MergeIssue {
+    type: 'main_dirty' | 'worktree_uncommitted' | 'merge_conflict' | 'nothing_to_merge';
+    message: string;
+    files?: string[];
+    canAutoResolve: boolean;
+}
+export interface GitStatus {
+    hasChanges: boolean;
+    files: string[];
+    summary: string;
+}
+/**
+ * Get git status for a repository
+ */
+export declare function getGitStatus(repoPath: string): GitStatus;
+/**
+ * Get current branch name
+ */
+export declare function getCurrentBranch(repoPath: string): string;
+/**
+ * Check if there are any commits to merge
+ */
+export declare function hasCommitsToMerge(repoPath: string, fromBranch: string, toBranch: string): boolean;
+/**
+ * Detect potential merge conflicts without actually merging
+ */
+export declare function detectMergeConflicts(repoPath: string, sourceBranch: string, targetBranch: string): {
+    hasConflicts: boolean;
+    conflictFiles: string[];
+};
+/**
+ * Comprehensive pre-merge validation
+ */
+export declare function validateMerge(mainRepoPath: string, worktreePath: string, worktreeBranch: string): MergeValidationResult;
+/**
+ * Stage all uncommitted changes
+ */
+export declare function stageAllChanges(repoPath: string): {
+    success: boolean;
+    error?: string;
+};
+/**
+ * Commit staged changes with a message
+ */
+export declare function commitChanges(repoPath: string, message: string): {
+    success: boolean;
+    error?: string;
+};
+/**
+ * Stash uncommitted changes
+ */
+export declare function stashChanges(repoPath: string): {
+    success: boolean;
+    error?: string;
+};
+//# sourceMappingURL=mergeValidation.d.ts.map

package/dist/utils/mergeValidation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeValidation.d.ts","sourceRoot":"","sources":["../../src/utils/mergeValidation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,GAAG,sBAAsB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;IACpF,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CA0BxD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAUzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWjG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CAwCpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,qBAAqB,CA4DvB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CActF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CActC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAanF"}

package/dist/utils/mergeValidation.js

@@ -0,0 +1,213 @@
+/**
+ * Merge Validation Utilities
+ *
+ * Provides comprehensive pre-merge validation to detect issues before attempting merge
+ */
+import { execSync } from 'child_process';
+/**
+ * Get git status for a repository
+ */
+export function getGitStatus(repoPath) {
+    try {
+        const statusOutput = execSync('git status --porcelain', {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        const files = statusOutput
+            .trim()
+            .split('\n')
+            .filter(line => line.trim())
+            .map(line => line.substring(3)); // Remove status prefix (e.g., "M ", "A ", etc.)
+        return {
+            hasChanges: files.length > 0,
+            files,
+            summary: statusOutput.trim(),
+        };
+    }
+    catch (error) {
+        return {
+            hasChanges: false,
+            files: [],
+            summary: '',
+        };
+    }
+}
+/**
+ * Get current branch name
+ */
+export function getCurrentBranch(repoPath) {
+    try {
+        return execSync('git branch --show-current', {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        }).trim();
+    }
+    catch {
+        return 'main';
+    }
+}
+/**
+ * Check if there are any commits to merge
+ */
+export function hasCommitsToMerge(repoPath, fromBranch, toBranch) {
+    try {
+        const output = execSync(`git log ${toBranch}..${fromBranch} --oneline`, {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return output.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Detect potential merge conflicts without actually merging
+ */
+export function detectMergeConflicts(repoPath, sourceBranch, targetBranch) {
+    try {
+        // Use git merge-tree to simulate merge without touching working directory
+        const output = execSync(`git merge-tree $(git merge-base ${targetBranch} ${sourceBranch}) ${targetBranch} ${sourceBranch}`, {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        // Check for conflict markers in output
+        const hasConflicts = output.includes('<<<<<<<') || output.includes('>>>>>>>');
+        // Extract conflicting files (lines that contain conflict markers)
+        const conflictFiles = [];
+        if (hasConflicts) {
+            const lines = output.split('\n');
+            for (let i = 0; i < lines.length; i++) {
+                if (lines[i].startsWith('+<<<<<<<')) {
+                    // Try to find filename in nearby lines
+                    for (let j = Math.max(0, i - 10); j < i; j++) {
+                        if (lines[j].startsWith('diff --git')) {
+                            const match = lines[j].match(/b\/(.+)$/);
+                            if (match) {
+                                conflictFiles.push(match[1]);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return { hasConflicts, conflictFiles };
+    }
+    catch (error) {
+        // If git merge-tree fails, assume there might be conflicts
+        return { hasConflicts: true, conflictFiles: [] };
+    }
+}
+/**
+ * Comprehensive pre-merge validation
+ */
+export function validateMerge(mainRepoPath, worktreePath, worktreeBranch) {
+    const issues = [];
+    // Get current main branch
+    const mainBranch = getCurrentBranch(mainRepoPath);
+    // Check if main branch is clean
+    const mainStatus = getGitStatus(mainRepoPath);
+    if (mainStatus.hasChanges) {
+        issues.push({
+            type: 'main_dirty',
+            message: `Main branch (${mainBranch}) has uncommitted changes`,
+            files: mainStatus.files,
+            canAutoResolve: true, // Can offer to commit or stash
+        });
+    }
+    // Check if worktree has uncommitted changes
+    const worktreeStatus = getGitStatus(worktreePath);
+    if (worktreeStatus.hasChanges) {
+        issues.push({
+            type: 'worktree_uncommitted',
+            message: `Worktree has uncommitted changes`,
+            files: worktreeStatus.files,
+            canAutoResolve: true, // Can offer to commit with AI message
+        });
+    }
+    // Check if there's anything to merge (commits OR uncommitted changes)
+    const hasCommits = hasCommitsToMerge(mainRepoPath, worktreeBranch, mainBranch);
+    if (!hasCommits && !worktreeStatus.hasChanges) {
+        issues.push({
+            type: 'nothing_to_merge',
+            message: 'No new commits to merge',
+            canAutoResolve: false,
+        });
+    }
+    // Detect potential merge conflicts
+    const { hasConflicts, conflictFiles } = detectMergeConflicts(mainRepoPath, worktreeBranch, mainBranch);
+    if (hasConflicts) {
+        issues.push({
+            type: 'merge_conflict',
+            message: 'Merge conflicts detected',
+            files: conflictFiles.length > 0 ? conflictFiles : ['(conflict detection incomplete)'],
+            canAutoResolve: true, // Can offer AI-assisted merge
+        });
+    }
+    return {
+        canMerge: issues.length === 0,
+        issues,
+        mainBranch,
+        worktreeBranch,
+    };
+}
+/**
+ * Stage all uncommitted changes
+ */
+export function stageAllChanges(repoPath) {
+    try {
+        execSync('git add -A', {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+/**
+ * Commit staged changes with a message
+ */
+export function commitChanges(repoPath, message) {
+    try {
+        execSync(`git commit -m "${message.replace(/"/g, '\\"')}"`, {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+/**
+ * Stash uncommitted changes
+ */
+export function stashChanges(repoPath) {
+    try {
+        execSync('git stash push -u -m "dmux: auto-stash before merge"', {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+//# sourceMappingURL=mergeValidation.js.map

package/dist/utils/mergeValidation.js.map

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

package/dist/utils/paneCreation.d.ts

@@ -0,0 +1,17 @@
+import type { DmuxPane } from '../types.js';
+export interface CreatePaneOptions {
+    prompt: string;
+    agent?: 'claude' | 'opencode';
+    projectName: string;
+    existingPanes: DmuxPane[];
+}
+export interface CreatePaneResult {
+    pane: DmuxPane;
+    needsAgentChoice: boolean;
+}
+/**
+ * Core pane creation logic that can be used by both TUI and API
+ * Returns the newly created pane and whether agent choice is needed
+ */
+export declare function createPane(options: CreatePaneOptions, availableAgents: Array<'claude' | 'opencode'>): Promise<CreatePaneResult>;
+//# sourceMappingURL=paneCreation.d.ts.map

package/dist/utils/paneCreation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"paneCreation.d.ts","sourceRoot":"","sources":["../../src/utils/paneCreation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,eAAe,EAAE,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC,GAC5C,OAAO,CAAC,gBAAgB,CAAC,CA4K3B"}