dmux 3.5.0 → 3.5.2

package/dist/utils/reopenWorktree.js

@@ -0,0 +1,121 @@
+import path from 'path';
+import * as fs from 'fs';
+import { TmuxService } from '../services/TmuxService.js';
+import { setupSidebarLayout, getTerminalDimensions, splitPane, } from './tmux.js';
+import { SIDEBAR_WIDTH, recalculateAndApplyLayout } from './layoutManager.js';
+import { atomicWriteJsonSync } from './atomicWrite.js';
+/**
+ * Reopens a closed worktree by creating a new pane in the existing worktree
+ * and running `claude --continue` to resume the previous session
+ */
+export async function reopenWorktree(options) {
+    const { slug, worktreePath, projectRoot, existingPanes } = options;
+    const tmuxService = TmuxService.getInstance();
+    const originalPaneId = tmuxService.getCurrentPaneIdSync();
+    // Load config to get control pane info
+    const configPath = path.join(projectRoot, '.dmux', 'dmux.config.json');
+    let controlPaneId;
+    try {
+        const configContent = fs.readFileSync(configPath, 'utf-8');
+        const config = JSON.parse(configContent);
+        controlPaneId = config.controlPaneId;
+        // Verify the control pane ID from config still exists
+        if (controlPaneId) {
+            const exists = await tmuxService.paneExists(controlPaneId);
+            if (!exists) {
+                controlPaneId = originalPaneId;
+                config.controlPaneId = controlPaneId;
+                config.controlPaneSize = SIDEBAR_WIDTH;
+                config.lastUpdated = new Date().toISOString();
+                atomicWriteJsonSync(configPath, config);
+            }
+        }
+        if (!controlPaneId) {
+            controlPaneId = originalPaneId;
+            config.controlPaneId = controlPaneId;
+            config.controlPaneSize = SIDEBAR_WIDTH;
+            config.lastUpdated = new Date().toISOString();
+            atomicWriteJsonSync(configPath, config);
+        }
+    }
+    catch {
+        controlPaneId = originalPaneId;
+    }
+    // Enable pane borders to show titles
+    try {
+        tmuxService.setGlobalOptionSync('pane-border-status', 'top');
+    }
+    catch {
+        // Ignore if already set or fails
+    }
+    // Determine if this is the first content pane
+    const isFirstContentPane = existingPanes.length === 0;
+    let paneInfo;
+    if (isFirstContentPane) {
+        paneInfo = setupSidebarLayout(controlPaneId);
+        await new Promise((resolve) => setTimeout(resolve, 300));
+    }
+    else {
+        // Subsequent panes - always split horizontally
+        const dmuxPaneIds = existingPanes.map(p => p.paneId);
+        const targetPane = dmuxPaneIds[dmuxPaneIds.length - 1];
+        paneInfo = splitPane({ targetPane });
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+    // Set pane title
+    try {
+        await tmuxService.setPaneTitle(paneInfo, slug);
+    }
+    catch {
+        // Ignore if setting title fails
+    }
+    // Apply optimal layout
+    if (controlPaneId) {
+        const dimensions = getTerminalDimensions();
+        const allContentPaneIds = [...existingPanes.map(p => p.paneId), paneInfo];
+        await recalculateAndApplyLayout(controlPaneId, allContentPaneIds, dimensions.width, dimensions.height);
+        await tmuxService.refreshClient();
+    }
+    // CD into the worktree
+    await tmuxService.sendShellCommand(paneInfo, `cd "${worktreePath}"`);
+    await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
+    // Wait for CD to complete
+    await new Promise((resolve) => setTimeout(resolve, 300));
+    // Run claude --continue to resume the session
+    const claudeCmd = 'claude --continue --permission-mode=acceptEdits';
+    await tmuxService.sendShellCommand(paneInfo, claudeCmd);
+    await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
+    // Keep focus on the new pane
+    await tmuxService.selectPane(paneInfo);
+    // Create the pane object
+    const newPane = {
+        id: `dmux-${Date.now()}`,
+        slug,
+        prompt: '(Reopened session)',
+        paneId: paneInfo,
+        worktreePath,
+        agent: 'claude',
+        autopilot: false,
+    };
+    // Handle welcome pane destruction if first content pane
+    if (isFirstContentPane) {
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf-8');
+            const config = JSON.parse(configContent);
+            config.panes = [...existingPanes, newPane];
+            config.lastUpdated = new Date().toISOString();
+            atomicWriteJsonSync(configPath, config);
+            const { destroyWelcomePaneCoordinated } = await import('./welcomePaneManager.js');
+            destroyWelcomePaneCoordinated(projectRoot);
+        }
+        catch {
+            // Log but don't fail
+        }
+    }
+    // Switch back to the original pane
+    await tmuxService.selectPane(originalPaneId);
+    return {
+        pane: newPane,
+    };
+}
+//# sourceMappingURL=reopenWorktree.js.map

package/dist/utils/reopenWorktree.js.map

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

package/package.json

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