ccmanager 4.1.11 → 4.1.12

package/dist/services/sessionManager.d.ts

@@ -18,8 +18,6 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private autoApprovalDisabledWorktrees;
     private restoringSessions;
     private bufferedRestoreData;
-    private restoreRefreshTimers;
-    private restoreRefreshDeadlines;
     private spawn;
     private resolvePreset;
     detectTerminalState(session: Session): SessionState;
@@ -41,10 +39,6 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private createTerminal;
     private shouldResetRestoreScrollback;
     private getRestoreSnapshot;
-    private scheduleRestoreRefresh;
-    private armRestoreRefreshTimer;
-    private cancelRestoreRefresh;
-    private fireRestoreRefresh;
     private createSessionInternal;
     /**
      * Create session with command preset using Effect-based error handling

package/dist/services/sessionManager.js

@@ -21,15 +21,6 @@ const { Terminal } = pkg;
 const TERMINAL_CONTENT_MAX_LINES = 300;
 const TERMINAL_SCROLLBACK_LINES = 5000;
 const TERMINAL_RESTORE_SCROLLBACK_LINES = 200;
-// Claude Code's Ink-based renderer sometimes splits a single UI redraw across
-// multiple PTY writes with short time gaps. If we snapshot between chunks, the
-// resulting viewport can miss rows (e.g. empty middle area while the top/bottom
-// chrome already rendered). Re-emit the snapshot after the PTY output has been
-// quiet for this long so late chunks are accounted for.
-const RESTORE_REFRESH_QUIET_MS = 120;
-// Cap on how long we wait for quiet before forcing the refresh, so continuous
-// streaming output (e.g. a long busy turn) still produces an updated snapshot.
-const RESTORE_REFRESH_MAX_WAIT_MS = 400;
 export class SessionManager extends EventEmitter {
     sessions;
     waitingWithBottomBorder = new Map();
@@ -37,8 +28,6 @@ export class SessionManager extends EventEmitter {
     autoApprovalDisabledWorktrees = new Set();
     restoringSessions = new Set();
     bufferedRestoreData = new Map();
-    restoreRefreshTimers = new Map();
-    restoreRefreshDeadlines = new Map();
     async spawn(command, args, worktreePath, options = {}) {
         const spawnOptions = {
             name: 'xterm-256color',
@@ -216,7 +205,7 @@ export class SessionManager extends EventEmitter {
             data.includes('\x1b[3J') ||
             data.includes('\x1bc'));
     }
-    getRestoreSnapshot(session, options = {}) {
+    getRestoreSnapshot(session) {
         const activeBuffer = session.terminal.buffer.active;
         if (activeBuffer.type !== 'normal') {
             return session.serializer.serialize({
@@ -228,22 +217,6 @@ export class SessionManager extends EventEmitter {
         if (bufferLength === 0) {
             return '';
         }
-        // While the session is busy, cursor-addressed status-box redraws can push
-        // stale frames into scrollback (e.g. Claude's spinner + token stats line).
-        // Those ghost rows render as duplicated status bars when replayed, so
-        // restore only the viewport during busy state. Refresh re-emits also
-        // bypass scrollback to avoid duplicating history into real-terminal
-        // scrollback on top of the initial emit.
-        const isBusy = session.stateMutex.getSnapshot().state === 'busy';
-        if (options.viewportOnly || isBusy) {
-            const snapshot = session.serializer.serialize({
-                scrollback: 0,
-                excludeAltBuffer: true,
-            });
-            const cursorRow = normalBuffer.cursorY + 1;
-            const cursorCol = normalBuffer.cursorX + 1;
-            return `${snapshot}\x1b[${cursorRow};${cursorCol}H`;
-        }
         const scrollbackStart = Math.max(0, normalBuffer.baseY - TERMINAL_RESTORE_SCROLLBACK_LINES);
         const rangeStart = Math.max(session.restoreScrollbackBaseLine, scrollbackStart);
         const rangeEnd = bufferLength - 1;
@@ -258,56 +231,6 @@ export class SessionManager extends EventEmitter {
         const cursorCol = normalBuffer.cursorX + 1;
         return `${snapshot}\x1b[${cursorRow};${cursorCol}H`;
     }
-    scheduleRestoreRefresh(session) {
-        this.restoreRefreshDeadlines.set(session.id, Date.now() + RESTORE_REFRESH_MAX_WAIT_MS);
-        this.armRestoreRefreshTimer(session);
-    }
-    armRestoreRefreshTimer(session) {
-        const deadline = this.restoreRefreshDeadlines.get(session.id);
-        if (deadline === undefined) {
-            return;
-        }
-        const existing = this.restoreRefreshTimers.get(session.id);
-        if (existing !== undefined) {
-            clearTimeout(existing);
-            this.restoreRefreshTimers.delete(session.id);
-        }
-        const remaining = deadline - Date.now();
-        if (remaining <= 0) {
-            this.fireRestoreRefresh(session);
-            return;
-        }
-        const delay = Math.min(RESTORE_REFRESH_QUIET_MS, remaining);
-        const timer = setTimeout(() => this.fireRestoreRefresh(session), delay);
-        this.restoreRefreshTimers.set(session.id, timer);
-    }
-    cancelRestoreRefresh(session) {
-        const existing = this.restoreRefreshTimers.get(session.id);
-        if (existing !== undefined) {
-            clearTimeout(existing);
-            this.restoreRefreshTimers.delete(session.id);
-        }
-        this.restoreRefreshDeadlines.delete(session.id);
-    }
-    fireRestoreRefresh(session) {
-        this.restoreRefreshTimers.delete(session.id);
-        this.restoreRefreshDeadlines.delete(session.id);
-        if (!session.isActive) {
-            return;
-        }
-        const snapshot = this.getRestoreSnapshot(session, { viewportOnly: true });
-        if (snapshot.length > 0) {
-            // \x1b[2J: clear the viewport before repainting — without this, a
-            //   refresh snapshot shorter than the already-displayed content leaves
-            //   a "ghost tail" of pre-refresh rows at the bottom.
-            // \x1b[?7h / \x1b[?7l: Session.tsx disables auto-wrap (DECAWM) after
-            //   the initial restore, but SerializeAddon omits row separators for
-            //   wrapped lines and relies on DECAWM to advance to the next row
-            //   (see PR #276). Re-enable auto-wrap just for the snapshot write so
-            //   wrapped viewport rows don't overlap, then restore the TUI default.
-            this.emit('sessionRestore', session, `\x1b[?7h\x1b[2J\x1b[H${snapshot}\x1b[?7l`);
-        }
-    }
     async createSessionInternal(worktreePath, ptyProcess, options = {}) {
         const existingSessions = this.getSessionsForWorktree(worktreePath);
         const maxNumber = existingSessions.reduce((max, s) => Math.max(max, s.sessionNumber), 0);
@@ -411,12 +334,6 @@ export class SessionManager extends EventEmitter {
                     session.terminal.buffer.normal.baseY;
             }
             session.lastActivity = new Date();
-            // If a restore-refresh is pending, each incoming chunk resets the
-            // quiet timer so the follow-up snapshot only fires after Claude's
-            // multi-chunk redraw has settled.
-            if (this.restoreRefreshDeadlines.has(session.id)) {
-                this.armRestoreRefreshTimer(session);
-            }
             // Only emit data events when session is active
             if (session.isActive) {
                 if (this.restoringSessions.has(session.id)) {
@@ -576,12 +493,10 @@ export class SessionManager extends EventEmitter {
                         }
                     }
                 }
-                this.scheduleRestoreRefresh(session);
             }
             else {
                 this.restoringSessions.delete(session.id);
                 this.bufferedRestoreData.delete(session.id);
-                this.cancelRestoreRefresh(session);
             }
         }
     }
@@ -656,7 +571,6 @@ export class SessionManager extends EventEmitter {
             this.waitingWithBottomBorder.delete(sessionId);
             this.restoringSessions.delete(sessionId);
             this.bufferedRestoreData.delete(sessionId);
-            this.cancelRestoreRefresh(session);
             this.emit('sessionDestroyed', session);
         }
     }
@@ -710,7 +624,6 @@ export class SessionManager extends EventEmitter {
                 }
                 this.sessions.delete(sessionId);
                 this.waitingWithBottomBorder.delete(sessionId);
-                this.cancelRestoreRefresh(session);
                 this.emit('sessionDestroyed', session);
             },
             catch: (error) => {

package/dist/services/sessionManager.test.js

@@ -782,7 +782,6 @@ describe('SessionManager', () => {
             });
             vi.mocked(spawn).mockReturnValue(mockPty);
             const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
-            await session.stateMutex.update(data => ({ ...data, state: 'idle' }));
             const normalBuffer = session.terminal.buffer.normal;
             normalBuffer.baseY = 260;
             normalBuffer.length = 300;
@@ -804,32 +803,6 @@ describe('SessionManager', () => {
             });
             expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mrestored\u001b[0m\u001b[8;12H');
         });
-        it('should emit a viewport-only restore snapshot while session is busy', async () => {
-            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
-                id: '1',
-                name: 'Main',
-                command: 'claude',
-            });
-            vi.mocked(spawn).mockReturnValue(mockPty);
-            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
-            const normalBuffer = session.terminal.buffer.normal;
-            normalBuffer.baseY = 260;
-            normalBuffer.length = 300;
-            normalBuffer.cursorY = 7;
-            normalBuffer.cursorX = 11;
-            session.restoreScrollbackBaseLine = 120;
-            const serializeMock = vi
-                .spyOn(session.serializer, 'serialize')
-                .mockReturnValue('\u001b[31mbusy-viewport\u001b[0m');
-            const restoreHandler = vi.fn();
-            sessionManager.on('sessionRestore', restoreHandler);
-            sessionManager.setSessionActive(session.id, true);
-            expect(serializeMock).toHaveBeenCalledWith({
-                scrollback: 0,
-                excludeAltBuffer: true,
-            });
-            expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mbusy-viewport\u001b[0m\u001b[8;12H');
-        });
         it('should keep viewport-only restore behavior for alternate screen sessions', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
@@ -899,90 +872,6 @@ describe('SessionManager', () => {
             sessionManager.setSessionActive(session.id, true);
             expect(eventOrder).toEqual(['restore', 'data']);
         });
-        it('should re-emit a viewport-only snapshot after the PTY quiet period', async () => {
-            vi.useFakeTimers();
-            try {
-                vi.mocked(configReader.getDefaultPreset).mockReturnValue({
-                    id: '1',
-                    name: 'Main',
-                    command: 'claude',
-                });
-                vi.mocked(spawn).mockReturnValue(mockPty);
-                const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
-                session.terminal.buffer.normal.length = 1;
-                const serializeMock = vi
-                    .spyOn(session.serializer, 'serialize')
-                    .mockReturnValue('snap');
-                const restoreHandler = vi.fn();
-                sessionManager.on('sessionRestore', restoreHandler);
-                sessionManager.setSessionActive(session.id, true);
-                expect(restoreHandler).toHaveBeenCalledTimes(1);
-                await vi.advanceTimersByTimeAsync(50);
-                mockPty.emit('data', 'late-chunk');
-                await vi.advanceTimersByTimeAsync(50);
-                expect(restoreHandler).toHaveBeenCalledTimes(1);
-                await vi.advanceTimersByTimeAsync(120);
-                expect(restoreHandler).toHaveBeenCalledTimes(2);
-                expect(restoreHandler.mock.calls[1]?.[1]).toMatch(/^\u001b\[\?7h\u001b\[2J\u001b\[Hsnap.*\u001b\[\?7l$/);
-                expect(serializeMock).toHaveBeenLastCalledWith({
-                    scrollback: 0,
-                    excludeAltBuffer: true,
-                });
-            }
-            finally {
-                vi.useRealTimers();
-            }
-        });
-        it('should force a refresh at the max-wait deadline even while data keeps streaming', async () => {
-            vi.useFakeTimers();
-            try {
-                vi.mocked(configReader.getDefaultPreset).mockReturnValue({
-                    id: '1',
-                    name: 'Main',
-                    command: 'claude',
-                });
-                vi.mocked(spawn).mockReturnValue(mockPty);
-                const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
-                session.terminal.buffer.normal.length = 1;
-                vi.spyOn(session.serializer, 'serialize').mockReturnValue('snap');
-                const restoreHandler = vi.fn();
-                sessionManager.on('sessionRestore', restoreHandler);
-                sessionManager.setSessionActive(session.id, true);
-                expect(restoreHandler).toHaveBeenCalledTimes(1);
-                for (let elapsed = 0; elapsed < 400; elapsed += 50) {
-                    await vi.advanceTimersByTimeAsync(50);
-                    mockPty.emit('data', 'chunk');
-                }
-                expect(restoreHandler).toHaveBeenCalledTimes(2);
-            }
-            finally {
-                vi.useRealTimers();
-            }
-        });
-        it('should cancel a scheduled refresh when the session is deactivated', async () => {
-            vi.useFakeTimers();
-            try {
-                vi.mocked(configReader.getDefaultPreset).mockReturnValue({
-                    id: '1',
-                    name: 'Main',
-                    command: 'claude',
-                });
-                vi.mocked(spawn).mockReturnValue(mockPty);
-                const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
-                session.terminal.buffer.normal.length = 1;
-                vi.spyOn(session.serializer, 'serialize').mockReturnValue('snap');
-                const restoreHandler = vi.fn();
-                sessionManager.on('sessionRestore', restoreHandler);
-                sessionManager.setSessionActive(session.id, true);
-                expect(restoreHandler).toHaveBeenCalledTimes(1);
-                sessionManager.setSessionActive(session.id, false);
-                await vi.advanceTimersByTimeAsync(500);
-                expect(restoreHandler).toHaveBeenCalledTimes(1);
-            }
-            finally {
-                vi.useRealTimers();
-            }
-        });
     });
     describe('static methods', () => {
         describe('getSessionCounts', () => {

package/dist/services/stateDetector/codex.js

@@ -15,7 +15,8 @@ export class CodexStateDetector extends BaseStateDetector {
         // Check for waiting prompts
         if (lowerContent.includes('allow command?') ||
             lowerContent.includes('[y/n]') ||
-            lowerContent.includes('yes (y)')) {
+            lowerContent.includes('yes (y)') ||
+            lowerContent.includes('enter to submit')) {
             return 'waiting_input';
         }
         if (/(do you want|would you like)[\s\S]*?\n+[\s\S]*?\byes\b/.test(lowerContent)) {

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

@@ -171,4 +171,24 @@ describe('CodexStateDetector', () => {
         // Assert
         expect(state).toBe('waiting_input');
     });
+    it('should detect waiting_input for MCP tool permission prompt with "enter to submit"', () => {
+        // Arrange
+        terminal = createMockTerminal([
+            'Field 1/1',
+            'Allow the chrome-devtools MCP server to run tool "new_page"?',
+            '',
+            'timeout: 10000',
+            'url: http://localhost:4000/scenarios',
+            '',
+            '› 1. Allow                   Run the tool and continue.',
+            '2. Allow for this session  Run the tool and remember this choice for this session.',
+            '3. Always allow            Run the tool and remember this choice for future tool calls.',
+            '4. Cancel                  Cancel this tool call',
+            'enter to submit | esc to cancel',
+        ]);
+        // Act
+        const state = detector.detectState(terminal, 'idle');
+        // Assert
+        expect(state).toBe('waiting_input');
+    });
 });

package/package.json

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