ccmanager 3.7.2 → 3.7.4

package/dist/components/App.js

@@ -102,8 +102,7 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
                             : 'menu';
                     navigateWithClear(targetView, () => {
                         setMenuKey(prev => prev + 1);
-                        process.stdin.resume();
-                        process.stdin.setEncoding('utf8');
+                        // Ink's useInput in Menu will reconfigure stdin automatically
                     });
                 }
                 return current;
@@ -265,14 +264,7 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
                 : 'menu';
         navigateWithClear(targetView, () => {
             setMenuKey(prev => prev + 1); // Force menu refresh
-            // Ensure stdin is in a clean state for Ink components
-            if (process.stdin.isTTY) {
-                // Flush any pending input to prevent escape sequences from leaking
-                process.stdin.read();
-                process.stdin.setRawMode(false);
-                process.stdin.resume();
-                process.stdin.setEncoding('utf8');
-            }
+            // Ink's useInput in Menu will reconfigure stdin automatically
         });
     };
     const handleCreateWorktree = async (path, branch, baseBranch, copySessionData, copyClaudeDirectory) => {

package/dist/components/Menu.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
 import SelectInput from 'ink-select-input';
@@ -35,6 +35,8 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
     const [sessions, setSessions] = useState([]);
     const [items, setItems] = useState([]);
     const [recentProjects, setRecentProjects] = useState([]);
+    const [highlightedWorktreePath, setHighlightedWorktreePath] = useState(null);
+    const [autoApprovalToggleCounter, setAutoApprovalToggleCounter] = useState(0);
     const { stdout } = useStdout();
     const fixedRows = 6;
     // Use the search mode hook
@@ -137,7 +139,10 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
             : items;
         // Build menu items with proper alignment
         const menuItems = filteredItems.map((item, index) => {
-            const label = assembleWorktreeLabel(item, columnPositions);
+            const baseLabel = assembleWorktreeLabel(item, columnPositions);
+            const aaDisabled = configReader.isAutoApprovalEnabled() &&
+                sessionManager.isAutoApprovalDisabledForWorktree(item.worktree.path);
+            const label = baseLabel + (aaDisabled ? ' [Auto Approval Off]' : '');
             // Only show numbers for worktrees (0-9) when not in search mode
             const numberPrefix = !isSearchMode && index < 10 ? `${index} ❯ ` : '❯ ';
             return {
@@ -255,6 +260,16 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
             }
         }
         setItems(menuItems);
+        // Ensure highlighted worktree path is valid for hotkey support
+        // (e.g., on initial render or when returning from a session view)
+        setHighlightedWorktreePath(prev => {
+            if (prev &&
+                menuItems.some(item => item.type === 'worktree' && item.value === prev)) {
+                return prev;
+            }
+            const first = menuItems.find(item => item.type === 'worktree');
+            return first && first.type === 'worktree' ? first.worktree.path : null;
+        });
     }, [
         worktrees,
         sessions,
@@ -264,6 +279,8 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
         recentProjects,
         searchQuery,
         isSearchMode,
+        autoApprovalToggleCounter,
+        sessionManager,
     ]);
     // Handle hotkeys
     useInput((input, _key) => {
@@ -309,6 +326,13 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
             return;
         }
         switch (keyPressed) {
+            case 'a':
+                // Toggle auto-approval for the currently highlighted worktree
+                if (configReader.isAutoApprovalEnabled() && highlightedWorktreePath) {
+                    sessionManager.toggleAutoApprovalForWorktree(highlightedWorktreePath);
+                    setAutoApprovalToggleCounter(c => c + 1);
+                }
+                break;
             case 'n':
                 // Trigger new worktree action
                 onSelectWorktree({
@@ -487,10 +511,15 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
     };
     return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { bold: true, color: "green", children: ["CCManager - Claude Code Worktree Manager v", version] }), projectName && (_jsx(Text, { bold: true, color: "green", children: projectName }))] }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Select a worktree to start or resume a Claude Code session:" }) }), isSearchMode && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { children: "Search: " }), _jsx(TextInputWrapper, { value: searchQuery, onChange: setSearchQuery, focus: true, placeholder: "Type to filter worktrees..." })] })), isSearchMode && items.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: "No worktrees match your search" }) })) : isSearchMode ? (
             // In search mode, show the items as a list without SelectInput
