ccmanager 4.1.6 → 4.1.7

package/dist/components/Session.js

@@ -65,9 +65,9 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         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.
+        // render wrapped lines. It omits row separators for wrapped rows and expects
+        // characters to naturally overflow to the next line, so auto-wrap must stay
+        // enabled while writing the snapshot and only be disabled afterward.
         const handleSessionRestore = (restoredSession, restoreSnapshot) => {
             if (restoredSession.id === session.id) {
                 if (restoreSnapshot.length > 0) {
@@ -109,15 +109,12 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             /* empty */
         }
         // Mark session as active after resizing so the restore snapshot matches
-        // the current terminal dimensions.  setSessionActive synchronously emits
-        // the 'sessionRestore' event, so the snapshot is written to stdout before
-        // we proceed.
+        // the current terminal dimensions. setSessionActive synchronously emits the
+        // restore 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.
+        // cursor-up clears. This must happen after the restore snapshot write,
+        // otherwise wrapped restore content can overlap on the same row.
         stdout.write('\x1b[?7l');
         // Handle terminal resize
         const handleResize = () => {

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

@@ -69,13 +69,25 @@ vi.mock('@xterm/addon-serialize', () => ({
 vi.mock('@xterm/headless', () => ({
     default: {
         Terminal: vi.fn().mockImplementation(function () {
+            const normalBuffer = {
+                type: 'normal',
+                baseY: 0,
+                cursorY: 0,
+                cursorX: 0,
+                length: 0,
+                getLine: vi.fn(),
+            };
             return {
                 rows: 24,
                 cols: 80,
                 buffer: {
-                    active: {
-                        type: 'normal',
+                    active: normalBuffer,
+                    normal: normalBuffer,
+                    alternate: {
+                        type: 'alternate',
                         baseY: 0,
+                        cursorY: 0,
+                        cursorX: 0,
                         length: 0,
                         getLine: vi.fn(),
                     },

package/dist/services/sessionManager.d.ts

@@ -16,6 +16,8 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private waitingWithBottomBorder;
     private busyTimers;
     private autoApprovalDisabledWorktrees;
+    private restoringSessions;
+    private bufferedRestoreData;
     private spawn;
     private resolvePreset;
     detectTerminalState(session: Session): SessionState;
@@ -35,6 +37,7 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private updateSessionState;
     constructor();
     private createTerminal;
+    private shouldResetRestoreScrollback;
     private getRestoreSnapshot;
     private createSessionInternal;
     /**

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

@@ -46,13 +46,25 @@ vi.mock('@xterm/addon-serialize', () => ({
 vi.mock('@xterm/headless', () => ({
     default: {
         Terminal: vi.fn().mockImplementation(function () {
+            const normalBuffer = {
+                type: 'normal',
+                baseY: 0,
+                cursorY: 0,
+                cursorX: 0,
+                length: 0,
+                getLine: vi.fn(),
+            };
             return {
                 rows: 24,
                 cols: 80,
                 buffer: {
-                    active: {
-                        type: 'normal',
+                    active: normalBuffer,
+                    normal: normalBuffer,
+                    alternate: {
+                        type: 'alternate',
                         baseY: 0,
+                        cursorY: 0,
+                        cursorX: 0,
                         length: 0,
                         getLine: vi.fn(),
                     },

package/dist/services/sessionManager.js

@@ -20,11 +20,14 @@ import { preparePresetLaunch } from '../utils/presetPrompt.js';
 const { Terminal } = pkg;
 const TERMINAL_CONTENT_MAX_LINES = 300;
 const TERMINAL_SCROLLBACK_LINES = 5000;
+const TERMINAL_RESTORE_SCROLLBACK_LINES = 200;
 export class SessionManager extends EventEmitter {
     sessions;
     waitingWithBottomBorder = new Map();
     busyTimers = new Map();
     autoApprovalDisabledWorktrees = new Set();
+    restoringSessions = new Set();
+    bufferedRestoreData = new Map();
     async spawn(command, args, worktreePath, options = {}) {
         const spawnOptions = {
             name: 'xterm-256color',
@@ -197,10 +200,36 @@ export class SessionManager extends EventEmitter {
             logLevel: 'off',
         });
     }
+    shouldResetRestoreScrollback(data) {
+        return (data.includes('\x1b[2J') ||
+            data.includes('\x1b[3J') ||
+            data.includes('\x1bc'));
+    }
     getRestoreSnapshot(session) {
-        return session.serializer.serialize({
-            scrollback: 0,
+        const activeBuffer = session.terminal.buffer.active;
+        if (activeBuffer.type !== 'normal') {
+            return session.serializer.serialize({
+                scrollback: 0,
+            });
+        }
+        const normalBuffer = session.terminal.buffer.normal;
+        const bufferLength = normalBuffer.length;
+        if (bufferLength === 0) {
+            return '';
+        }
+        const scrollbackStart = Math.max(0, normalBuffer.baseY - TERMINAL_RESTORE_SCROLLBACK_LINES);
+        const rangeStart = Math.max(session.restoreScrollbackBaseLine, scrollbackStart);
+        const rangeEnd = bufferLength - 1;
+        const snapshot = session.serializer.serialize({
+            range: {
+                start: rangeStart,
+                end: rangeEnd,
+            },
+            excludeAltBuffer: true,
         });
+        const cursorRow = normalBuffer.cursorY + 1;
+        const cursorCol = normalBuffer.cursorX + 1;
+        return `${snapshot}\x1b[${cursorRow};${cursorCol}H`;
     }
     async createSessionInternal(worktreePath, ptyProcess, options = {}) {
         const existingSessions = this.getSessionsForWorktree(worktreePath);
@@ -224,6 +253,7 @@ export class SessionManager extends EventEmitter {
             isActive: false,
             terminal,
             serializer,
+            restoreScrollbackBaseLine: 0,
             stateCheckInterval: undefined, // Will be set in setupBackgroundHandler
             isPrimaryCommand: options.isPrimaryCommand ?? true,
             presetName: options.presetName,
@@ -299,9 +329,19 @@ export class SessionManager extends EventEmitter {
         session.process.onData((data) => {
             // Write data to virtual terminal
             session.terminal.write(data);
+            if (this.shouldResetRestoreScrollback(data)) {
+                session.restoreScrollbackBaseLine =
+                    session.terminal.buffer.normal.baseY;
+            }
             session.lastActivity = new Date();
             // Only emit data events when session is active
             if (session.isActive) {
+                if (this.restoringSessions.has(session.id)) {
+                    const bufferedData = this.bufferedRestoreData.get(session.id) ?? [];
+                    bufferedData.push(data);
+                    this.bufferedRestoreData.set(session.id, bufferedData);
+                    return;
+                }
                 this.emit('sessionData', session, data);
             }
         });
@@ -436,10 +476,27 @@ export class SessionManager extends EventEmitter {
             session.isActive = active;
             if (active) {
                 session.lastAccessedAt = Date.now();
-                const restoreSnapshot = this.getRestoreSnapshot(session);
-                if (restoreSnapshot.length > 0) {
-                    this.emit('sessionRestore', session, restoreSnapshot);
+                this.restoringSessions.add(session.id);
+                try {
+                    const restoreSnapshot = this.getRestoreSnapshot(session);
+                    if (restoreSnapshot.length > 0) {
+                        this.emit('sessionRestore', session, restoreSnapshot);
+                    }
                 }
+                finally {
+                    this.restoringSessions.delete(session.id);
+                    const bufferedData = this.bufferedRestoreData.get(session.id);
+                    if (bufferedData && bufferedData.length > 0) {
+                        this.bufferedRestoreData.delete(session.id);
+                        for (const chunk of bufferedData) {
+                            this.emit('sessionData', session, chunk);
+                        }
+                    }
+                }
+            }
+            else {
+                this.restoringSessions.delete(session.id);
+                this.bufferedRestoreData.delete(session.id);
             }
         }
     }
@@ -512,6 +569,8 @@ export class SessionManager extends EventEmitter {
             }
             this.sessions.delete(sessionId);
             this.waitingWithBottomBorder.delete(sessionId);
+            this.restoringSessions.delete(sessionId);
+            this.bufferedRestoreData.delete(sessionId);
             this.emit('sessionDestroyed', session);
         }
     }

package/dist/services/sessionManager.test.js

@@ -50,13 +50,27 @@ vi.mock('@xterm/addon-serialize', () => ({
 vi.mock('@xterm/headless', () => ({
     default: {
         Terminal: vi.fn(function () {
+            const normalBuffer = {
+                type: 'normal',
+                baseY: 0,
+                cursorY: 0,
+                cursorX: 0,
+                length: 0,
+                getLine: vi.fn(function () {
+                    return null;
+                }),
+            };
             return {
                 rows: 24,
                 cols: 80,
                 buffer: {
-                    active: {
-                        type: 'normal',
+                    active: normalBuffer,
+                    normal: normalBuffer,
+                    alternate: {
+                        type: 'alternate',
                         baseY: 0,
+                        cursorY: 0,
+                        cursorX: 0,
                         length: 0,
                         getLine: vi.fn(function () {
                             return null;
@@ -760,7 +774,7 @@ describe('SessionManager', () => {
         });
     });
     describe('session restore snapshots', () => {
-        it('should emit serialized terminal output when activating a session', async () => {
+        it('should emit a bounded normal-buffer restore snapshot and restore the cursor position', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
@@ -768,14 +782,44 @@ describe('SessionManager', () => {
             });
             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[31mrestored\u001b[0m');
             const restoreHandler = vi.fn();
             sessionManager.on('sessionRestore', restoreHandler);
             sessionManager.setSessionActive(session.id, true);
+            expect(serializeMock).toHaveBeenCalledWith({
+                range: {
+                    start: 120,
+                    end: 299,
+                },
+                excludeAltBuffer: true,
+            });
+            expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mrestored\u001b[0m\u001b[8;12H');
+        });
+        it('should keep viewport-only restore behavior for alternate screen sessions', 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'));
+            session.terminal.buffer.active = session.terminal.buffer.alternate;
+            const serializeMock = vi
+                .spyOn(session.serializer, 'serialize')
+                .mockReturnValue('\u001b[31malt\u001b[0m');
+            const restoreHandler = vi.fn();
+            sessionManager.on('sessionRestore', restoreHandler);
+            sessionManager.setSessionActive(session.id, true);
             expect(serializeMock).toHaveBeenCalledWith({ scrollback: 0 });
-            expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mrestored\u001b[0m');
+            expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31malt\u001b[0m');
         });
         it('should skip restore event when serialized output is empty', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
@@ -791,6 +835,43 @@ describe('SessionManager', () => {
             sessionManager.setSessionActive(session.id, true);
             expect(restoreHandler).not.toHaveBeenCalled();
         });
+        it('should reset restore scrollback baseline after a clear-screen sequence', 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'));
+            session.terminal.buffer.normal.baseY = 17;
+            mockPty.emit('data', '\x1b[2J\x1b[Hfresh');
+            expect(session.restoreScrollbackBaseLine).toBe(17);
+        });
+        it('should flush live session data after the restore snapshot completes', 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'));
+            session.terminal.buffer.normal.length = 1;
+            vi.spyOn(session.serializer, 'serialize').mockReturnValue('restored');
+            const eventOrder = [];
+            sessionManager.on('sessionRestore', restoredSession => {
+                if (restoredSession.id === session.id) {
+                    eventOrder.push('restore');
+                    mockPty.emit('data', 'live-output');
+                }
+            });
+            sessionManager.on('sessionData', activeSession => {
+                if (activeSession.id === session.id) {
+                    eventOrder.push('data');
+                }
+            });
+            sessionManager.setSessionActive(session.id, true);
+            expect(eventOrder).toEqual(['restore', 'data']);
+        });
     });
     describe('static methods', () => {
         describe('getSessionCounts', () => {

package/dist/types/index.d.ts

@@ -30,6 +30,7 @@ export interface Session {
     isActive: boolean;
     terminal: Terminal;
     serializer: SerializeAddon;
+    restoreScrollbackBaseLine: number;
     stateCheckInterval: NodeJS.Timeout | undefined;
     isPrimaryCommand: boolean;
     presetName: string | undefined;

package/dist/utils/hookExecutor.test.js

@@ -383,6 +383,7 @@ describe('hookExecutor Integration Tests', () => {
                 process: {},
                 terminal: {},
                 serializer: {},
+                restoreScrollbackBaseLine: 0,
                 output: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
@@ -442,6 +443,7 @@ describe('hookExecutor Integration Tests', () => {
                 process: {},
                 terminal: {},
                 serializer: {},
+                restoreScrollbackBaseLine: 0,
                 output: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
@@ -499,6 +501,7 @@ describe('hookExecutor Integration Tests', () => {
                 process: {},
                 terminal: {},
                 serializer: {},
+                restoreScrollbackBaseLine: 0,
                 output: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
@@ -558,6 +561,7 @@ describe('hookExecutor Integration Tests', () => {
                 process: {},
                 terminal: {},
                 serializer: {},
+                restoreScrollbackBaseLine: 0,
                 output: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,

package/dist/utils/worktreeUtils.test.js

@@ -133,6 +133,7 @@ describe('prepareSessionItems', () => {
         isActive: true,
         terminal: {},
         serializer: {},
+        restoreScrollbackBaseLine: 0,
         stateCheckInterval: undefined,
         isPrimaryCommand: true,
         presetName: undefined,

package/package.json

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