dmux 3.0.2 → 3.1.1

package/dist/DmuxApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DmuxApp.d.ts","sourceRoot":"","sources":["../src/DmuxApp.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AA8BnD,OAAO,KAAK,EAA2C,YAAY,EAAE,MAAM,YAAY,CAAC;AAmBxF,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAkyCnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"DmuxApp.d.ts","sourceRoot":"","sources":["../src/DmuxApp.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAgCnD,OAAO,KAAK,EAA2C,YAAY,EAAE,MAAM,YAAY,CAAC;AAqBxF,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CA4gDnC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/dist/DmuxApp.js

@@ -19,9 +19,11 @@ import { applySmartLayout } from './utils/tmux.js';
 import { suggestCommand } from './utils/commands.js';
 import { generateSlug } from './utils/slug.js';
 import { getMainBranch } from './utils/git.js';
+import { capturePaneContent } from './utils/paneCapture.js';
 import { StateManager } from './shared/StateManager.js';
 import { getStatusDetector } from './services/StatusDetector.js';
 import { PaneAction, getAvailableActions } from './actions/index.js';
+import { SettingsManager, SETTING_DEFINITIONS } from './utils/settingsManager.js';
 const require = createRequire(import.meta.url);
 const packageJson = require('../package.json');
 import PanesGrid from './components/PanesGrid.js';
@@ -40,7 +42,9 @@ import ActionChoiceDialog from './components/ActionChoiceDialog.js';
 import ActionConfirmDialog from './components/ActionConfirmDialog.js';
 import ActionInputDialog from './components/ActionInputDialog.js';
 import ActionProgressDialog from './components/ActionProgressDialog.js';
-const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdater, serverPort, server }) => {
+import SettingsDialog from './components/SettingsDialog.js';
+import HooksDialog from './components/HooksDialog.js';
+const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, projectRoot, autoUpdater, serverPort, server }) => {
     /* panes state moved to usePanes */
     const [selectedIndex, setSelectedIndex] = useState(0);
     const [showNewPaneDialog, setShowNewPaneDialog] = useState(false);
@@ -50,9 +54,23 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
     const [showQRCode, setShowQRCode] = useState(false);
     const [tunnelUrl, setTunnelUrl] = useState(null);
     const [isCreatingTunnel, setIsCreatingTunnel] = useState(false);
+    // Settings state
+    const [settingsManager] = useState(() => new SettingsManager(projectRoot));
+    const [showSettingsDialog, setShowSettingsDialog] = useState(false);
+    const [settingsMode, setSettingsMode] = useState('list');
+    const [settingsSelectedIndex, setSettingsSelectedIndex] = useState(0);
+    const [settingsEditingKey, setSettingsEditingKey] = useState();
+    const [settingsEditingValueIndex, setSettingsEditingValueIndex] = useState(0);
+    const [settingsScopeIndex, setSettingsScopeIndex] = useState(0);
     // Force repaint trigger - incrementing this causes Ink to re-render
     const [forceRepaintTrigger, setForceRepaintTrigger] = useState(0);
+    // Spinner state - shows for a few frames to force render
+    const [showRepaintSpinner, setShowRepaintSpinner] = useState(false);
     const { projectSettings, saveSettings } = useProjectSettings(settingsFile);
+    // Hooks management state
+    const [showHooksDialog, setShowHooksDialog] = useState(false);
+    const [hooksSelectedIndex, setHooksSelectedIndex] = useState(0);
+    const [hooksData, setHooksData] = useState([]);
     const [showCommandPrompt, setShowCommandPrompt] = useState(null);
     const [commandInput, setCommandInput] = useState('');
     const [showFileCopyPrompt, setShowFileCopyPrompt] = useState(false);
@@ -63,6 +81,8 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
     const [kebabMenuPaneIndex, setKebabMenuPaneIndex] = useState(null);
     const [kebabMenuOption, setKebabMenuOption] = useState(0);
     const [kebabMenuActions, setKebabMenuActions] = useState([]);
+    // Debug message state - for temporary logging messages
+    const [debugMessage, setDebugMessage] = useState('');
     // Update state handled by hook
     const { updateInfo, showUpdateDialog, isUpdating, performUpdate, skipUpdate, dismissUpdate, updateAvailable } = useAutoUpdater(autoUpdater, setStatusMessage);
     const { exit } = useApp();
@@ -104,8 +124,13 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
         setStatusMessage,
         setRunningCommand,
     });
