ccmanager 3.0.0 → 3.1.1

package/dist/components/ConfigureOther.js

@@ -4,6 +4,7 @@ import SelectInput from 'ink-select-input';
 import { configurationManager } from '../services/configurationManager.js';
 import { shortcutManager } from '../services/shortcutManager.js';
 import ConfigureCustomCommand from './ConfigureCustomCommand.js';
+import ConfigureTimeout from './ConfigureTimeout.js';
 import CustomCommandSummary from './CustomCommandSummary.js';
 const ConfigureOther = ({ onComplete }) => {
     const autoApprovalConfig = configurationManager.getAutoApprovalConfig();
@@ -11,6 +12,8 @@ const ConfigureOther = ({ onComplete }) => {
     const [autoApprovalEnabled, setAutoApprovalEnabled] = useState(autoApprovalConfig.enabled);
     const [customCommand, setCustomCommand] = useState(autoApprovalConfig.customCommand ?? '');
     const [customCommandDraft, setCustomCommandDraft] = useState(customCommand);
+    const [timeout, setTimeout] = useState(autoApprovalConfig.timeout ?? 30);
+    const [timeoutDraft, setTimeoutDraft] = useState(timeout);
     useInput((input, key) => {
         if (shortcutManager.matchesShortcut('cancel', input, key)) {
             if (view === 'customCommand') {
@@ -18,6 +21,11 @@ const ConfigureOther = ({ onComplete }) => {
                 setView('main');
                 return;
             }
+            if (view === 'timeout') {
+                setTimeoutDraft(timeout);
+                setView('main');
+                return;
+            }
             onComplete();
         }
     });
@@ -30,6 +38,10 @@ const ConfigureOther = ({ onComplete }) => {
             label: '✏️  Edit Custom Command',
             value: 'customCommand',
         },
+        {
+            label: `⏱️  Set Timeout (${timeout}s)`,
+            value: 'timeout',
+        },
         {
             label: '💾 Save Changes',
             value: 'save',
@@ -48,10 +60,15 @@ const ConfigureOther = ({ onComplete }) => {
                 setCustomCommandDraft(customCommand);
                 setView('customCommand');
                 break;
+            case 'timeout':
+                setTimeoutDraft(timeout);
+                setView('timeout');
+                break;
             case 'save':
                 configurationManager.setAutoApprovalConfig({
                     enabled: autoApprovalEnabled,
                     customCommand: customCommand.trim() || undefined,
+                    timeout,
                 });
                 onComplete();
                 break;
@@ -71,6 +88,15 @@ const ConfigureOther = ({ onComplete }) => {
                 setView('main');
             } }));
     }
+    if (view === 'timeout') {
+        return (React.createElement(ConfigureTimeout, { value: timeoutDraft, onChange: setTimeoutDraft, onCancel: () => {
+                setTimeoutDraft(timeout);
+                setView('main');
+            }, onSubmit: value => {
+                setTimeout(value);
+                setView('main');
+            } }));
+    }
     return (React.createElement(Box, { flexDirection: "column" },
         React.createElement(Box, { marginBottom: 1 },
             React.createElement(Text, { bold: true, color: "green" }, "Other & Experimental Settings")),

package/dist/components/ConfigureTimeout.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+interface ConfigureTimeoutProps {
+    value: number;
+    onChange: (value: number) => void;
+    onSubmit: (value: number) => void;
+    onCancel: () => void;
+}
+declare const ConfigureTimeout: React.FC<ConfigureTimeoutProps>;
+export default ConfigureTimeout;

package/dist/components/ConfigureTimeout.js

@@ -0,0 +1,42 @@
+import React from 'react';
+import { Box, Text, useInput } from 'ink';
+import TextInputWrapper from './TextInputWrapper.js';
+import { shortcutManager } from '../services/shortcutManager.js';
+const ConfigureTimeout = ({ value, onChange, onSubmit, onCancel, }) => {
+    const [inputValue, setInputValue] = React.useState(String(value));
+    const handleChange = (newValue) => {
+        // Only allow numeric input
+        const filtered = newValue.replace(/[^0-9]/g, '');
+        setInputValue(filtered);
+        const parsed = parseInt(filtered, 10);
+        if (!isNaN(parsed) && parsed > 0) {
+            onChange(parsed);
+        }
+    };
+    const handleSubmit = () => {
+        const parsed = parseInt(inputValue, 10);
+        if (!isNaN(parsed) && parsed > 0) {
+            onSubmit(parsed);
+        }
+    };
+    useInput((input, key) => {
+        if (shortcutManager.matchesShortcut('cancel', input, key)) {
+            onCancel();
+        }
+    });
+    return (React.createElement(Box, { flexDirection: "column" },
+        React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, { bold: true, color: "green" }, "Auto-Approval Timeout")),
+        React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, null, "Enter timeout in seconds for auto-approval verification:")),
+        React.createElement(Box, { marginBottom: 1 },
+            React.createElement(TextInputWrapper, { value: inputValue, onChange: handleChange, onSubmit: handleSubmit, placeholder: "e.g. 30", focus: true })),
+        React.createElement(Box, { marginBottom: 1 },
+            React.createElement(Text, { dimColor: true }, "Must be a positive integer (minimum: 1 second, default: 30 seconds)")),
+        React.createElement(Box, null,
+            React.createElement(Text, { dimColor: true },
+                "Press Enter to save, ",
+                shortcutManager.getShortcutDisplay('cancel'),
+                " to go back"))));
+};
+export default ConfigureTimeout;

