ccmanager 4.1.1 → 4.1.3

package/dist/components/Session.js

@@ -61,11 +61,13 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             session.process.write(data);
         };
         stdin.on('data', handleStdinData);
-        // Prevent line wrapping from drifting redraws in TUIs that rely on cursor-up clears.
-        stdout.write('\x1b[?7l');
         // Clear screen when entering session
         stdout.write('\x1B[2J\x1B[H');
         // Restore the current terminal state from the headless xterm snapshot.
+        // The xterm serialize addon relies on auto-wrap (DECAWM) being enabled to
+        // render wrapped lines — it omits row separators for wrapped rows, expecting
+        // characters to naturally overflow to the next line.  We therefore keep
+        // auto-wrap enabled while writing the snapshot and only disable it afterward.
         const handleSessionRestore = (restoredSession, restoreSnapshot) => {
             if (restoredSession.id === session.id) {
                 if (restoreSnapshot.length > 0) {
@@ -107,8 +109,16 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             /* empty */
         }
         // Mark session as active after resizing so the restore snapshot matches
-        // the current terminal dimensions.
+        // the current terminal dimensions.  setSessionActive synchronously emits
+        // the 'sessionRestore' event, so the snapshot is written to stdout before
+        // we proceed.
         sessionManager.setSessionActive(session.id, true);
+        // Prevent line wrapping from drifting redraws in TUIs that rely on
+        // cursor-up clears.  This MUST come after the restore snapshot write
+        // because the xterm serialize addon relies on auto-wrap (DECAWM) being
+        // enabled — it omits row separators for wrapped rows, expecting characters
+        // to naturally overflow to the next line.
+        stdout.write('\x1b[?7l');
         // Handle terminal resize
         const handleResize = () => {
             const cols = process.stdout.columns || 80;

package/dist/components/Session.test.js

@@ -96,6 +96,7 @@ describe('Session', () => {
         expect(terminalResize).toHaveBeenCalledWith(120, 40);
         expect(processResize.mock.invocationCallOrder[0] ?? 0).toBeLessThan(setSessionActive.mock.invocationCallOrder[0] ?? 0);
         expect(terminalResize.mock.invocationCallOrder[0] ?? 0).toBeLessThan(setSessionActive.mock.invocationCallOrder[0] ?? 0);
-        expect(testState.stdout?.write).toHaveBeenNthCalledWith(3, '\nrestored');
+        expect(testState.stdout?.write).toHaveBeenNthCalledWith(2, '\nrestored');
+        expect(testState.stdout?.write).toHaveBeenNthCalledWith(3, '\x1b[?7l');
     });
 });

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

@@ -1,8 +1,13 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { EventEmitter } from 'events';
 import { spawn } from './bunTerminal.js';
-import { STATE_PERSISTENCE_DURATION_MS, STATE_MINIMUM_DURATION_MS, } from '../constants/statePersistence.js';
 import { Effect, Either } from 'effect';
+/**
+ * Must match `STATE_CHECK_INTERVAL_MS` in sessionManager.ts.
+ * State updates are async; the next interval tick sees the new state and runs auto-approval.
+ */
+const STATE_CHECK_INTERVAL_MS = 100;
+const STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE = 2;
 const detectStateMock = vi.fn();
 // Create a deferred promise pattern for controllable mock
 let verifyResolve = null;
@@ -139,17 +144,17 @@ describe('SessionManager - Auto Approval Recovery', () => {
         }));
         // Phase 1: waiting_input (auto-approval suppressed due to prior failure)
         detectStateMock.mockReturnValue('waiting_input');
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
+        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
         expect(session.stateMutex.getSnapshot().state).toBe('waiting_input');
         expect(session.stateMutex.getSnapshot().autoApprovalFailed).toBe(true);
         // Phase 2: busy - should reset the failure flag
         detectStateMock.mockReturnValue('busy');
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
+        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
         expect(session.stateMutex.getSnapshot().state).toBe('busy');
         expect(session.stateMutex.getSnapshot().autoApprovalFailed).toBe(false);
         // Phase 3: waiting_input again - should trigger pending_auto_approval
         detectStateMock.mockReturnValue('waiting_input');
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
+        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
         // State should now be pending_auto_approval (waiting for verification)
         expect(session.stateMutex.getSnapshot().state).toBe('pending_auto_approval');
         expect(verifyNeedsPermissionMock).toHaveBeenCalled();
@@ -165,8 +170,6 @@ describe('SessionManager - Auto Approval Recovery', () => {
             ...data,
             state: 'pending_auto_approval',
             autoApprovalAbortController: abortController,
-            pendingState: 'pending_auto_approval',
-            pendingStateStart: Date.now(),
         }));
         const handler = vi.fn();
         sessionManager.on('sessionStateChanged', handler);
