dmux 3.4.3 → 3.5.1

package/dist/utils/worktreeDiscovery.js

@@ -0,0 +1,241 @@
+/**
+ * Worktree Discovery Utilities
+ *
+ * Scans a directory for nested git worktrees (including the root).
+ * Used for multi-merge to find sub-worktrees created by hooks.
+ */
+import { execSync } from 'child_process';
+import { readdirSync, statSync, existsSync } from 'fs';
+import { join, basename, relative } from 'path';
+import { getCurrentBranch } from './git.js';
+/**
+ * Detect all git worktrees within a directory (recursively)
+ *
+ * @param rootWorktreePath - The root worktree path (dmux pane's worktree)
+ * @returns Array of WorktreeInfo objects, ordered by depth (deepest first, root last)
+ */
+export function detectAllWorktrees(rootWorktreePath) {
+    const worktrees = [];
+    // Add the root worktree first
+    const rootInfo = getWorktreeInfo(rootWorktreePath, rootWorktreePath, true);
+    if (rootInfo) {
+        worktrees.push(rootInfo);
+    }
+    // Recursively scan for sub-worktrees
+    scanForWorktrees(rootWorktreePath, rootWorktreePath, worktrees, 1);
+    // Sort by depth descending (deepest first, root last)
+    // This ensures sub-worktrees are merged before their parents
+    worktrees.sort((a, b) => b.depth - a.depth);
+    return worktrees;
+}
+/**
+ * Recursively scan a directory for git worktrees
+ */
+function scanForWorktrees(dirPath, rootWorktreePath, worktrees, depth) {
+    try {
+        const entries = readdirSync(dirPath, { withFileTypes: true });
+        for (const entry of entries) {
+            // Skip hidden directories (except we need to check for .git)
+            if (entry.name.startsWith('.') && entry.name !== '.git') {
+                continue;
+            }
+            // Skip node_modules and other common large directories
+            if (entry.name === 'node_modules' || entry.name === 'vendor' || entry.name === '.pnpm') {
+                continue;
+            }
+            const fullPath = join(dirPath, entry.name);
+            if (entry.isDirectory()) {
+                // Check if this directory is a worktree (has .git file, not directory)
+                const gitPath = join(fullPath, '.git');
+                if (existsSync(gitPath)) {
+                    const gitStat = statSync(gitPath);
+                    if (gitStat.isFile()) {
+                        // This is a worktree (has .git file pointing to parent)
+                        const worktreeInfo = getWorktreeInfo(fullPath, rootWorktreePath, false, depth);
+                        if (worktreeInfo) {
+                            worktrees.push(worktreeInfo);
+                        }
+                        // Continue scanning inside this worktree for nested worktrees
+                        scanForWorktrees(fullPath, rootWorktreePath, worktrees, depth + 1);
+                    }
+                    else if (gitStat.isDirectory()) {
+                        // This is a full git repository, not a worktree
+                        // It could still contain worktrees inside it, but we skip the repo itself
+                        // (it's not a worktree of another repo)
+                        scanForWorktrees(fullPath, rootWorktreePath, worktrees, depth + 1);
+                    }
+                }
+                else {
+                    // Regular directory, continue scanning
+                    scanForWorktrees(fullPath, rootWorktreePath, worktrees, depth);
+                }
+            }
+        }
+    }
+    catch (error) {
+        // Permission denied or other errors - skip this directory
+        console.error(`[worktreeDiscovery] Error scanning ${dirPath}: ${error}`);
+    }
+}
+/**
+ * Get detailed information about a worktree
+ */
+function getWorktreeInfo(worktreePath, rootWorktreePath, isRoot, depth = 0) {
+    try {
+        // Get the parent repo path using git rev-parse
+        const parentRepoPath = getWorktreeParentPath(worktreePath);
+        if (!parentRepoPath) {
+            console.error(`[worktreeDiscovery] Could not determine parent for ${worktreePath}`);
+            return null;
+        }
+        // Get repo name from parent path
+        const repoName = getRepoName(parentRepoPath);
+        // Get current branch in worktree
+        const branch = getCurrentBranch(worktreePath);
+        // Get main branch in parent repo
+        const mainBranch = getMainBranchForRepo(parentRepoPath);
+        // Calculate relative path from root
+        const relativePath = isRoot ? '.' : relative(rootWorktreePath, worktreePath);
+        return {
+            worktreePath,
+            parentRepoPath,
+            repoName,
+            branch,
+            mainBranch,
+            isRoot,
+            relativePath,
+            depth,
+        };
+    }
+    catch (error) {
+        console.error(`[worktreeDiscovery] Error getting info for ${worktreePath}: ${error}`);
+        return null;
+    }
+}
+/**
+ * Get the parent repository path for a worktree
+ *
+ * Uses: git rev-parse --path-format=absolute --git-common-dir
+ * Then removes ".git" suffix to get repo root
+ */
+export function getWorktreeParentPath(worktreePath) {
+    try {
+        // Get the common git directory (the parent repo's .git or .git/worktrees/...)
+        const gitCommonDir = execSync('git rev-parse --path-format=absolute --git-common-dir', {
+            cwd: worktreePath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        }).trim();
+        // The git-common-dir returns the .git directory path
+        // Remove the ".git" suffix to get the repo root
+        // Handle both "/path/to/repo/.git" and "/path/to/repo/.git/worktrees/name"
+        let parentPath = gitCommonDir;
+        // If it ends with .git, remove it
+        if (parentPath.endsWith('.git')) {
+            parentPath = parentPath.slice(0, -4); // Remove ".git"
+            if (parentPath.endsWith('/')) {
+                parentPath = parentPath.slice(0, -1); // Remove trailing slash
+            }
+        }
+        else if (parentPath.includes('/.git/')) {
+            // It's a path like /repo/.git/worktrees/name, extract the repo path
+            parentPath = parentPath.split('/.git/')[0];
+        }
+        // Verify by getting the toplevel
+        const topLevel = execSync('git rev-parse --path-format=absolute --show-toplevel', {
+            cwd: parentPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        }).trim();
+        return topLevel;
+    }
+    catch (error) {
+        console.error(`[worktreeDiscovery] Error getting parent path for ${worktreePath}: ${error}`);
+        return null;
+    }
+}
+/**
+ * Get repository name from path (directory name)
+ */
+export function getRepoName(repoPath) {
+    return basename(repoPath);
+}
+/**
+ * Get main branch for a specific repo (running git commands in that repo's context)
+ */
+function getMainBranchForRepo(repoPath) {
+    try {
+        // First try to get the default branch from origin
+        const originHead = execSync('git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null', {
+            cwd: repoPath,
+            encoding: 'utf8',
+            stdio: 'pipe',
+        }).trim();
+        if (originHead) {
+            const match = originHead.match(/refs\/remotes\/origin\/(.+)/);
+            if (match) {
+                return match[1];
+            }
+        }
+    }
+    catch {
+        // Fallback if origin/HEAD is not set
+    }
+    try {
+        // Check if 'main' branch exists
+        execSync('git show-ref --verify --quiet refs/heads/main', {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return 'main';
+    }
+    catch {
+        // main doesn't exist
+    }
+    try {
+        // Check if 'master' branch exists
+        execSync('git show-ref --verify --quiet refs/heads/master', {
+            cwd: repoPath,
+            stdio: 'pipe',
+        });
+        return 'master';
+    }
+    catch {
+        // master doesn't exist
+    }
+    return 'main'; // Default fallback
+}
+/**
+ * Check if a directory is a git worktree (has .git file, not directory)
+ */
+export function isGitWorktree(dirPath) {
+    const gitPath = join(dirPath, '.git');
+    if (!existsSync(gitPath)) {
+        return false;
+    }
+    const stat = statSync(gitPath);
+    return stat.isFile();
+}
+/**
+ * Check if a directory is a git repository root (has .git directory)
+ */
+export function isGitRepository(dirPath) {
+    const gitPath = join(dirPath, '.git');
+    if (!existsSync(gitPath)) {
+        return false;
+    }
+    const stat = statSync(gitPath);
+    return stat.isDirectory();
+}
+/**
+ * Generate a display label for a worktree
+ * Format: "repo-name (branch)" or "repo-name (branch) - relative/path"
+ */
+export function getWorktreeDisplayLabel(worktree) {
+    const baseLabel = `${worktree.repoName} (${worktree.branch})`;
+    if (worktree.isRoot || worktree.relativePath === '.') {
+        return baseLabel;
+    }
+    return `${baseLabel} - ${worktree.relativePath}`;
+}
+//# sourceMappingURL=worktreeDiscovery.js.map

package/dist/utils/worktreeDiscovery.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dmux",
-  "version": "3.4.3",
+  "version": "3.5.1",
   "description": "Tmux pane manager with AI agent integration for parallel development workflows",
   "type": "module",
   "author": "Justin Schroeder",