claude-code-plus-plus 0.2.4 → 0.3.0

package/dist/sidebar/app.js

@@ -3,6 +3,7 @@
  * Sidebar Application
  *
  * Main sidebar class that handles state management, input handling, and rendering.
+ * Uses extracted managers for session, terminal, and pane operations.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -40,102 +41,28 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SidebarApp = void 0;
 const fs_1 = require("fs");
-const child_process_1 = require("child_process");
 const path_1 = require("path");
 const tmux = __importStar(require("../tmux"));
 const git_1 = require("../git");
 const input_1 = require("./input");
 const render_1 = require("./render");
-// Debug logging
+const constants_1 = require("../constants");
+const pane_orchestrator_1 = require("./pane-orchestrator");
+const sessionManager = __importStar(require("./session-manager"));
+const terminalManager = __importStar(require("./terminal-manager"));
+const logger_1 = require("../utils/logger");
+const errors_1 = require("../utils/errors");
+const validation_1 = require("../utils/validation");
+const commands_1 = require("./commands");
+// Create logger for sidebar
+const logger = new logger_1.Logger({
+    level: 'debug',
+    context: 'Sidebar',
+    filePath: constants_1.SIDEBAR_LOG_PATH,
+});
+// Debug logging helper (for backwards compatibility)
 function debugLog(...args) {
-    const msg = `[${new Date().toISOString()}] ${args.map(a => typeof a === 'object' ? JSON.stringify(a) : String(a)).join(' ')}\n`;
-    (0, fs_1.appendFileSync)('/tmp/claude-pp-sidebar.log', msg);
-}
-// ============================================================================
-// Constants
-// ============================================================================
-const SIDEBAR_WIDTH = 25;
-const DEFAULT_CLAUDE_CMD = 'claude --dangerously-skip-permissions';
-const TERMINAL_BAR_HEIGHT = 1;
-const CLAUDE_PANE_PERCENT = 70; // Claude pane gets 70%, terminal area gets 30%
-/**
- * Set up terminal bar resize enforcement (hook + mouse binding).
- * Uses a file-based script to avoid complex quoting issues.
- * Sets up both after-resize-pane hook AND MouseDragEnd1Border binding.
- */
-function setupTerminalBarResize(sessionName, claudePaneId, barPaneId, terminalBodyPaneId) {
-    const hookCmd = getTerminalBarResizeHook(claudePaneId, barPaneId, terminalBodyPaneId);
-    // Set up the after-resize-pane hook
-    tmux.setHook(sessionName, 'after-resize-pane', hookCmd);
-    // Also bind MouseDragEnd1Border to run the script when mouse drag ends
-    // This ensures the fix runs when user releases mouse after dragging border
-    const safeName = `${claudePaneId}-${barPaneId}`.replace(/%/g, '');
-    const scriptPath = `/tmp/cpp-resize-hook-${safeName}.sh`;
-    try {
-        (0, child_process_1.execSync)(`tmux bind-key -T root MouseDragEnd1Border run-shell "sh ${scriptPath}"`, { stdio: 'ignore' });
-    }
-    catch {
-        // Ignore errors
-    }
-}
-/**
- * Create a shell script for terminal bar resize hook and return the hook command.
- * Uses a file-based script to avoid complex quoting issues.
- */
-function getTerminalBarResizeHook(claudePaneId, barPaneId, terminalBodyPaneId) {
-    // Use pane IDs in filename to make it unique per terminal configuration
-    const safeName = `${claudePaneId}-${barPaneId}`.replace(/%/g, '');
-    const scriptPath = `/tmp/cpp-resize-hook-${safeName}.sh`;
-    // Write the script file
-    const scriptContent = `#!/bin/sh
-# Terminal bar resize hook - keeps bar at ${TERMINAL_BAR_HEIGHT} row(s)
-# Lock check - prevent recursion
-LOCK=$(tmux show-option -gqv @cpp-resizing 2>/dev/null)
-[ -n "$LOCK" ] && exit 0
-
-# Get current heights
-BAR_H=$(tmux display-message -p -t "${barPaneId}" '#{pane_height}' 2>/dev/null)
-[ -z "$BAR_H" ] && exit 0
-[ "$BAR_H" -eq ${TERMINAL_BAR_HEIGHT} ] && exit 0
-
-CLAUDE_H=$(tmux display-message -p -t "${claudePaneId}" '#{pane_height}' 2>/dev/null)
-BODY_H=$(tmux display-message -p -t "${terminalBodyPaneId}" '#{pane_height}' 2>/dev/null)
-
-# Get previous heights (to detect which pane shrank)
-PREV_CLAUDE=$(tmux show-option -gqv @cpp-prev-claude 2>/dev/null)
-PREV_BODY=$(tmux show-option -gqv @cpp-prev-body 2>/dev/null)
-
-# Acquire lock and set trap
-tmux set-option -g @cpp-resizing 1
-trap 'tmux set-option -gu @cpp-resizing 2>/dev/null' EXIT
-
-# Calculate how much bar is over target
-D=$((BAR_H - ${TERMINAL_BAR_HEIGHT}))
-
-# Determine which pane to grow based on which one shrank
-if [ -n "$PREV_CLAUDE" ] && [ "$CLAUDE_H" -lt "$PREV_CLAUDE" ]; then
-  # Claude shrank (user dragged tabs ceiling UP) -> grow Terminal body
-  tmux resize-pane -t "${terminalBodyPaneId}" -U "$D" 2>/dev/null
-elif [ -n "$PREV_BODY" ] && [ "$BODY_H" -lt "$PREV_BODY" ]; then
-  # Terminal body shrank (user dragged body ceiling DOWN) -> grow Claude
-  tmux resize-pane -t "${claudePaneId}" -D "$D" 2>/dev/null
-else
-  # Fallback: just set bar height directly, let tmux decide
-  :
-fi
-
-# Set bar to exact height
-tmux resize-pane -t "${barPaneId}" -y ${TERMINAL_BAR_HEIGHT} 2>/dev/null
-
-# Store FINAL heights (after adjustment) for next comparison
-FINAL_CLAUDE=$(tmux display-message -p -t "${claudePaneId}" '#{pane_height}' 2>/dev/null)
-FINAL_BODY=$(tmux display-message -p -t "${terminalBodyPaneId}" '#{pane_height}' 2>/dev/null)
-tmux set-option -g @cpp-prev-claude "$FINAL_CLAUDE"
-tmux set-option -g @cpp-prev-body "$FINAL_BODY"
-`;
-    // Write script to file (synchronously)
-    (0, fs_1.writeFileSync)(scriptPath, scriptContent, { mode: 0o755 });
-    return `"run-shell 'sh ${scriptPath}'"`;
+    logger.debug(args.map(a => typeof a === 'object' ? JSON.stringify(a) : String(a)).join(' '));
 }
 // ============================================================================
 // Sidebar App