@@ -181,7 +184,6 @@ describe('SessionManager - Auto Approval Recovery', () => {
         expect(stateData.autoApprovalAbortController).toBeUndefined();
         expect(stateData.autoApprovalFailed).toBe(true);
         expect(stateData.state).toBe('waiting_input');
-        expect(stateData.pendingState).toBeUndefined();
         expect(handler).toHaveBeenCalledWith(session);
         sessionManager.off('sessionStateChanged', handler);
     });
@@ -193,7 +195,7 @@ describe('SessionManager - Auto Approval Recovery', () => {
         sessionManager.on('sessionStateChanged', handler);
         // Phase 1: waiting_input → pending_auto_approval
         detectStateMock.mockReturnValue('waiting_input');
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
+        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
         // State should be pending_auto_approval (waiting for verification)
         expect(session.stateMutex.getSnapshot().state).toBe('pending_auto_approval');
         expect(verifyNeedsPermissionMock).toHaveBeenCalled();
@@ -204,8 +206,6 @@ describe('SessionManager - Auto Approval Recovery', () => {
         await vi.waitFor(() => {
             expect(session.stateMutex.getSnapshot().state).toBe('busy');
         });
-        expect(session.stateMutex.getSnapshot().pendingState).toBeUndefined();
-        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeUndefined();
         // Verify Enter key was sent to approve
         expect(mockPty.write).toHaveBeenCalledWith('\r');
         // Verify sessionStateChanged was emitted with session containing state=busy

package/dist/services/sessionManager.js

@@ -6,7 +6,8 @@ import { spawn as childSpawn } from 'child_process';
 import { configReader } from './config/configReader.js';
 import { executeStatusHook } from '../utils/hookExecutor.js';
 import { createStateDetector } from './stateDetector/index.js';
-import { STATE_PERSISTENCE_DURATION_MS, STATE_CHECK_INTERVAL_MS, STATE_MINIMUM_DURATION_MS, } from '../constants/statePersistence.js';
+/** Interval in milliseconds for polling terminal state detection. */
+const STATE_CHECK_INTERVAL_MS = 100;
 import { Effect, Either } from 'effect';
 import { ProcessError, ConfigError } from '../types/errors.js';
 import { autoApprovalVerifier } from './autoApprovalVerifier.js';
@@ -176,9 +177,6 @@ export class SessionManager extends EventEmitter {
         await session.stateMutex.update(data => ({
             ...data,
             state: newState,
-            pendingState: undefined,
-            pendingStateStart: undefined,
-            stateConfirmedAt: Date.now(),
             ...additionalUpdates,
         }));
         if (oldState !== newState) {
@@ -361,60 +359,27 @@ export class SessionManager extends EventEmitter {
     setupBackgroundHandler(session) {
         // Setup data handler
         this.setupDataHandler(session);
-        // Set up interval-based state detection with persistence
+        // Set up interval-based state detection
         session.stateCheckInterval = setInterval(() => {
             const stateData = session.stateMutex.getSnapshot();
             const oldState = stateData.state;
             const detectedState = this.detectTerminalState(session);
-            const now = Date.now();
-            // If detected state is different from current state
             if (detectedState !== oldState) {
-                // If this is a new pending state or the pending state changed
-                if (stateData.pendingState !== detectedState) {
-                    void session.stateMutex.update(data => ({
-                        ...data,
-                        pendingState: detectedState,
-                        pendingStateStart: now,
-                    }));
+                // Cancel auto-approval verification if state is changing away from pending_auto_approval
+                if (stateData.autoApprovalAbortController &&
+                    detectedState !== 'pending_auto_approval') {
+                    this.cancelAutoApprovalVerification(session, `state changed to ${detectedState}`);
                 }
-                else if (stateData.pendingState !== undefined &&
-                    stateData.pendingStateStart !== undefined) {
-                    // Check if the pending state has persisted long enough
-                    // and that the current state has been active for the minimum duration
-                    const duration = now - stateData.pendingStateStart;
-                    const timeInCurrentState = now - stateData.stateConfirmedAt;
-                    if (duration >= STATE_PERSISTENCE_DURATION_MS &&
-                        timeInCurrentState >= STATE_MINIMUM_DURATION_MS) {
-                        // Cancel auto-approval verification if state is changing away from pending_auto_approval
-                        if (stateData.autoApprovalAbortController &&
-                            detectedState !== 'pending_auto_approval') {
-                            this.cancelAutoApprovalVerification(session, `state changed to ${detectedState}`);
-                        }
-                        // Build additional updates for auto-approval reset
-                        const additionalUpdates = {};
-                        // If we previously blocked auto-approval and have moved out of a user prompt,
-                        // allow future auto-approval attempts.
-                        if (stateData.autoApprovalFailed &&
-                            detectedState !== 'waiting_input' &&
-                            detectedState !== 'pending_auto_approval') {
-                            additionalUpdates.autoApprovalFailed = false;
-                            additionalUpdates.autoApprovalReason = undefined;
-                        }
-                        // Confirm the state change with hook execution
-                        void this.updateSessionState(session, detectedState, additionalUpdates);
-                    }
+                const additionalUpdates = {};
+                // If we previously blocked auto-approval and have moved out of a user prompt,
+                // allow future auto-approval attempts.
+                if (stateData.autoApprovalFailed &&
+                    detectedState !== 'waiting_input' &&
+                    detectedState !== 'pending_auto_approval') {
+                    additionalUpdates.autoApprovalFailed = false;
+                    additionalUpdates.autoApprovalReason = undefined;
                 }
-            }
-            else {
-                // Detected state matches current state, clear any pending state
-                // and update stateConfirmedAt so the minimum duration guard
-                // tracks "last time current state was seen" rather than "first confirmed"
-                void session.stateMutex.update(data => ({
-                    ...data,
-                    pendingState: undefined,
-                    pendingStateStart: undefined,
-                    stateConfirmedAt: now,
-                }));
+                void this.updateSessionState(session, detectedState, additionalUpdates);
             }
             // 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
@@ -502,8 +467,6 @@ export class SessionManager extends EventEmitter {
                 ...data,
                 autoApprovalFailed: true,
                 autoApprovalReason: reason,
-                pendingState: undefined,
-                pendingStateStart: undefined,
             }));
         }
     }

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

@@ -3,7 +3,9 @@ import { Either } from 'effect';
 import { SessionManager } from './sessionManager.js';
 import { spawn } from './bunTerminal.js';
 import { EventEmitter } from 'events';
-import { STATE_PERSISTENCE_DURATION_MS, STATE_CHECK_INTERVAL_MS, STATE_MINIMUM_DURATION_MS, } from '../constants/statePersistence.js';
+import { IDLE_DEBOUNCE_MS } from './stateDetector/claude.js';
+/** Must match `STATE_CHECK_INTERVAL_MS` in sessionManager.ts */
+const STATE_CHECK_INTERVAL_MS = 100;
 vi.mock('./bunTerminal.js', () => ({
     spawn: vi.fn(function () {
         return null;
@@ -40,7 +42,7 @@ vi.mock('./config/configReader.js', () => ({
         setAutoApprovalEnabled: vi.fn(),
     },
 }));
-describe('SessionManager - State Persistence', () => {
+describe('SessionManager - state detection', () => {
     let sessionManager;
     let mockPtyInstances;
     let eventEmitters;
@@ -49,7 +51,6 @@ describe('SessionManager - State Persistence', () => {
         sessionManager = new SessionManager();
         mockPtyInstances = new Map();
         eventEmitters = new Map();
-        // Create mock PTY process factory
         spawn.mockImplementation((command, args, options) => {
             const path = options.cwd;
             const eventEmitter = new EventEmitter();
@@ -78,217 +79,35 @@ describe('SessionManager - State Persistence', () => {
         vi.useRealTimers();
         vi.clearAllMocks();
     });
-    it('should not change state immediately when detected state changes', async () => {
+    it('transitions busy to idle after idle debounce and the next poll', async () => {
         const { Effect } = await import('effect');
         const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
         const eventEmitter = eventEmitters.get('/test/path');
-        // Initial state should be busy
         expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate output that would trigger idle state
         eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time less than persistence duration (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 2);
-        // State should still be busy, but pending state should be set
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('idle');
-        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeDefined();
-    });
-    it('should change state after both persistence and minimum duration are met', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        const stateChangeHandler = vi.fn();
-        sessionManager.on('sessionStateChanged', stateChangeHandler);
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate output that would trigger idle state
-        eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time less than persistence duration (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 2);
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(stateChangeHandler).not.toHaveBeenCalled();
-        // Advance time past both persistence and minimum duration
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS);
-        // State should now be changed
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
         expect(session.stateMutex.getSnapshot().state).toBe('idle');
-        expect(session.stateMutex.getSnapshot().pendingState).toBeUndefined();
-        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeUndefined();
-        expect(stateChangeHandler).toHaveBeenCalledWith(session);
     });
-    it('should cancel pending state if detected state changes again before persistence', async () => {
+    it('transitions busy to waiting_input on the next poll without idle debounce', async () => {
         const { Effect } = await import('effect');
         const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
         const eventEmitter = eventEmitters.get('/test/path');
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate output that would trigger idle state
-        eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time less than persistence duration (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 2);
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('idle');
-        // Simulate output that would trigger waiting_input state
         eventEmitter.emit('data', 'Do you want to continue?\n❯ 1. Yes');
-        // Advance time to trigger another check (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS);
-        // Pending state should now be waiting_input, not idle
-        expect(session.stateMutex.getSnapshot().state).toBe('busy'); // Still original state
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('waiting_input');
-    });
-    it('should clear pending state if detected state returns to current state', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate output that would trigger idle state
-        eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time less than persistence duration (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 2);
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('idle');
-        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeDefined();
-        // Simulate output that would trigger busy state again (back to original)
-        eventEmitter.emit('data', 'ESC to interrupt');
-        // Advance time to trigger another check (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS);
-        // Pending state should be cleared
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(session.stateMutex.getSnapshot().pendingState).toBeUndefined();
-        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeUndefined();
-    });
-    it('should not confirm state changes that do not persist long enough', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        const stateChangeHandler = vi.fn();
-        sessionManager.on('sessionStateChanged', stateChangeHandler);
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Try to change to idle
-        eventEmitter.emit('data', 'Some idle output\n');
-        // Wait for detection but not full persistence (less than 200ms) (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS); // 100ms
-        // Should have pending state but not confirmed
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(session.stateMutex.getSnapshot().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[HDo you want to continue?\n❯ 1. Yes');
-        // Advance time to detect new state but still less than persistence duration from first change (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS); // Another 100ms, total 200ms exactly at threshold
-        // Pending state should have changed to waiting_input
-        expect(session.stateMutex.getSnapshot().state).toBe('busy'); // Still original state
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('waiting_input');
-        // Since states kept changing before persisting, no state change should have been confirmed
-        expect(stateChangeHandler).not.toHaveBeenCalled();
-    });
-    it('should properly clean up pending state when session is destroyed', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        // Simulate output that would trigger idle state
-        eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time less than persistence duration (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 2);
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('idle');
-        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeDefined();
-        // Destroy the session
-        sessionManager.destroySession(session.id);
-        // Check that pending state is cleared
-        const remainingSessions = sessionManager.getSessionsForWorktree('/test/path');
-        expect(remainingSessions).toHaveLength(0);
-    });
-    it('should not transition state before minimum duration in current state has elapsed', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        const stateChangeHandler = vi.fn();
-        sessionManager.on('sessionStateChanged', stateChangeHandler);
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate output that would trigger idle state
-        eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time less than persistence duration so transition is not yet confirmed
-        await vi.advanceTimersByTimeAsync(STATE_PERSISTENCE_DURATION_MS - STATE_CHECK_INTERVAL_MS);
-        // State should still be busy because minimum duration hasn't elapsed
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(stateChangeHandler).not.toHaveBeenCalled();
-    });
-    it('should transition state after both persistence and minimum duration are met', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        const stateChangeHandler = vi.fn();
-        sessionManager.on('sessionStateChanged', stateChangeHandler);
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate output that would trigger idle state
-        eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time past STATE_MINIMUM_DURATION_MS (which is longer than STATE_PERSISTENCE_DURATION_MS)
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_CHECK_INTERVAL_MS);
-        // State should now be idle since both durations are satisfied
-        expect(session.stateMutex.getSnapshot().state).toBe('idle');
-        expect(stateChangeHandler).toHaveBeenCalledWith(session);
-    });
-    it('should not transition during brief screen redraw even after long time in current state', async () => {
-        const { Effect } = await import('effect');
-        const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path'));
-        const eventEmitter = eventEmitters.get('/test/path');
-        const stateChangeHandler = vi.fn();
-        sessionManager.on('sessionStateChanged', stateChangeHandler);
-        // Initial state should be busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Keep busy state active for a long time (simulating normal operation)
-        // Each check re-detects "busy" and updates stateConfirmedAt
-        eventEmitter.emit('data', 'ESC to interrupt');
-        await vi.advanceTimersByTimeAsync(2000); // 2 seconds of confirmed busy
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        // Now simulate a brief screen redraw: busy indicators disappear temporarily
-        eventEmitter.emit('data', '\x1b[2J\x1b[H'); // Clear screen
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS); // 100ms
-        // Pending state should be set to idle
-        expect(session.stateMutex.getSnapshot().pendingState).toBe('idle');
-        // Advance past half the persistence duration but not fully
-        // Since stateConfirmedAt was updated at ~2000ms, this is not enough
-        // for the pending state to be confirmed
-        await vi.advanceTimersByTimeAsync(STATE_PERSISTENCE_DURATION_MS / 2);
-        // State should still be busy because minimum duration since last busy detection hasn't elapsed
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(stateChangeHandler).not.toHaveBeenCalled();
-        // Simulate busy indicators coming back (screen redraw complete)
-        eventEmitter.emit('data', 'ESC to interrupt');
         await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS);
-        // State should still be busy and pending should be cleared
-        expect(session.stateMutex.getSnapshot().state).toBe('busy');
-        expect(session.stateMutex.getSnapshot().pendingState).toBeUndefined();
-        expect(stateChangeHandler).not.toHaveBeenCalled();
+        expect(session.stateMutex.getSnapshot().state).toBe('waiting_input');
     });
-    it('should handle multiple sessions with independent state persistence', async () => {
+    it('handles multiple sessions independently', async () => {
         const { Effect } = await import('effect');
         const session1 = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path1'));
         const session2 = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/path2'));
         const eventEmitter1 = eventEmitters.get('/test/path1');
         const eventEmitter2 = eventEmitters.get('/test/path2');
-        // Both should start as busy
         expect(session1.stateMutex.getSnapshot().state).toBe('busy');
         expect(session2.stateMutex.getSnapshot().state).toBe('busy');
-        // Simulate different outputs for each session
-        // 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?\n❯ 1. Yes');
-        // Advance time to check but not confirm (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 2);
-        // Both should have pending states but not changed yet
-        expect(session1.stateMutex.getSnapshot().state).toBe('busy');
-        expect(session1.stateMutex.getSnapshot().pendingState).toBe('idle');
-        expect(session2.stateMutex.getSnapshot().state).toBe('busy');
-        expect(session2.stateMutex.getSnapshot().pendingState).toBe('waiting_input');
-        // Advance time to confirm both - need to exceed STATE_MINIMUM_DURATION_MS (use async to process mutex updates)
-        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS);
-        // Both should now be in their new states
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
         expect(session1.stateMutex.getSnapshot().state).toBe('idle');
-        expect(session1.stateMutex.getSnapshot().pendingState).toBeUndefined();
         expect(session2.stateMutex.getSnapshot().state).toBe('waiting_input');
-        expect(session2.stateMutex.getSnapshot().pendingState).toBeUndefined();
     });
 });

package/dist/services/stateDetector/claude.d.ts

@@ -1,6 +1,18 @@
 import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
+export declare const IDLE_DEBOUNCE_MS = 1500;
 export declare class ClaudeStateDetector extends BaseStateDetector {
+    private lastContentHash;
+    private contentStableSince;
+    /**
+     * Debounce idle transitions: only return 'idle' when the terminal
+     * content has been unchanged for IDLE_DEBOUNCE_MS.
+     * Returns currentState if output is still changing.
+     *
+     * This is a workaround for Claude Code occasionally showing idle-like
+     * terminal output while still busy (e.g. during screen redraws).
+     */
+    private debounceIdle;
     /**
      * Extract content above the prompt box.
      * The prompt box is delimited by ─ border lines:

package/dist/services/stateDetector/claude.js

@@ -1,10 +1,40 @@
 import { BaseStateDetector } from './base.js';
-// Spinner characters used by Claude Code during active processing
-const SPINNER_CHARS = '✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❇❈❉❊❋✢✣✤✥✦✧✨⊛⊕⊙◉◎◍⁂⁕※⍟☼★☆';
-// Matches spinner activity labels like "✽ Tempering…" or "✳ Simplifying recompute_tangents…"
+// Spinner / activity-prefix characters (line must still match SPINNER_ACTIVITY_PATTERN: …ing + …)
+// Includes: ornament spinners; · / • / ∙ / ⋅ bullets; ⏺ (record); ▸▹ triangles; ○● circles
+const SPINNER_CHARS = '✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❇❈❉❊❋✢✣✤✥✦✧✨⊛⊕⊙◉◎◍⁂⁕※⍟☼★☆·•⏺▸▹∙⋅○●';
+// Matches spinner activity labels like "✽ Tempering…", "✳ Simplifying…", or "· Misting…"
 const SPINNER_ACTIVITY_PATTERN = new RegExp(`^[${SPINNER_CHARS}] \\S+ing.*\u2026`, 'm');
+// Session stats above the prompt, e.g. "(9m 21s · ↓ 13.7k tokens)" — requires parens, a digit, and "tokens"
+const TOKEN_STATS_LINE_PATTERN = /\([^)]*\d[^)]*tokens\s*\)/i;
 const BUSY_LOOKBACK_LINES = 5;
+// Workaround: Claude Code sometimes appears idle in terminal output while
+// still actively processing (busy). To mitigate false idle transitions,
+// require terminal output to remain unchanged for this duration before
+// confirming the idle state.
+export const IDLE_DEBOUNCE_MS = 1500;
 export class ClaudeStateDetector extends BaseStateDetector {
+    lastContentHash = '';
+    contentStableSince = 0;
+    /**
+     * Debounce idle transitions: only return 'idle' when the terminal
+     * content has been unchanged for IDLE_DEBOUNCE_MS.
+     * Returns currentState if output is still changing.
+     *
+     * This is a workaround for Claude Code occasionally showing idle-like
+     * terminal output while still busy (e.g. during screen redraws).
+     */
+    debounceIdle(terminal, currentState, now = Date.now()) {
+        const content = this.getTerminalContent(terminal, 30);
+        if (content !== this.lastContentHash) {
+            this.lastContentHash = content;
+            this.contentStableSince = now;
+        }
+        const stableDuration = now - this.contentStableSince;
+        if (stableDuration >= IDLE_DEBOUNCE_MS) {
+            return 'idle';
+        }
+        return currentState;
+    }
     /**
      * Extract content above the prompt box.
      * The prompt box is delimited by ─ border lines:
@@ -62,10 +92,10 @@ export class ClaudeStateDetector extends BaseStateDetector {
         return recentBlock.slice(-BUSY_LOOKBACK_LINES).join('\n');
     }
     detectState(terminal, currentState) {
-        // Check for search prompt (⌕ Search…) within 200 lines - always idle
+        // Check for search prompt (⌕ Search…) within 200 lines - always idle (debounced)
         const extendedContent = this.getTerminalContent(terminal, 200);
         if (extendedContent.includes('⌕ Search…')) {
-            return 'idle';
+            return this.debounceIdle(terminal, currentState);
         }
         // Full content (including prompt box) for waiting_input detection
         const fullContent = this.getTerminalContent(terminal, 30);
@@ -79,10 +109,6 @@ export class ClaudeStateDetector extends BaseStateDetector {
         if (/(?:do you want|would you like).+\n+[\s\S]*?(?:yes|❯)/.test(fullLowerContent)) {
             return 'waiting_input';
         }
-        // Check for selection prompt with ❯ cursor indicator and numbered options
-        if (/❯\s+\d+\./.test(fullContent)) {
-            return 'waiting_input';
-        }
         // Check for "esc to cancel" - indicates waiting for user input
         if (fullLowerContent.includes('esc to cancel')) {
             return 'waiting_input';
@@ -99,8 +125,12 @@ export class ClaudeStateDetector extends BaseStateDetector {
         if (SPINNER_ACTIVITY_PATTERN.test(abovePromptBox)) {
             return 'busy';
         }
-        // Otherwise idle
-        return 'idle';
+        // Usage/time + token count line (often shown above the prompt while a turn is active)
+        if (TOKEN_STATS_LINE_PATTERN.test(abovePromptBox)) {
+            return 'busy';
+        }
+        // Otherwise idle (debounced)
+        return this.debounceIdle(terminal, currentState);
     }
     detectBackgroundTask(terminal) {
         const lines = this.getTerminalLines(terminal, 3);

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

@@ -1,12 +1,25 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { ClaudeStateDetector } from './claude.js';
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { ClaudeStateDetector, IDLE_DEBOUNCE_MS } from './claude.js';
 import { createMockTerminal } from './testUtils.js';
 describe('ClaudeStateDetector', () => {
     let detector;
     let terminal;
     beforeEach(() => {
+        vi.useFakeTimers();
         detector = new ClaudeStateDetector();
     });
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+    /**
+     * Helper: call detectState, advance time past IDLE_DEBOUNCE_MS,
+     * then call again with the same terminal to get the debounced result.
+     */
+    const detectStateAfterDebounce = (det, term, currentState = 'idle') => {
+        det.detectState(term, currentState);
+        vi.advanceTimersByTime(IDLE_DEBOUNCE_MS);
+        return det.detectState(term, currentState);
+    };
     describe('detectState', () => {
         it('should detect busy when "ESC to interrupt" is above prompt box', () => {
             // Arrange
@@ -47,7 +60,7 @@ describe('ClaudeStateDetector', () => {
             // Assert
             expect(state).toBe('busy');
         });
-        it('should detect idle when no specific patterns are found', () => {
+        it('should detect idle when no specific patterns are found (after debounce)', () => {
             // Arrange
             terminal = createMockTerminal([
                 'Command completed successfully',
@@ -55,7 +68,7 @@ describe('ClaudeStateDetector', () => {
                 '> ',
             ]);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -63,7 +76,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange
             terminal = createMockTerminal([]);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -202,33 +215,6 @@ describe('ClaudeStateDetector', () => {
             // Assert
             expect(state).toBe('waiting_input');
         });
-        it('should detect waiting_input when plan submit prompt with ❯ cursor is present', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Ready to submit your answers?',
-                '',
-                '❯ 1. Submit answers',
-                '  2. Cancel',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
-        it('should detect waiting_input for generic ❯ numbered selection prompt', () => {
-            // Arrange
-            terminal = createMockTerminal([
-                'Select an option:',
-                '',
-                '❯ 1. Option A',
-                '  2. Option B',
-                '  3. Option C',
-            ]);
-            // Act
-            const state = detector.detectState(terminal, 'idle');
-            // Assert
-            expect(state).toBe('waiting_input');
-        });
         it('should detect waiting_input when "esc to cancel" is above prompt box', () => {
             // Arrange
             terminal = createMockTerminal([
@@ -283,7 +269,7 @@ describe('ClaudeStateDetector', () => {
                 'idle state here',
             ], { baseY: 5, rows: 3 });
             // Act
-            const state = detector.detectState(terminal, 'busy');
+            const state = detectStateAfterDebounce(detector, terminal, 'busy');
             // Assert - Should detect idle because viewport shows lines 5-7
             expect(state).toBe('idle');
         });
@@ -344,6 +330,43 @@ describe('ClaudeStateDetector', () => {
             // Assert
             expect(state).toBe('busy');
         });
+        it('should detect busy for middle-dot activity label "· …ing…" (e.g. · Misting…)', () => {
+            terminal = createMockTerminal([
+                '· Misting…',
+                '   ⎿  Tip: Run /terminal-setup to enable convenient terminal integration',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            expect(detector.detectState(terminal, 'idle')).toBe('busy');
+        });
+        it('should detect busy when token stats line is above prompt box without interrupt or spinner', () => {
+            terminal = createMockTerminal([
+                '(9m 21s · ↓ 13.7k tokens)',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            expect(detector.detectState(terminal, 'idle')).toBe('busy');
+        });
+        it('should detect busy for token stats line with varied spacing and casing', () => {
+            terminal = createMockTerminal([
+                '  ( 1m · 500 TOKENS )  ',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            expect(detector.detectState(terminal, 'idle')).toBe('busy');
+        });
+        it('should not treat parenthetical text with "tokens" but no digit as busy', () => {
+            terminal = createMockTerminal([
+                '(see tokens in docs)',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            expect(detectStateAfterDebounce(detector, terminal, 'idle')).toBe('idle');
+        });
         it('should detect busy with various spinner characters', () => {
             const spinnerChars = [
                 '✱',
@@ -387,7 +410,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange - no "ing…" at end
             terminal = createMockTerminal(['✽ Some random text', '❯']);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -395,7 +418,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange
             terminal = createMockTerminal(['⌕ Search…', '✽ Tempering…']);
             // Act
-            const state = detector.detectState(terminal, 'busy');
+            const state = detectStateAfterDebounce(detector, terminal, 'busy');
             // Assert - Search prompt takes precedence
             expect(state).toBe('idle');
         });
@@ -403,7 +426,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange - Search prompt should always be idle
             terminal = createMockTerminal(['⌕ Search…', 'Some content']);
             // Act
-            const state = detector.detectState(terminal, 'busy');
+            const state = detectStateAfterDebounce(detector, terminal, 'busy');
             // Assert
             expect(state).toBe('idle');
         });
@@ -411,7 +434,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange
             terminal = createMockTerminal(['⌕ Search…', 'esc to cancel']);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert - Should be idle because search prompt takes precedence
             expect(state).toBe('idle');
         });
@@ -419,7 +442,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange
             terminal = createMockTerminal(['⌕ Search…', 'Press esc to interrupt']);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert - Should be idle because search prompt takes precedence
             expect(state).toBe('idle');
         });
@@ -437,7 +460,7 @@ describe('ClaudeStateDetector', () => {
                 '❯',
                 '──────────────────────────────',
             ]);
-            const state = detector.detectState(terminal, 'busy');
+            const state = detectStateAfterDebounce(detector, terminal, 'busy');
             expect(state).toBe('idle');
         });
         it('should ignore stale interrupt text outside the latest block above the prompt box', () => {
@@ -451,7 +474,7 @@ describe('ClaudeStateDetector', () => {
                 '❯',
                 '──────────────────────────────',
             ]);
-            const state = detector.detectState(terminal, 'busy');
+            const state = detectStateAfterDebounce(detector, terminal, 'busy');
             expect(state).toBe('idle');
         });
         it('should ignore "esc to interrupt" inside prompt box', () => {
@@ -463,7 +486,7 @@ describe('ClaudeStateDetector', () => {
                 '──────────────────────────────',
             ]);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert - should be idle because "esc to interrupt" is inside prompt box
             expect(state).toBe('idle');
         });
@@ -503,10 +526,68 @@ describe('ClaudeStateDetector', () => {
                 '──────────────────────────────',
             ]);
             // Act
-            const state = detector.detectState(terminal, 'idle');
+            const state = detectStateAfterDebounce(detector, terminal, 'idle');
             // Assert - should be idle because spinner is inside prompt box
             expect(state).toBe('idle');
         });
+        describe('idle debounce', () => {
+            it('should not return idle immediately when output just appeared', () => {
+                terminal = createMockTerminal(['Command completed successfully', '> ']);
+                const state = detector.detectState(terminal, 'busy');
+                // Should remain busy because debounce hasn't elapsed
+                expect(state).toBe('busy');
+            });
+            it('should return idle after output is stable for IDLE_DEBOUNCE_MS', () => {
+                terminal = createMockTerminal(['Command completed successfully', '> ']);
+                // First call registers the content
+                detector.detectState(terminal, 'busy');
+                // Advance time past debounce threshold
+                vi.advanceTimersByTime(IDLE_DEBOUNCE_MS);
+                // Second call with same content should return idle
+                const state = detector.detectState(terminal, 'busy');
+                expect(state).toBe('idle');
+            });
+            it('should reset debounce timer when output changes', () => {
+                terminal = createMockTerminal(['Output v1', '> ']);
+                detector.detectState(terminal, 'busy');
+                // Advance almost to threshold
+                vi.advanceTimersByTime(IDLE_DEBOUNCE_MS - 100);
+                // Output changes
+                terminal = createMockTerminal(['Output v2', '> ']);
+                const state1 = detector.detectState(terminal, 'busy');
+                expect(state1).toBe('busy');
+                // Advance past original threshold but not new one
+                vi.advanceTimersByTime(200);
+                const state2 = detector.detectState(terminal, 'busy');
+                expect(state2).toBe('busy');
+                // Advance to meet new threshold
+                vi.advanceTimersByTime(IDLE_DEBOUNCE_MS);
+                const state3 = detector.detectState(terminal, 'busy');
+                expect(state3).toBe('idle');
+            });
+            it('should not debounce busy transitions', () => {
+                terminal = createMockTerminal([
+                    'Processing...',
+                    'Press ESC to interrupt',
+                    '──────────────────────────────',
+                    '❯',
+                    '──────────────────────────────',
+                ]);
+                // Busy should be detected immediately without debounce
+                const state = detector.detectState(terminal, 'idle');
+                expect(state).toBe('busy');
+            });
+            it('should not debounce waiting_input transitions', () => {
+                terminal = createMockTerminal([
+                    'Do you want to continue?',
+                    '❯ 1. Yes',
+                    '  2. No',
+                ]);
+                // waiting_input should be detected immediately
+                const state = detector.detectState(terminal, 'idle');
+                expect(state).toBe('waiting_input');
+            });
+        });
     });
     describe('detectBackgroundTask', () => {
         it('should return count 1 when "1 background task" is in status bar', () => {

package/dist/types/index.d.ts

@@ -38,7 +38,7 @@ export interface Session {
     /**
      * Mutex-protected session state data.
      * Access via stateMutex.runExclusive() or stateMutex.update() to ensure thread-safe operations.
-     * Contains: state, pendingState, pendingStateStart, autoApprovalFailed, autoApprovalReason, autoApprovalAbortController
+     * Contains: state, autoApprovalFailed, autoApprovalReason, autoApprovalAbortController, backgroundTaskCount, teamMemberCount
      */
     stateMutex: Mutex<SessionStateData>;
     /**

package/dist/utils/mutex.d.ts

@@ -42,9 +42,6 @@ export declare class Mutex<T> {
  */
 export interface SessionStateData {
     state: import('../types/index.js').SessionState;
-    pendingState: import('../types/index.js').SessionState | undefined;
-    pendingStateStart: number | undefined;
-    stateConfirmedAt: number;
     autoApprovalFailed: boolean;
     autoApprovalReason: string | undefined;
     autoApprovalAbortController: AbortController | undefined;

package/dist/utils/mutex.js

@@ -80,9 +80,6 @@ export class Mutex {
 export function createInitialSessionStateData() {
     return {
         state: 'busy',
-        pendingState: undefined,
-        pendingStateStart: undefined,
-        stateConfirmedAt: Date.now(),
         autoApprovalFailed: false,
         autoApprovalReason: undefined,
         autoApprovalAbortController: undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "4.1.1",
+	"version": "4.1.3",
 	"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": "4.1.1",
-		"@kodaikabasawa/ccmanager-darwin-x64": "4.1.1",
-		"@kodaikabasawa/ccmanager-linux-arm64": "4.1.1",
-		"@kodaikabasawa/ccmanager-linux-x64": "4.1.1",
-		"@kodaikabasawa/ccmanager-win32-x64": "4.1.1"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "4.1.3",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.1.3",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.1.3",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.1.3",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.1.3"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",

package/dist/constants/statePersistence.d.ts

@@ -1,3 +0,0 @@
-export declare const STATE_PERSISTENCE_DURATION_MS = 1000;
-export declare const STATE_CHECK_INTERVAL_MS = 100;
-export declare const STATE_MINIMUM_DURATION_MS = 1000;

package/dist/constants/statePersistence.js

@@ -1,9 +0,0 @@
-// Duration in milliseconds that a detected state must persist before being confirmed.
-// A higher value prevents transient flicker (e.g., brief "idle" during terminal re-renders)
-// at the cost of slightly slower state transitions.
-export const STATE_PERSISTENCE_DURATION_MS = 1000;
-// Check interval for state detection in milliseconds
-export const STATE_CHECK_INTERVAL_MS = 100;
-// Minimum duration in current state before allowing transition to a new state.
-// Prevents rapid back-and-forth flicker (e.g., busy → idle → busy).
-export const STATE_MINIMUM_DURATION_MS = 1000;