ccmanager 3.1.0 → 3.1.2

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/sessionManager.js

@@ -381,10 +381,6 @@ export class SessionManager extends EventEmitter {
                             session.autoApprovalFailed = false;
                             session.autoApprovalReason = undefined;
                         }
-                        // Handle auto-approval if state is pending_auto_approval
-                        if (detectedState === 'pending_auto_approval') {
-                            this.handleAutoApproval(session);
-                        }
                         // Execute status hook asynchronously (non-blocking) using Effect
                         void Effect.runPromise(executeStatusHook(oldState, detectedState, session));
                         this.emit('sessionStateChanged', session);
@@ -396,6 +392,13 @@ export class SessionManager extends EventEmitter {
                 session.pendingState = undefined;
                 session.pendingStateStart = undefined;
             }
+            // Handle auto-approval if state is pending_auto_approval and no verification is in progress.
+            // This ensures auto-approval is retried when the state remains pending_auto_approval
+            // but the previous verification completed (success, failure, timeout, or abort).
+            if (session.state === 'pending_auto_approval' &&
+                !session.autoApprovalAbortController) {
+                this.handleAutoApproval(session);
+            }
         }, STATE_CHECK_INTERVAL_MS);
         // Setup exit handler
         this.setupExitHandler(session);

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/package.json

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