package/dist/services/__tests__/stateDetector.claude.test.js

@@ -8,30 +8,6 @@ describe('ClaudeStateDetector', () => {
         detector = new ClaudeStateDetector();
     });
     describe('detectState', () => {
-        it('should detect waiting_input when "Do you want" prompt is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Some previous output',
-                '│ Do you want to continue? (y/n)',
-                '│ > ',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should detect waiting_input when "Would you like" prompt is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Some output',
-                '│ Would you like to save changes?',
-                '│ > ',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
         it('should detect busy when "ESC to interrupt" is present', () => {
             // Arrange
             terminal = createMockTerminal([
@@ -74,37 +50,6 @@ describe('ClaudeStateDetector', () => {
             // Assert
             expect(state).toBe('idle');
         });
-        it('should only consider last 30 lines', () => {
-            // Arrange
-            const lines = [];
-            // Add more than 30 lines
-            for (let i = 0; i < 40; i++) {
-                lines.push(`Line ${i}`);
-            }
-            // The "Do you want" should be outside the 30 line window
-            lines.push('│ Do you want to continue?');
-            // Add 30 more lines to push it out
-            for (let i = 0; i < 30; i++) {
-                lines.push(`Recent line ${i}`);
-            }
-            terminal = createMockTerminal(lines);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('idle'); // Should not detect the old prompt
-        });
-        it('should prioritize waiting_input over busy state', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Press ESC to interrupt',
-                '│ Do you want to continue?',
-                '│ > ',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input'); // waiting_input should take precedence
-        });
         it('should maintain current state when "ctrl+r to toggle" is present', () => {
             // Arrange
             terminal = createMockTerminal([
@@ -222,91 +167,5 @@ describe('ClaudeStateDetector', () => {
             // Assert
             expect(state).toBe('waiting_input');
         });
-        it('should detect waiting_input when "enter to select" is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Select an option:',
-                '',
-                '❯ Option 1',
-                '  Option 2',
-                '',
-                'Enter to select',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should detect waiting_input when "tab/arrow keys to navigate" is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Choose your action:',
-                '',
-                '❯ Continue',
-                '  Skip',
-                '',
-                'Tab/arrow keys to navigate',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should detect waiting_input when "esc to cancel" is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Interactive selection:',
-                '',
-                '❯ Yes',
-                '  No',
-                '',
-                'Esc to cancel',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should detect waiting_input when "ready to submit your answers?" is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Review your selections:',
-                '',
-                'Choice 1: Yes',
-                'Choice 2: No',
-                '',
-                'Ready to submit your answers?',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should detect waiting_input with mixed case interactive patterns', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Select options:',
-                '',
-                'ENTER TO SELECT',
-                'TAB/ARROW KEYS TO NAVIGATE',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should prioritize interactive patterns over busy state', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Press ESC to interrupt',
-                '',
-                'Select an option:',
-                'Enter to select',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input'); // Interactive pattern should take precedence
-        });
     });
 });

package/dist/services/autoApprovalVerifier.js

@@ -3,7 +3,12 @@ import { ProcessError } from '../types/errors.js';
 import { configurationManager } from './configurationManager.js';
 import { logger } from '../utils/logger.js';
 import { execFile, spawn, } from 'child_process';
-const AUTO_APPROVAL_TIMEOUT_MS = 60000;
+const DEFAULT_TIMEOUT_SECONDS = 30;
+const getTimeoutMs = () => {
+    const config = configurationManager.getAutoApprovalConfig();
+    const timeoutSeconds = config.timeout ?? DEFAULT_TIMEOUT_SECONDS;
+    return timeoutSeconds * 1000;
+};
 const createAbortError = () => {
     const error = new Error('Auto-approval verification aborted');
     error.name = 'AbortError';
@@ -80,15 +85,16 @@ export class AutoApprovalVerifier {
                     return;
                 signal.removeEventListener('abort', abortListener);
             };
+            const timeoutMs = getTimeoutMs();
             const timeoutId = setTimeout(() => {
                 settle(() => {
                     logger.warn('Auto-approval verification timed out, terminating helper Claude process');
                     if (child?.pid) {
                         child.kill('SIGKILL');
                     }
-                    reject(new Error('Auto-approval verification timed out after 60s'));
+                    reject(new Error(`Auto-approval verification timed out after ${timeoutMs / 1000}s`));
                 });
-            }, AUTO_APPROVAL_TIMEOUT_MS);
+            }, timeoutMs);
             if (signal) {
                 if (signal.aborted) {
                     abortListener();
@@ -166,13 +172,14 @@ export class AutoApprovalVerifier {
             const child = spawn(command, [], spawnOptions);
             let stdout = '';
             let stderr = '';
+            const timeoutMs = getTimeoutMs();
             timeoutId = setTimeout(() => {
                 logger.warn('Auto-approval custom command timed out, terminating process');
                 settle(() => {
                     child.kill('SIGKILL');
-                    reject(new Error('Auto-approval verification custom command timed out after 60s'));
+                    reject(new Error(`Auto-approval verification custom command timed out after ${timeoutMs / 1000}s`));
                 });
-            }, AUTO_APPROVAL_TIMEOUT_MS);
+            }, timeoutMs);
             if (signal) {
                 if (signal.aborted) {
                     abortListener();

package/dist/services/configurationManager.d.ts

@@ -24,6 +24,7 @@ export declare class ConfigurationManager {
     getAutoApprovalConfig(): NonNullable<ConfigurationData['autoApproval']>;
     setAutoApprovalConfig(autoApproval: NonNullable<ConfigurationData['autoApproval']>): void;
     setAutoApprovalEnabled(enabled: boolean): void;
+    setAutoApprovalTimeout(timeout: number): void;
     getCommandConfig(): CommandConfig;
     setCommandConfig(commandConfig: CommandConfig): void;
     private migrateLegacyCommandToPresets;

package/dist/services/configurationManager.js

@@ -102,10 +102,16 @@ export class ConfigurationManager {
         if (!this.config.autoApproval) {
             this.config.autoApproval = {
                 enabled: false,
+                timeout: 30,
             };
         }
-        else if (!Object.prototype.hasOwnProperty.call(this.config.autoApproval, 'enabled')) {
-            this.config.autoApproval.enabled = false;
+        else {
+            if (!Object.prototype.hasOwnProperty.call(this.config.autoApproval, 'enabled')) {
+                this.config.autoApproval.enabled = false;
+            }
+            if (!Object.prototype.hasOwnProperty.call(this.config.autoApproval, 'timeout')) {
+                this.config.autoApproval.timeout = 30;
+            }
         }
         // Migrate legacy command config to presets if needed
         this.migrateLegacyCommandToPresets();
@@ -174,9 +180,14 @@ export class ConfigurationManager {
         this.saveConfig();
     }
     getAutoApprovalConfig() {
-        return (this.config.autoApproval || {
+        const config = this.config.autoApproval || {
             enabled: false,
-        });
+        };
+        // Default timeout to 30 seconds if not set
+        return {
+            ...config,
+            timeout: config.timeout ?? 30,
+        };
     }
     setAutoApprovalConfig(autoApproval) {
         this.config.autoApproval = autoApproval;
@@ -186,6 +197,10 @@ export class ConfigurationManager {
         const currentConfig = this.getAutoApprovalConfig();
         this.setAutoApprovalConfig({ ...currentConfig, enabled });
     }
+    setAutoApprovalTimeout(timeout) {
+        const currentConfig = this.getAutoApprovalConfig();
+        this.setAutoApprovalConfig({ ...currentConfig, timeout });
+    }
     getCommandConfig() {
         // For backward compatibility, return the default preset as CommandConfig
         const defaultPreset = this.getDefaultPreset();
@@ -535,10 +550,16 @@ export class ConfigurationManager {
         if (!config.autoApproval) {
             config.autoApproval = {
                 enabled: false,
+                timeout: 30,
             };
         }
-        else if (!Object.prototype.hasOwnProperty.call(config.autoApproval, 'enabled')) {
-            config.autoApproval.enabled = false;
+        else {
+            if (!Object.prototype.hasOwnProperty.call(config.autoApproval, 'enabled')) {
+                config.autoApproval.enabled = false;
+            }
+            if (!Object.prototype.hasOwnProperty.call(config.autoApproval, 'timeout')) {
+                config.autoApproval.timeout = 30;
+            }
         }
         return config;
     }

package/dist/services/sessionManager.statePersistence.test.js

@@ -127,7 +127,7 @@ describe('SessionManager - State Persistence', () => {
         vi.advanceTimersByTime(STATE_CHECK_INTERVAL_MS * 2);
         expect(session.pendingState).toBe('idle');
         // Simulate output that would trigger waiting_input state
-        eventEmitter.emit('data', '│ Do you want to continue?');
+        eventEmitter.emit('data', 'Do you want to continue?\n❯ 1. Yes');
         // Advance time to trigger another check
         vi.advanceTimersByTime(STATE_CHECK_INTERVAL_MS);
         // Pending state should now be waiting_input, not idle
@@ -172,7 +172,7 @@ describe('SessionManager - State Persistence', () => {
         expect(session.pendingState).toBe('idle');
         // Now change to a different state before idle persists
         // Clear terminal first and add waiting prompt
-        eventEmitter.emit('data', '\x1b[2J\x1b[H│ Do you want to continue?\n');
+        eventEmitter.emit('data', '\x1b[2J\x1b[HDo you want to continue?\n❯ 1. Yes');
         // Advance time to detect new state but still less than persistence duration from first change
         vi.advanceTimersByTime(STATE_CHECK_INTERVAL_MS); // Another 100ms, total 200ms exactly at threshold
         // Pending state should have changed to waiting_input
@@ -210,7 +210,7 @@ describe('SessionManager - State Persistence', () => {
         // Session 1 goes to idle
         eventEmitter1.emit('data', 'Idle output for session 1');
         // Session 2 goes to waiting_input
-        eventEmitter2.emit('data', '│ Do you want to continue?');
+        eventEmitter2.emit('data', 'Do you want to continue?\n❯ 1. Yes');
         // Advance time to check but not confirm
         vi.advanceTimersByTime(STATE_CHECK_INTERVAL_MS * 2);
         // Both should have pending states but not changed yet

package/dist/services/stateDetector.js

@@ -45,20 +45,6 @@ export class ClaudeStateDetector extends BaseStateDetector {
         if (lowerContent.includes('ctrl+r to toggle')) {
             return currentState;
         }
-        // Check for interactive selection interface patterns
-        // These patterns indicate Claude is waiting for user interaction with navigation/selection UI
-        const hasInteractivePattern = lowerContent.includes('enter to select') ||
-            lowerContent.includes('tab/arrow keys to navigate') ||
-            lowerContent.includes('esc to cancel') ||
-            lowerContent.includes('ready to submit your answers?');
-        if (hasInteractivePattern) {
-            return 'waiting_input';
-        }
-        // Check for waiting prompts with box character
-        if (content.includes('│ Do you want') ||
-            content.includes('│ Would you like')) {
-            return 'waiting_input';
-        }
         // Check for "Do you want" or "Would you like" pattern with options
         // Handles both simple ("Do you want...\nYes") and complex (numbered options) formats
         if (/(?:do you want|would you like).+\n+[\s\S]*?(?:yes|❯)/.test(lowerContent)) {

package/dist/types/index.d.ts

@@ -110,6 +110,7 @@ export interface ConfigurationData {
     autoApproval?: {
         enabled: boolean;
         customCommand?: string;
+        timeout?: number;
     };
 }
 export interface GitProject {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "3.0.0",
+	"version": "3.1.1",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",