@@ -252,8 +179,8 @@ class SidebarApp {
         process.stdout.write(output);
     }
     syncCollapsedState() {
-        const width = process.stdout.columns || SIDEBAR_WIDTH;
-        this.state.collapsed = width < SIDEBAR_WIDTH / 2;
+        const width = process.stdout.columns || constants_1.SIDEBAR_WIDTH;
+        this.state.collapsed = width < constants_1.SIDEBAR_WIDTH / 2;
     }
     // ==========================================================================
     // Input Handling
@@ -319,97 +246,76 @@ class SidebarApp {
         }
     }
     handleMainInput(key) {
-        // Ctrl+C - show quit modal (when sidebar is focused)
-        if (key.ctrl && key.key === 'c') {
-            this.enterFullscreenModal();
-            this.state.modal = 'quit';
-            this.state.modalSelection = 0;
-            this.render();
-            return;
-        }
-        // If collapsed, only expand on any key
+        // If collapsed, expand on any key first
         if (this.state.collapsed) {
             this.state.collapsed = false;
             this.enforceSidebarWidth();
             this.render();
             return;
         }
-        // Ctrl+Q - show quit modal (works from any pane via tmux binding)
-        if (key.ctrl && key.key === 'q') {
-            this.enterFullscreenModal();
-            this.state.modal = 'quit';
-            this.state.modalSelection = 0;
-            this.render();
-            return;
-        }
-        // Ctrl+G - toggle collapsed
-        if (key.ctrl && key.key === 'g') {
-            this.toggleCollapsed();
-            return;
-        }
-        // Ctrl+T - create new terminal for active session
-        if (key.ctrl && key.key === 't') {
-            this.createTerminal();
-            return;
-        }
-        // Navigation
-        if (key.key === 'up' || key.key === 'k') {
-            this.state.selectedIndex = Math.max(0, this.state.selectedIndex - 1);
-            this.render();
-            return;
-        }
-        if (key.key === 'down' || key.key === 'j') {
-            const maxIndex = this.getMaxIndex();
-            this.state.selectedIndex = Math.min(maxIndex, this.state.selectedIndex + 1);
-            this.render();
-            return;
-        }
-        // Enter - activate selected
-        if (key.key === 'enter') {
-            debugLog('handleMainInput: enter pressed, calling activateSelected');
-            this.activateSelected();
-            return;
-        }
-        // n - new worktree
-        if (key.key === 'n') {
-            this.enterFullscreenModal();
-            this.state.modal = 'new-worktree';
-            this.state.inputBuffer = '';
-            this.render();
-            return;
-        }
-        // d - delete
-        if (key.key === 'd') {
-            const item = this.getSelectedItem();
-            if (item && !(item.type === 'worktree' && item.worktree?.isMain)) {
-                // Store delete target info for context in modal
-                this.state.deleteTarget = {
-                    type: item.type,
-                    id: item.id,
-                    name: item.type === 'session' ? (item.session?.title || '') : (item.worktree?.branch || ''),
-                    worktree: item.worktree,
-                    session: item.session,
-                };
-                this.enterFullscreenModal();
-                this.state.modal = 'delete';
-                this.state.modalSelection = 0; // Default to No
-                this.render();
-            }
-            return;
-        }
-        // r - rename
-        if (key.key === 'r') {
-            const item = this.getSelectedItem();
-            if (item && !(item.type === 'worktree' && item.worktree?.isMain)) {
-                this.enterFullscreenModal();
-                this.state.modal = 'rename';
-                this.state.inputBuffer = item.type === 'session'
-                    ? item.session?.title || ''
-                    : item.worktree?.branch || '';
-                this.render();
-            }
-            return;
-        }
+        // Create command context with action handlers
+        const context = {
+            state: this.state,
+            actions: {
+                moveUp: () => {
+                    this.state.selectedIndex = Math.max(0, this.state.selectedIndex - 1);
+                    this.render();
+                },
+                moveDown: () => {
+                    const maxIndex = this.getMaxIndex();
+                    this.state.selectedIndex = Math.min(maxIndex, this.state.selectedIndex + 1);
+                    this.render();
+                },
+                activateSelected: () => {
+                    debugLog('handleMainInput: enter pressed, calling activateSelected');
+                    this.activateSelected();
+                },
+                showQuitModal: () => {
+                    this.enterFullscreenModal();
+                    this.state.modal = 'quit';
+                    this.state.modalSelection = 0;
+                    this.render();
+                },
+                showDeleteModal: () => {
+                    const item = this.getSelectedItem();
+                    if (item && !(item.type === 'worktree' && item.worktree?.isMain)) {
+                        this.state.deleteTarget = {
+                            type: item.type,
+                            id: item.id,
+                            name: item.type === 'session' ? (item.session?.title || '') : (item.worktree?.branch || ''),
+                            worktree: item.worktree,
+                            session: item.session,
+                        };
+                        this.enterFullscreenModal();
+                        this.state.modal = 'delete';
+                        this.state.modalSelection = 0;
+                        this.render();
+                    }
+                },
+                showNewWorktreeModal: () => {
+                    this.enterFullscreenModal();
+                    this.state.modal = 'new-worktree';
+                    this.state.inputBuffer = '';
+                    this.render();
+                },
+                showRenameModal: () => {
+                    const item = this.getSelectedItem();
+                    if (item && !(item.type === 'worktree' && item.worktree?.isMain)) {
+                        this.enterFullscreenModal();
+                        this.state.modal = 'rename';
+                        this.state.inputBuffer = item.type === 'session'
+                            ? item.session?.title || ''
+                            : item.worktree?.branch || '';
+                        this.render();
+                    }
+                },
+                toggleCollapsed: () => this.toggleCollapsed(),
+                createTerminal: () => this.createTerminal(),
+                render: () => this.render(),
+            },
+        };
+        // Execute command from map
+        (0, commands_1.executeCommand)(commands_1.MAIN_COMMANDS, key, context);
     }
     handleQuitModalInput(key) {
         // Escape - close modal
@@ -559,20 +465,38 @@ class SidebarApp {
         }
     }
     confirmTextInput(value) {
+        const trimmed = value.trim();
         switch (this.state.modal) {
             case 'new-worktree':
-                this.createWorktree(value);
+                if (!(0, validation_1.isValidBranchName)(trimmed)) {
+                    this.showError('Invalid branch name. Avoid special characters like ~ ^ : ? * [ ] \\');
+                    return;
+                }
+                this.createWorktree(trimmed);
                 break;
             case 'rename':
-                this.renameSelected(value);
+                if (!(0, validation_1.isValidSessionName)(trimmed)) {
+                    this.showError('Invalid name. Please use a shorter name without control characters.');
+                    return;
+                }
+                this.renameSelected(trimmed);
                 break;
             case 'new-session':
-                this.createSession(value);
+                if (!(0, validation_1.isValidSessionName)(trimmed)) {
+                    this.showError('Invalid session name. Please use a shorter name without control characters.');
+                    return;
+                }
+                // Check for duplicate session names
+                if (this.state.sessions.some(s => s.title === trimmed)) {
+                    this.showError('A session with this name already exists.');
+                    return;
+                }
+                this.createSession(trimmed);
                 break;
         }
     }
     handleClick(row, col) {
-        const cols = process.stdout.columns || SIDEBAR_WIDTH;
+        const cols = process.stdout.columns || constants_1.SIDEBAR_WIDTH;
         if (this.state.collapsed) {
             this.state.collapsed = false;
             this.enforceSidebarWidth();
@@ -638,8 +562,8 @@ class SidebarApp {
             this.render();
         }
         catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            this.showError(`Failed to create worktree: ${message}`);
+            logger.error('Failed to create worktree', err);
+            this.showError(`Failed to create worktree: ${(0, errors_1.getErrorMessage)(err)}`);
         }
     }
     createSession(title) {
@@ -652,9 +576,9 @@ class SidebarApp {
         }
         const worktree = item.worktree;
         debugLog('createSession: worktree=' + worktree.branch, 'path=' + worktree.path);
-        const sessionId = `session-${Date.now()}`;
+        const sessionId = sessionManager.generateSessionId();
         let paneId;
-        const claudeCmd = DEFAULT_CLAUDE_CMD;
+        const claudeCmd = constants_1.DEFAULT_CLAUDE_CMD;
         if (this.state.sessions.length === 0) {
             // First session - use existing main pane
             // If in fullscreen mode, the pane is broken but we can still send keys to it
@@ -734,10 +658,10 @@ class SidebarApp {
                 tmux.joinPane(activeTerminal.paneId, session.terminalBarPaneId, false);
             }
             // Ensure terminal bar is exactly 1 row
-            tmux.resizePane(session.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+            tmux.resizePane(session.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
             // Update resize enforcement for this session's terminal bar
             if (activeTerminal) {
-                setupTerminalBarResize(this.state.sessionName, session.paneId, session.terminalBarPaneId, activeTerminal.paneId);
+                (0, pane_orchestrator_1.setupTerminalBarResize)(this.state.sessionName, session.paneId, session.terminalBarPaneId, activeTerminal.paneId);
             }
             // Update terminal bar display
             this.updateTerminalBar(session);
@@ -791,10 +715,10 @@ class SidebarApp {
                     if (activeTerminal) {
                         tmux.joinPane(activeTerminal.paneId, nextSession.terminalBarPaneId, false);
                     }
-                    tmux.resizePane(nextSession.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+                    tmux.resizePane(nextSession.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
                     // Update resize enforcement for the new session's terminal bar
                     if (activeTerminal) {
-                        setupTerminalBarResize(this.state.sessionName, nextSession.paneId, nextSession.terminalBarPaneId, activeTerminal.paneId);
+                        (0, pane_orchestrator_1.setupTerminalBarResize)(this.state.sessionName, nextSession.paneId, nextSession.terminalBarPaneId, activeTerminal.paneId);
                     }
                     this.updateTerminalBar(nextSession);
                 }
@@ -849,10 +773,10 @@ class SidebarApp {
                     if (activeTerminal) {
                         tmux.joinPane(activeTerminal.paneId, nextSession.terminalBarPaneId, false);
                     }
-                    tmux.resizePane(nextSession.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+                    tmux.resizePane(nextSession.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
                     // Update resize enforcement for the new session's terminal bar
                     if (activeTerminal) {
-                        setupTerminalBarResize(this.state.sessionName, nextSession.paneId, nextSession.terminalBarPaneId, activeTerminal.paneId);
+                        (0, pane_orchestrator_1.setupTerminalBarResize)(this.state.sessionName, nextSession.paneId, nextSession.terminalBarPaneId, activeTerminal.paneId);
                     }
                     this.updateTerminalBar(nextSession);
                 }
@@ -865,8 +789,8 @@ class SidebarApp {
             await this.worktreeManager.remove(worktree.path, true);
         }
         catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            this.showError(`Failed to delete worktree: ${message}`);
+            logger.error('Failed to delete worktree', err);
+            this.showError(`Failed to delete worktree: ${(0, errors_1.getErrorMessage)(err)}`);
             return;
         }
         // Remove from state
@@ -899,7 +823,7 @@ class SidebarApp {
     }
     enforceSidebarWidth() {
         if (!this.state.collapsed) {
-            tmux.resizePane(this.state.sidebarPaneId, SIDEBAR_WIDTH);
+            (0, pane_orchestrator_1.enforceSidebarWidth)(this.state.sidebarPaneId);
         }
     }
     // ==========================================================================
@@ -923,7 +847,7 @@ class SidebarApp {
             case 'switch':
                 const index = parseInt(data, 10);
                 if (!isNaN(index) && session) {
-                    this.switchTerminal(session, index);
+                    this.switchToTerminal(session, index);
                 }
                 break;
             case 'new':
@@ -964,22 +888,22 @@ class SidebarApp {
             return;
         const terminalNum = session.terminals.length + 1;
         const terminalTitle = `Terminal ${terminalNum}`;
-        const terminalId = `terminal-${Date.now()}`;
+        const terminalId = terminalManager.generateTerminalId();
         debugLog('createTerminal:', terminalTitle, 'for session', session.title);
         if (session.terminals.length === 0) {
             // First terminal - need to create terminal bar pane + terminal pane
             // Split Claude pane vertically (Claude gets top 70%, terminal area gets bottom 30%)
             tmux.selectPane(session.paneId);
-            const terminalAreaPaneId = tmux.splitVertical(this.state.sessionName, 100 - CLAUDE_PANE_PERCENT, worktree.path);
+            const terminalAreaPaneId = tmux.splitVertical(this.state.sessionName, 100 - constants_1.CLAUDE_PANE_PERCENT, worktree.path);
             // Split terminal area: top 1 row for bar, rest for terminal
             tmux.selectPane(terminalAreaPaneId);
             const terminalPaneId = tmux.splitVertical(this.state.sessionName, 95, worktree.path);
             // The terminalAreaPaneId is now the bar pane (top part after split)
             const terminalBarPaneId = terminalAreaPaneId;
             // Resize bar pane to exactly 1 row
-            tmux.resizePane(terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+            tmux.resizePane(terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
             // Set up resize enforcement (hook + mouse binding)
-            setupTerminalBarResize(this.state.sessionName, session.paneId, terminalBarPaneId, terminalPaneId);
+            (0, pane_orchestrator_1.setupTerminalBarResize)(this.state.sessionName, session.paneId, terminalBarPaneId, terminalPaneId);
             // Update session
             session.terminalBarPaneId = terminalBarPaneId;
             session.terminals.push({
@@ -1014,7 +938,7 @@ class SidebarApp {
             session.activeTerminalIndex = session.terminals.length - 1;
             // Ensure terminal bar stays at 1 row after the split
             if (session.terminalBarPaneId) {
-                tmux.resizePane(session.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+                tmux.resizePane(session.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
             }
             // Update terminal bar
             this.updateTerminalBar(session);
@@ -1028,12 +952,12 @@ class SidebarApp {
     /**
      * Switch to a different terminal tab within a session
      */
-    switchTerminal(session, targetIndex) {
+    switchToTerminal(session, targetIndex) {
         if (targetIndex < 0 || targetIndex >= session.terminals.length)
             return;
         if (targetIndex === session.activeTerminalIndex)
             return;
-        debugLog('switchTerminal:', targetIndex, 'in session', session.title);
+        debugLog('switchToTerminal:', targetIndex, 'in session', session.title);
         const currentTerminal = session.terminals[session.activeTerminalIndex];
         const newTerminal = session.terminals[targetIndex];
         // Break current terminal to background
@@ -1042,7 +966,7 @@ class SidebarApp {
         if (session.terminalBarPaneId) {
             tmux.joinPane(newTerminal.paneId, session.terminalBarPaneId, false);
             // Ensure terminal bar stays at 1 row
-            tmux.resizePane(session.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+            tmux.resizePane(session.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
         }
         // Update active index
         session.activeTerminalIndex = targetIndex;
@@ -1091,7 +1015,7 @@ class SidebarApp {
                 const newActiveTerminal = session.terminals[session.activeTerminalIndex];
                 if (newActiveTerminal && session.terminalBarPaneId) {
                     tmux.joinPane(newActiveTerminal.paneId, session.terminalBarPaneId, false);
-                    tmux.resizePane(session.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+                    tmux.resizePane(session.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
                 }
             }
             // Update terminal bar
@@ -1218,7 +1142,7 @@ class SidebarApp {
                         tmux.joinPane(activeTerminal.paneId, activeSession.terminalBarPaneId, false);
                     }
                     // Ensure terminal bar is exactly 1 row
-                    tmux.resizePane(activeSession.terminalBarPaneId, undefined, TERMINAL_BAR_HEIGHT);
+                    tmux.resizePane(activeSession.terminalBarPaneId, undefined, constants_1.TERMINAL_BAR_HEIGHT);
                     // Update terminal bar display
                     this.updateTerminalBar(activeSession);
                     debugLog('exitFullscreenModal: joined terminal panes');