-    // Force repaint helper
-    const forceRepaint = () => setForceRepaintTrigger(prev => prev + 1);
+    // Force repaint helper - shows spinner for a few frames to force full re-render
+    const forceRepaint = () => {
+        setForceRepaintTrigger(prev => prev + 1);
+        setShowRepaintSpinner(true);
+        // Hide spinner after a few frames (enough to trigger multiple renders)
+        setTimeout(() => setShowRepaintSpinner(false), 100);
+    };
     // Force repaint effect - ensures Ink re-renders when trigger changes
     useEffect(() => {
         if (forceRepaintTrigger > 0) {
@@ -120,7 +145,7 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
         }
     }, [forceRepaintTrigger]);
     // Pane creation
-    const { openInEditor: openEditor2, createNewPane: createNewPaneHook } = usePaneCreation({
+    const { createNewPane: createNewPaneHook } = usePaneCreation({
         panes,
         savePanes,
         projectName,
@@ -204,6 +229,14 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
         const stateManager = StateManager.getInstance();
         stateManager.updateSettings(projectSettings);
     }, [projectSettings]);
+    // Expose debug message setter via StateManager
+    useEffect(() => {
+        const stateManager = StateManager.getInstance();
+        stateManager.setDebugMessageCallback(setDebugMessage);
+        return () => {
+            stateManager.setDebugMessageCallback(undefined);
+        };
+    }, []);
     // Load panes and settings on mount and refresh periodically
     useEffect(() => {
         // SIGTERM should quit immediately (for process management)
@@ -211,6 +244,11 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
             cleanExit();
         };
         process.on('SIGTERM', handleTermination);
+        // Test debug message on mount
+        StateManager.getInstance().setDebugMessage('Debug logging initialized - watching for AI activity...');
+        setTimeout(() => {
+            StateManager.getInstance().setDebugMessage('');
+        }, 3000);
         return () => {
             process.removeListener('SIGTERM', handleTermination);
         };
@@ -432,8 +470,7 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                     await new Promise(resolve => setTimeout(resolve, checkInterval));
                     try {
                         // Capture the pane content
-                        const paneContent = execSync(`tmux capture-pane -t '${paneInfo}' -p -S -30`, // Capture last 30 lines
-                        { encoding: 'utf-8', stdio: 'pipe' });
+                        const paneContent = capturePaneContent(paneInfo, 30);
                         if (i % 10 === 0) { // Log every 10 checks (every second)
                         }
                         // Check if content has stabilized (same for 3 checks = prompt is waiting)
@@ -477,7 +514,7 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                                 // Wait and check if prompt is gone
                                 await new Promise(resolve => setTimeout(resolve, 500));
                                 // Verify the prompt is gone
-                                const updatedContent = execSync(`tmux capture-pane -t '${paneInfo}' -p -S -10`, { encoding: 'utf-8', stdio: 'pipe' });
+                                const updatedContent = capturePaneContent(paneInfo, 10);
                                 // If trust prompt is gone, check if we need to resend the Claude command
                                 const promptGone = !trustPromptPatterns.some(p => p.test(updatedContent));
                                 if (promptGone) {
@@ -551,6 +588,8 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                 // Ignore if already set or fails
             }
             execSync(`tmux select-pane -t '${paneId}'`, { stdio: 'pipe' });
+            // Clear screen after jump to remove artifacts
+            clearScreen();
             setStatusMessage('Jumped to pane');
             setTimeout(() => setStatusMessage(''), 2000);
         }
@@ -634,6 +673,9 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
     // Update handling moved to useAutoUpdater
     // Helper function to clear screen artifacts
     const clearScreen = () => {
+        // CRITICAL: Force Ink to re-render FIRST, before clearing
+        // This prevents blank screen by ensuring React starts rendering immediately
+        setForceRepaintTrigger(prev => prev + 1);
         // Multiple clearing strategies to prevent artifacts
         // 1. Clear screen with ANSI codes
         process.stdout.write('\x1b[2J\x1b[H');
@@ -647,12 +689,6 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
             execSync('tmux refresh-client', { stdio: 'pipe' });
         }
         catch { }
-        // 4. Force Ink to repaint after clearing with a delay
-        // This prevents the blank screen bug by ensuring Ink re-renders
-        // after the terminal has processed the clear operations
-        setTimeout(() => {
-            setForceRepaintTrigger(prev => prev + 1);
-        }, 200);
     };
     // Cleanup function for exit
     const cleanExit = () => {
@@ -710,7 +746,6 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                 setKebabMenuPaneIndex(null);
                 setKebabMenuOption(0);
                 setKebabMenuActions([]);
-                clearScreen();
                 return;
             }
             else if (key.upArrow) {
@@ -724,7 +759,6 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
             else if (key.return) {
                 // Execute the selected menu action
                 setShowKebabMenu(false);
-                clearScreen();
                 const selectedAction = availableActions[kebabMenuOption];
                 if (selectedAction) {
                     // Use the action system to execute
@@ -753,6 +787,173 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
             }
             return;
         }
+        // Handle hooks dialog
+        if (showHooksDialog) {
+            if (key.escape) {
+                setShowHooksDialog(false);
+                setHooksSelectedIndex(0);
+                // Go back to settings dialog
+                setShowSettingsDialog(true);
+                setSettingsMode('list');
+                return;
+            }
+            else if (key.upArrow) {
+                setHooksSelectedIndex(Math.max(0, hooksSelectedIndex - 1));
+                return;
+            }
+            else if (key.downArrow) {
+                setHooksSelectedIndex(Math.min(hooksData.length - 1, hooksSelectedIndex + 1));
+                return;
+            }
+            else if (input === 'e') {
+                // Edit hooks using an agent
+                setShowHooksDialog(false);
+                setHooksSelectedIndex(0);
+                const prompt = "I would like to edit my dmux hooks in .dmux-hooks, please read the instructions in there and ask me what I want to edit";
+                setPendingPrompt(prompt);
+                setNewPanePrompt(prompt);
+                // Choose agent
+                const agents = availableAgents;
+                if (agents.length === 0) {
+                    createNewPaneHook(prompt);
+                }
+                else if (agents.length === 1) {
+                    createNewPaneHook(prompt, agents[0]);
+                }
+                else {
+                    setShowAgentChoiceDialog(true);
+                    setAgentChoice(agentChoice || 'claude');
+                }
+                return;
+            }
+            return;
+        }
+        // Handle settings dialog
+        if (showSettingsDialog) {
+            if (key.escape) {
+                if (settingsMode === 'list') {
+                    // Close settings dialog
+                    setShowSettingsDialog(false);
+                    setSettingsMode('list');
+                    setSettingsSelectedIndex(0);
+                    setSettingsEditingKey(undefined);
+                }
+                else {
+                    // Go back to list
+                    setSettingsMode('list');
+                    setSettingsEditingKey(undefined);
+                    setSettingsEditingValueIndex(0);
+                    setSettingsScopeIndex(0);
+                }
+                return;
+            }
+            else if (key.upArrow) {
+                if (settingsMode === 'list') {
+                    setSettingsSelectedIndex(Math.max(0, settingsSelectedIndex - 1));
+                }
+                else if (settingsMode === 'edit') {
+                    const currentDef = SETTING_DEFINITIONS[settingsSelectedIndex];
+                    const maxIndex = currentDef.type === 'boolean' ? 1 : (currentDef.options?.length || 1) - 1;
+                    setSettingsEditingValueIndex(Math.max(0, settingsEditingValueIndex - 1));
+                }
+                else if (settingsMode === 'scope') {
+                    setSettingsScopeIndex(Math.max(0, settingsScopeIndex - 1));
+                }
+                return;
+            }
+            else if (key.downArrow) {
+                if (settingsMode === 'list') {
+                    setSettingsSelectedIndex(Math.min(SETTING_DEFINITIONS.length - 1, settingsSelectedIndex + 1));
+                }
+                else if (settingsMode === 'edit') {
+                    const currentDef = SETTING_DEFINITIONS[settingsSelectedIndex];
+                    const maxIndex = currentDef.type === 'boolean' ? 1 : (currentDef.options?.length || 1) - 1;
+                    setSettingsEditingValueIndex(Math.min(maxIndex, settingsEditingValueIndex + 1));
+                }
+                else if (settingsMode === 'scope') {
+                    setSettingsScopeIndex(Math.min(1, settingsScopeIndex + 1));
+                }
+                return;
+            }
+            else if (key.return) {
+                if (settingsMode === 'list') {
+                    const currentDef = SETTING_DEFINITIONS[settingsSelectedIndex];
+                    // Handle action type - trigger the action instead of editing
+                    if (currentDef.type === 'action') {
+                        if (currentDef.key === 'hooks') {
+                            // Show hooks dialog
+                            setShowSettingsDialog(false);
+                            const { hasHook } = await import('./utils/hooks.js');
+                            const allHookTypes = [
+                                'before_pane_create',
+                                'pane_created',
+                                'worktree_created',
+                                'before_pane_close',
+                                'pane_closed',
+                                'before_worktree_remove',
+                                'worktree_removed',
+                                'pre_merge',
+                                'post_merge',
+                                'run_test',
+                                'run_dev',
+                            ];
+                            const hooks = allHookTypes.map(hookName => ({
+                                name: hookName,
+                                active: hasHook(projectRoot || process.cwd(), hookName)
+                            }));
+                            setHooksData(hooks);
+                            setShowHooksDialog(true);
+                            setHooksSelectedIndex(0);
+                        }
+                        return;
+                    }
+                    // Enter edit mode for regular settings
+                    setSettingsEditingKey(currentDef.key);
+                    setSettingsMode('edit');
+                    // Set initial value index based on current setting
+                    const currentValue = settingsManager.getSetting(currentDef.key);
+                    if (currentDef.type === 'boolean') {
+                        setSettingsEditingValueIndex(currentValue ? 0 : 1);
+                    }
+                    else if (currentDef.type === 'select' && currentDef.options) {
+                        const optIndex = currentDef.options.findIndex(o => o.value === currentValue);
+                        setSettingsEditingValueIndex(Math.max(0, optIndex));
+                    }
+                }
+                else if (settingsMode === 'edit') {
+                    // Go to scope selection
+                    setSettingsMode('scope');
+                    setSettingsScopeIndex(0);
+                }
+                else if (settingsMode === 'scope') {
+                    // Save the setting
+                    const currentDef = SETTING_DEFINITIONS[settingsSelectedIndex];
+                    const scope = settingsScopeIndex === 0 ? 'global' : 'project';
+                    // Only save if this is not an action type (actions don't have values)
+                    if (currentDef.type !== 'action') {
+                        // Calculate the new value
+                        let newValue;
+                        if (currentDef.type === 'boolean') {
+                            newValue = settingsEditingValueIndex === 0;
+                        }
+                        else if (currentDef.type === 'select' && currentDef.options) {
+                            newValue = currentDef.options[settingsEditingValueIndex]?.value || '';
+                        }
+                        // Update the setting - cast key to proper type since we know it's not an action
+                        settingsManager.updateSetting(currentDef.key, newValue, scope);
+                    }
+                    // Reset to list view
+                    setSettingsMode('list');
+                    setSettingsEditingKey(undefined);
+                    setSettingsEditingValueIndex(0);
+                    setSettingsScopeIndex(0);
+                    setStatusMessage(`Setting saved (${scope})`);
+                    setTimeout(() => setStatusMessage(''), 2000);
+                }
+                return;
+            }
+            return;
+        }
         // Handle action system confirm dialog
         if (actionSystem.actionState.showConfirmDialog) {
             if (key.escape) {
@@ -911,7 +1112,7 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                 const promptValue = pendingPrompt;
                 setShowAgentChoiceDialog(false);
                 setPendingPrompt('');
-                await createNewPane(promptValue, chosen);
+                await createNewPaneHook(promptValue, chosen);
                 setNewPanePrompt('');
             }
             return;
@@ -964,10 +1165,6 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                 setShowNewPaneDialog(false);
                 setNewPanePrompt('');
             }
-            else if (key.ctrl && input === 'o') {
-                // Open in external editor
-                openEditor2(newPanePrompt, setNewPanePrompt);
-            }
             // TextInput handles other input events
             return;
         }
@@ -1000,6 +1197,12 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
             setKebabMenuPaneIndex(selectedIndex);
             setKebabMenuOption(0);
         }
+        else if (input === 's') {
+            // Open settings dialog
+            setShowSettingsDialog(true);
+            setSettingsMode('list');
+            setSettingsSelectedIndex(0);
+        }
         else if (input === 'q') {
             cleanExit();
         }
@@ -1035,14 +1238,20 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
         }
         else if (input === 'j' && selectedIndex < panes.length) {
             // Jump to pane (NEW: using action system)
+            StateManager.getInstance().setDebugMessage(`Jumping to pane: ${panes[selectedIndex].slug}`);
+            setTimeout(() => StateManager.getInstance().setDebugMessage(''), 2000);
             actionSystem.executeAction(PaneAction.VIEW, panes[selectedIndex]);
         }
         else if (input === 'x' && selectedIndex < panes.length) {
             // Close pane (NEW: using action system)
+            StateManager.getInstance().setDebugMessage(`Closing pane: ${panes[selectedIndex].slug}`);
+            setTimeout(() => StateManager.getInstance().setDebugMessage(''), 2000);
             actionSystem.executeAction(PaneAction.CLOSE, panes[selectedIndex]);
         }
         else if (key.return && selectedIndex < panes.length) {
             // Jump to pane (NEW: using action system)
+            StateManager.getInstance().setDebugMessage(`Jumping to pane: ${panes[selectedIndex].slug}`);
+            setTimeout(() => StateManager.getInstance().setDebugMessage(''), 2000);
             actionSystem.executeAction(PaneAction.VIEW, panes[selectedIndex]);
         }
     });
