ccmanager 4.1.3 → 4.1.5

package/dist/constants/statePersistence.d.ts

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,9 @@
+// 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;

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

@@ -1,13 +1,8 @@
 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;
@@ -144,17 +139,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_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
+        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
         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_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
+        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
         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_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
+        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
         // State should now be pending_auto_approval (waiting for verification)
         expect(session.stateMutex.getSnapshot().state).toBe('pending_auto_approval');
         expect(verifyNeedsPermissionMock).toHaveBeenCalled();
@@ -170,6 +165,8 @@ 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);
@@ -184,6 +181,7 @@ 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);
     });
@@ -195,7 +193,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_CHECK_INTERVAL_MS * STATE_DETECTION_TICKS_FOR_ASYNC_UPDATE);
+        await vi.advanceTimersByTimeAsync(STATE_MINIMUM_DURATION_MS + STATE_PERSISTENCE_DURATION_MS);
         // State should be pending_auto_approval (waiting for verification)
         expect(session.stateMutex.getSnapshot().state).toBe('pending_auto_approval');
         expect(verifyNeedsPermissionMock).toHaveBeenCalled();
@@ -206,6 +204,8 @@ 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,8 +6,7 @@ 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';
-/** Interval in milliseconds for polling terminal state detection. */
-const STATE_CHECK_INTERVAL_MS = 100;
+import { STATE_PERSISTENCE_DURATION_MS, STATE_CHECK_INTERVAL_MS, STATE_MINIMUM_DURATION_MS, } from '../constants/statePersistence.js';
 import { Effect, Either } from 'effect';
 import { ProcessError, ConfigError } from '../types/errors.js';
 import { autoApprovalVerifier } from './autoApprovalVerifier.js';
@@ -177,6 +176,9 @@ export class SessionManager extends EventEmitter {
         await session.stateMutex.update(data => ({
             ...data,
             state: newState,
+            pendingState: undefined,
+            pendingStateStart: undefined,
+            stateConfirmedAt: Date.now(),
             ...additionalUpdates,
         }));
         if (oldState !== newState) {
@@ -359,27 +361,60 @@ export class SessionManager extends EventEmitter {
     setupBackgroundHandler(session) {
         // Setup data handler
         this.setupDataHandler(session);
-        // Set up interval-based state detection
+        // Set up interval-based state detection with persistence
         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) {
-                // 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}`);
+                // 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,
+                    }));
                 }
-                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 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);
+                    }
                 }
-                void this.updateSessionState(session, detectedState, additionalUpdates);
+            }
+            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,
+                }));
             }
             // 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
@@ -467,6 +502,8 @@ export class SessionManager extends EventEmitter {
                 ...data,
                 autoApprovalFailed: true,
                 autoApprovalReason: reason,
+                pendingState: undefined,
+                pendingStateStart: undefined,
             }));
         }
     }

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

@@ -3,9 +3,8 @@ 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;
@@ -42,7 +41,7 @@ vi.mock('./config/configReader.js', () => ({
         setAutoApprovalEnabled: vi.fn(),
     },
 }));
-describe('SessionManager - state detection', () => {
+describe('SessionManager - State Persistence', () => {
     let sessionManager;
     let mockPtyInstances;
     let eventEmitters;
@@ -51,6 +50,7 @@ describe('SessionManager - state detection', () => {
         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();
@@ -79,35 +79,211 @@ describe('SessionManager - state detection', () => {
         vi.useRealTimers();
         vi.clearAllMocks();
     });
-    it('transitions busy to idle after idle debounce and the next poll', async () => {
+    it('should not change state immediately when detected state changes', 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 past idle debounce so detector starts returning idle,
+        // but not enough for persistence to confirm
         await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        // 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 past idle debounce but not persistence+minimum
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        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
         expect(session.stateMutex.getSnapshot().state).toBe('idle');
+        expect(session.stateMutex.getSnapshot().pendingState).toBeUndefined();
+        expect(session.stateMutex.getSnapshot().pendingStateStart).toBeUndefined();
+        expect(stateChangeHandler).toHaveBeenCalledWith(session);
     });
-    it('transitions busy to waiting_input on the next poll without idle debounce', async () => {
+    it('should cancel pending state if detected state changes again before persistence', 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 past idle debounce so detector starts returning idle
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        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 past idle debounce so detector starts returning idle
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        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);
-        expect(session.stateMutex.getSnapshot().state).toBe('waiting_input');
+        // 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('handles multiple sessions independently', async () => {
+    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 past idle debounce so detector returns idle, then one check
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        // 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
+        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS);
+        // 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 past idle debounce so detector returns idle
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        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 past idle debounce but not past persistence + minimum duration
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS +
+            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 past idle debounce + persistence/minimum duration
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + 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
+        // Idle debounce prevents the detector from returning idle for IDLE_DEBOUNCE_MS,
+        // so during a brief redraw (< 1500ms), no pending idle state is set.
+        // Advance a short time — still within the idle debounce window
+        await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS * 3); // 300ms
+        // State should still be busy — idle debounce 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();
+    });
+    it('should handle multiple sessions with independent state persistence', 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 (no idle debounce for waiting_input)
         eventEmitter2.emit('data', 'Do you want to continue?\n❯ 1. Yes');
-        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_CHECK_INTERVAL_MS);
+        // Advance past idle debounce for session 1 + persistence/minimum for both
+        await vi.advanceTimersByTimeAsync(IDLE_DEBOUNCE_MS + STATE_MINIMUM_DURATION_MS + STATE_CHECK_INTERVAL_MS);
+        // Both should now be in their new states
+        // Session 2 (waiting_input) transitions faster since it's not debounced
         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.js

@@ -1,11 +1,8 @@
 import { BaseStateDetector } from './base.js';
-// 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…"
+// Spinner characters used by Claude Code during active processing
+const SPINNER_CHARS = '✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❇❈❉❊❋✢✣✤✥✦✧✨⊛⊕⊙◉◎◍⁂⁕※⍟☼★☆';
+// Matches spinner activity labels like "✽ Tempering…" or "✳ Simplifying recompute_tangents…"
 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,
@@ -125,10 +122,6 @@ export class ClaudeStateDetector extends BaseStateDetector {
         if (SPINNER_ACTIVITY_PATTERN.test(abovePromptBox)) {
             return 'busy';
         }
-        // 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);
     }

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

@@ -330,43 +330,6 @@ 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 = [
                 '✱',

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, autoApprovalFailed, autoApprovalReason, autoApprovalAbortController, backgroundTaskCount, teamMemberCount
+     * Contains: state, pendingState, pendingStateStart, autoApprovalFailed, autoApprovalReason, autoApprovalAbortController
      */
     stateMutex: Mutex<SessionStateData>;
     /**

package/dist/utils/mutex.d.ts

@@ -42,6 +42,9 @@ 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,6 +80,9 @@ 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.3",
+	"version": "4.1.5",
 	"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.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"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "4.1.5",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.1.5",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.1.5",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.1.5",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.1.5"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",