-            _jsx(Box, { flexDirection: "column", children: items.slice(0, limit).map((item, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', item.label] }, item.value))) })) : (_jsx(SelectInput, { items: items, onSelect: item => handleSelect(item), isFocused: !error, initialIndex: selectedIndex, limit: limit })), (error || loadError) && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "red", children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", error || loadError] }), _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to dismiss" })] }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Status: ", STATUS_ICONS.BUSY, " ", STATUS_LABELS.BUSY, ' ', STATUS_ICONS.WAITING, " ", STATUS_LABELS.WAITING, " ", STATUS_ICONS.IDLE, ' ', STATUS_LABELS.IDLE] }), _jsx(Text, { dimColor: true, children: isSearchMode
+            _jsx(Box, { flexDirection: "column", children: items.slice(0, limit).map((item, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', item.label] }, item.value))) })) : (_jsx(SelectInput, { items: items, onSelect: item => handleSelect(item), onHighlight: item => {
+                    const menuItem = item;
+                    if (menuItem.type === 'worktree') {
+                        setHighlightedWorktreePath(menuItem.worktree.path);
+                    }
+                }, isFocused: !error, initialIndex: selectedIndex, limit: limit })), (error || loadError) && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "red", children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", error || loadError] }), _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to dismiss" })] }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Status: ", STATUS_ICONS.BUSY, " ", STATUS_LABELS.BUSY, ' ', STATUS_ICONS.WAITING, " ", STATUS_LABELS.WAITING, " ", STATUS_ICONS.IDLE, ' ', STATUS_LABELS.IDLE, configReader.isAutoApprovalEnabled() && (_jsxs(_Fragment, { children: [' | ', _jsx(Text, { color: "green", children: "Auto Approval Enabled" })] }))] }), _jsx(Text, { dimColor: true, children: isSearchMode
                             ? 'Search Mode: Type to filter, Enter to exit search, ESC to exit search'
                             : searchQuery
-                                ? `Filtered: "${searchQuery}" | ↑↓ Navigate Enter Select | /-Search ESC-Clear 0-9 Quick Select N-New M-Merge D-Delete ${multiProject ? 'C-Config' : 'P-ProjConfig C-GlobalConfig'} ${projectName ? 'B-Back' : 'Q-Quit'}`
-                                : `Controls: ↑↓ Navigate Enter Select | Hotkeys: 0-9 Quick Select /-Search N-New M-Merge D-Delete ${multiProject ? 'C-Config' : 'P-ProjConfig C-GlobalConfig'} ${projectName ? 'B-Back' : 'Q-Quit'}` })] })] }));
+                                ? `Filtered: "${searchQuery}" | ↑↓ Navigate Enter Select | /-Search ESC-Clear 0-9 Quick Select N-New M-Merge D-Delete ${configReader.isAutoApprovalEnabled() ? 'A-AutoApproval ' : ''}${multiProject ? 'C-Config' : 'P-ProjConfig C-GlobalConfig'} ${projectName ? 'B-Back' : 'Q-Quit'}`
+                                : `Controls: ↑↓ Navigate Enter Select | Hotkeys: 0-9 Quick Select /-Search N-New M-Merge D-Delete ${configReader.isAutoApprovalEnabled() ? 'A-AutoApproval ' : ''}${multiProject ? 'C-Config' : 'P-ProjConfig C-GlobalConfig'} ${projectName ? 'B-Back' : 'Q-Quit'}` })] })] }));
 };
 export default Menu;

package/dist/components/Menu.recent-projects.test.js