@@ -1056,6 +1265,8 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                 React.createElement(Text, { dimColor: true }, "Press ESC to return to pane list"))));
     }
     return (React.createElement(Box, { flexDirection: "column" },
+        showRepaintSpinner && (React.createElement(Box, { marginTop: -10, marginLeft: -100 },
+            React.createElement(Text, null, "\u27F3"))),
         React.createElement(PanesGrid, { panes: panes, selectedIndex: selectedIndex, isLoading: isLoading, showNewPaneDialog: showNewPaneDialog, agentStatuses: agentStatuses, kebabMenuPaneIndex: kebabMenuPaneIndex ?? undefined }),
         isLoading && (React.createElement(LoadingIndicator, null)),
         showNewPaneDialog && !showAgentChoiceDialog && (React.createElement(NewPaneDialog, { value: newPanePrompt, onChange: setNewPanePrompt, onSubmit: (value) => {
@@ -1084,6 +1295,8 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
         showCommandPrompt && (React.createElement(CommandPromptDialog, { type: showCommandPrompt, value: commandInput, onChange: setCommandInput })),
         showFileCopyPrompt && (React.createElement(FileCopyPrompt, null)),
         showKebabMenu && kebabMenuPaneIndex !== null && panes[kebabMenuPaneIndex] && (React.createElement(KebabMenu, { selectedOption: kebabMenuOption, actions: kebabMenuActions, paneName: panes[kebabMenuPaneIndex].slug })),
+        showSettingsDialog && (React.createElement(SettingsDialog, { settings: settingsManager.getSettings(), globalSettings: settingsManager.getGlobalSettings(), projectSettings: settingsManager.getProjectSettings(), settingDefinitions: SETTING_DEFINITIONS, selectedIndex: settingsSelectedIndex, mode: settingsMode, editingKey: settingsEditingKey, editingValueIndex: settingsEditingValueIndex, scopeIndex: settingsScopeIndex })),
+        showHooksDialog && (React.createElement(HooksDialog, { hooks: hooksData, selectedIndex: hooksSelectedIndex })),
         actionSystem.actionState.showConfirmDialog && (React.createElement(ActionConfirmDialog, { key: "confirm-dialog", title: actionSystem.actionState.confirmTitle, message: actionSystem.actionState.confirmMessage, yesLabel: actionSystem.actionState.confirmYesLabel, noLabel: actionSystem.actionState.confirmNoLabel, selectedIndex: actionSystem.actionState.confirmSelectedIndex })),
         actionSystem.actionState.showChoiceDialog && (React.createElement(ActionChoiceDialog, { key: "choice-dialog", title: actionSystem.actionState.choiceTitle, message: actionSystem.actionState.choiceMessage, options: actionSystem.actionState.choiceOptions, selectedIndex: actionSystem.actionState.choiceSelectedIndex })),
         actionSystem.actionState.showInputDialog && (React.createElement(ActionInputDialog, { key: "input-dialog", title: actionSystem.actionState.inputTitle, message: actionSystem.actionState.inputMessage, placeholder: actionSystem.actionState.inputPlaceholder, value: actionSystem.actionState.inputValue, onValueChange: (value) => {
@@ -1111,11 +1324,17 @@ const DmuxApp = ({ panesFile, projectName, sessionName, settingsFile, autoUpdate
                 return `Grid: ${cols} cols × ${rows} rows | Selected: row ${pos.row}, col ${pos.col} | Terminal: ${terminalWidth}w`;
             })() }),
         React.createElement(Text, { dimColor: true },
+            updateAvailable && updateInfo && (React.createElement(Text, { color: "red", bold: true }, "Update available: npm i -g dmux@latest ")),
             "v",
             packageJson.version,
-            updateAvailable && updateInfo && (React.createElement(Text, { color: "yellow" },
-                " \u2022 Update available: ",
-                updateInfo.latestVersion)))));
+            serverPort && serverPort > 0 && (React.createElement(Text, { dimColor: true },
+                " \u2022 ",
+                React.createElement(Text, { color: "cyan" },
+                    "http://127.0.0.1:",
+                    serverPort))),
+            debugMessage && (React.createElement(Text, { dimColor: true },
+                " \u2022 ",
+                debugMessage)))));
 };
 export default DmuxApp;
 //# sourceMappingURL=DmuxApp.js.map