@@ -84,6 +84,8 @@ describe('Menu - Recent Projects', () => {
             createSessionWithPreset: vi.fn(),
             createSessionWithDevcontainer: vi.fn(),
             destroy: vi.fn(),
+            isAutoApprovalDisabledForWorktree: vi.fn().mockReturnValue(false),
+            toggleAutoApprovalForWorktree: vi.fn().mockReturnValue(false),
         };
         mockWorktreeService = {
             getWorktreesEffect: vi.fn().mockReturnValue(Effect.succeed([

package/dist/components/Session.js

@@ -1,9 +1,9 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import { useStdout } from 'ink';
 import { shortcutManager } from '../services/shortcutManager.js';
 const Session = ({ session, sessionManager, onReturnToMenu, }) => {
     const { stdout } = useStdout();
-    const [isExiting, setIsExiting] = useState(false);
+    const isExitingRef = useRef(false);
     const stripOscColorSequences = (input) => {
         // Remove default foreground/background color OSC sequences that Codex emits
         // These sequences leak as literal text when replaying buffered output
@@ -96,13 +96,13 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         // Listen for session data events
         const handleSessionData = (activeSession, data) => {
             // Only handle data for our session
-            if (activeSession.id === session.id && !isExiting) {
+            if (activeSession.id === session.id && !isExitingRef.current) {
                 stdout.write(normalizeLineEndings(data));
             }
         };
         const handleSessionExit = (exitedSession) => {
             if (exitedSession.id === session.id) {
-                setIsExiting(true);
+                isExitingRef.current = true;
                 // Don't call onReturnToMenu here - App component handles it
             }
         };
@@ -121,15 +121,14 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         stdout.on('resize', handleResize);
         // Set up raw input handling
         const stdin = process.stdin;
-        // Store original stdin state
-        const originalIsRaw = stdin.isRaw;
-        const originalIsPaused = stdin.isPaused();
         // Configure stdin for PTY passthrough
-        stdin.setRawMode(true);
-        stdin.resume();
+        if (stdin.isTTY) {
+            stdin.setRawMode(true);
+            stdin.resume();
+        }
         stdin.setEncoding('utf8');
         const handleStdinData = (data) => {
-            if (isExiting)
+            if (isExitingRef.current)
                 return;
             // Check for return to menu shortcut
             if (shortcutManager.matchesRawInput('returnToMenu', data)) {
@@ -137,10 +136,8 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                 if (stdout) {
                     resetTerminalInputModes();
                 }
-                // Restore stdin state before returning to menu
+                // Remove our listener — Ink will reconfigure stdin when Menu mounts
                 stdin.removeListener('data', handleStdinData);
-                stdin.setRawMode(false);
-                stdin.pause();
                 onReturnToMenu();
                 return;
             }
@@ -152,22 +149,12 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         };
         stdin.on('data', handleStdinData);
         return () => {
-            // Remove listener first to prevent any race conditions
+            // Remove our stdin listener
             stdin.removeListener('data', handleStdinData);
-            // Disable focus reporting mode that might have been enabled by the PTY
+            // Disable extended input modes that might have been enabled by the PTY
             if (stdout) {
                 resetTerminalInputModes();
             }
-            // Restore stdin to its original state
-            if (stdin.isTTY) {
-                stdin.setRawMode(originalIsRaw || false);
-                if (originalIsPaused) {
-                    stdin.pause();
-                }
-                else {
-                    stdin.resume();
-                }
-            }
             // Mark session as inactive
             sessionManager.setSessionActive(session.worktreePath, false);
             // Remove event listeners
@@ -176,7 +163,7 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             sessionManager.off('sessionExit', handleSessionExit);
             stdout.off('resize', handleResize);
         };
-    }, [session, sessionManager, stdout, onReturnToMenu, isExiting]);
+    }, [session, sessionManager, stdout, onReturnToMenu]);
     return null;
 };
 export default Session;

package/dist/services/sessionManager.d.ts

@@ -14,6 +14,7 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     sessions: Map<string, Session>;
     private waitingWithBottomBorder;
     private busyTimers;
+    private autoApprovalDisabledWorktrees;
     private spawn;
     detectTerminalState(session: Session): SessionState;
     detectBackgroundTask(session: Session): number;
@@ -66,6 +67,8 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     getSession(worktreePath: string): Session | undefined;
     setSessionActive(worktreePath: string, active: boolean): void;
     cancelAutoApproval(worktreePath: string, reason?: string): void;
+    toggleAutoApprovalForWorktree(worktreePath: string): boolean;
+    isAutoApprovalDisabledForWorktree(worktreePath: string): boolean;
     destroySession(worktreePath: string): void;
     /**
      * Terminate session and cleanup resources using Effect-based error handling

package/dist/services/sessionManager.js

@@ -22,6 +22,7 @@ export class SessionManager extends EventEmitter {
     sessions;
     waitingWithBottomBorder = new Map();
     busyTimers = new Map();
+    autoApprovalDisabledWorktrees = new Set();
     async spawn(command, args, worktreePath) {
         const spawnOptions = {
             name: 'xterm-256color',
@@ -38,7 +39,8 @@ export class SessionManager extends EventEmitter {
         // If auto-approval is enabled and state is waiting_input, convert to pending_auto_approval
         if (detectedState === 'waiting_input' &&
             configReader.isAutoApprovalEnabled() &&
-            !stateData.autoApprovalFailed) {
+            !stateData.autoApprovalFailed &&
+            !this.autoApprovalDisabledWorktrees.has(session.worktreePath)) {
             return 'pending_auto_approval';
         }
         return detectedState;
@@ -483,6 +485,20 @@ export class SessionManager extends EventEmitter {
             }));
         }
     }
+    toggleAutoApprovalForWorktree(worktreePath) {
+        if (this.autoApprovalDisabledWorktrees.has(worktreePath)) {
+            this.autoApprovalDisabledWorktrees.delete(worktreePath);
+            return false;
+        }
+        else {
+            this.autoApprovalDisabledWorktrees.add(worktreePath);
+            this.cancelAutoApproval(worktreePath, 'Auto-approval disabled for worktree');
+            return true;
+        }
+    }
+    isAutoApprovalDisabledForWorktree(worktreePath) {
+        return this.autoApprovalDisabledWorktrees.has(worktreePath);
+    }
     destroySession(worktreePath) {
         const session = this.sessions.get(worktreePath);
         if (session) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "3.7.2",
+	"version": "3.7.4",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",
@@ -41,11 +41,11 @@
 		"bin"
 	],
 	"optionalDependencies": {
-		"@kodaikabasawa/ccmanager-darwin-arm64": "3.7.2",
-		"@kodaikabasawa/ccmanager-darwin-x64": "3.7.2",
-		"@kodaikabasawa/ccmanager-linux-arm64": "3.7.2",
-		"@kodaikabasawa/ccmanager-linux-x64": "3.7.2",
-		"@kodaikabasawa/ccmanager-win32-x64": "3.7.2"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "3.7.4",
+		"@kodaikabasawa/ccmanager-darwin-x64": "3.7.4",
+		"@kodaikabasawa/ccmanager-linux-arm64": "3.7.4",
+		"@kodaikabasawa/ccmanager-linux-x64": "3.7.4",
+		"@kodaikabasawa/ccmanager-win32-x64": "3.7.4"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",