ccmanager 3.6.0 → 3.6.3

package/dist/components/Menu.recent-projects.test.js

@@ -126,7 +126,9 @@ describe('Menu - Recent Projects', () => {
             backgroundTasks: 0,
         });
         vi.spyOn(SessionManager, 'formatSessionCounts').mockReturnValue('');
-        const { lastFrame } = render(_jsx(Menu, { sessionManager: mockSessionManager, worktreeService: mockWorktreeService, onSelectWorktree: vi.fn(), onSelectRecentProject: vi.fn(), multiProject: true, version: "test" }));
+        const { lastFrame, rerender } = render(_jsx(Menu, { sessionManager: mockSessionManager, worktreeService: mockWorktreeService, onSelectWorktree: vi.fn(), onSelectRecentProject: vi.fn(), multiProject: true, version: "test" }));
+        // Force a rerender to ensure all effects have run
+        rerender(_jsx(Menu, { sessionManager: mockSessionManager, worktreeService: mockWorktreeService, onSelectWorktree: vi.fn(), onSelectRecentProject: vi.fn(), multiProject: true, version: "test" }));
         // Wait for Effect to execute
         await new Promise(resolve => setTimeout(resolve, 100));
         const output = lastFrame();

package/dist/services/sessionManager.d.ts

@@ -17,6 +17,7 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private spawn;
     detectTerminalState(session: Session): SessionState;
     detectBackgroundTask(session: Session): number;
+    private getTerminalContent;
     private handleAutoApproval;
     private cancelAutoApprovalVerification;
     /**

package/dist/services/sessionManager.js

@@ -46,6 +46,11 @@ export class SessionManager extends EventEmitter {
     detectBackgroundTask(session) {
         return session.stateDetector.detectBackgroundTask(session.terminal);
     }
+    getTerminalContent(session) {
+        // Use the new screen capture utility that correctly handles
+        // both normal and alternate screen buffers
+        return getTerminalScreenContent(session.terminal, TERMINAL_CONTENT_MAX_LINES);
+    }
     handleAutoApproval(session) {
         // Cancel any existing verification before starting a new one
         this.cancelAutoApprovalVerification(session, 'Restarting verification for pending auto-approval state');
@@ -56,7 +61,7 @@ export class SessionManager extends EventEmitter {
             autoApprovalReason: undefined,
         }));
         // Get terminal content for verification
-        const terminalContent = getTerminalScreenContent(session.terminal, TERMINAL_CONTENT_MAX_LINES);
+        const terminalContent = this.getTerminalContent(session);
         // Verify if permission is needed
         void Effect.runPromise(autoApprovalVerifier.verifyNeedsPermission(terminalContent, {
             signal: abortController.signal,

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

@@ -221,6 +221,58 @@ describe('ClaudeStateDetector', () => {
             // Assert
             expect(state).toBe('waiting_input');
         });
+        it('should detect idle when scrolled past old busy state (baseY > 0)', () => {
+            // Arrange - Simulate scrollback where "esc to interrupt" is in history
+            // but the current viewport (baseY=5, rows=3) shows idle content
+            // Buffer: [0]: "Old content", [1]: "esc to interrupt", [2]: "More busy output",
+            //         [3]: "...", [4]: "...", [5]: "Ready", [6]: "Prompt >", [7]: "idle"
+            // Viewport shows lines 5-7 (baseY=5, rows=3)
+            terminal = createMockTerminal([
+                'Old content',
+                'Previous output with esc to interrupt marker',
+                'More old busy output',
+                'Transition content',
+                'Processing done',
+                'Ready for input',
+                'Prompt >',
+                'idle state here',
+            ], { baseY: 5, rows: 3 });
+            // Act
+            const state = detector.detectState(terminal, 'busy');
+            // Assert - Should detect idle because viewport shows lines 5-7
+            expect(state).toBe('idle');
+        });
+        it('should detect busy when scrolled to busy state (baseY shows busy content)', () => {
+            // Arrange - Viewport shows busy content
+            // Buffer has old idle content at top, busy content in viewport
+            terminal = createMockTerminal([
+                'Old idle content',
+                'Previous prompt',
+                'User input',
+                'Processing request...',
+                'Press esc to interrupt',
+                'Working...',
+            ], { baseY: 3, rows: 3 });
+            // Act
+            const state = detector.detectState(terminal, 'idle');
+            // Assert - Should detect busy because viewport shows lines 3-5
+            expect(state).toBe('busy');
+        });
+        it('should detect waiting_input when viewport shows prompt after scroll', () => {
+            // Arrange - Scrollback has busy markers, but viewport shows waiting prompt
+            terminal = createMockTerminal([
+                'Previous busy content',
+                'esc to interrupt was here',
+                'Old output',
+                'Do you want to continue?',
+                '❯ 1. Yes',
+                '  2. No',
+            ], { baseY: 3, rows: 3 });
+            // Act
+            const state = detector.detectState(terminal, 'busy');
+            // Assert - Should detect waiting_input from viewport
+            expect(state).toBe('waiting_input');
+        });
     });
     describe('detectBackgroundTask', () => {
         it('should return count 1 when "1 background task" is in status bar', () => {

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

@@ -2,10 +2,11 @@ import type { Terminal } from '../../types/index.js';
 /**
  * Creates a mock Terminal object for testing state detectors.
  * @param lines - Array of strings representing terminal output lines
- * @param options - Optional configuration for rows and cols
+ * @param options - Optional configuration for rows, cols, and baseY
  * @returns Mock Terminal object with buffer interface
  */
 export declare const createMockTerminal: (lines: string[], options?: {
     rows?: number;
     cols?: number;
+    baseY?: number;
 }) => Terminal;

package/dist/services/stateDetector/testUtils.js

@@ -1,16 +1,19 @@
 /**
  * Creates a mock Terminal object for testing state detectors.
  * @param lines - Array of strings representing terminal output lines
- * @param options - Optional configuration for rows and cols
+ * @param options - Optional configuration for rows, cols, and baseY
  * @returns Mock Terminal object with buffer interface
  */
 export const createMockTerminal = (lines, options) => {
     const rows = options?.rows ?? lines.length;
     const cols = options?.cols ?? 80;
+    const baseY = options?.baseY ?? 0;
     const buffer = {
         length: lines.length,
         active: {
+            type: 'normal',
             length: lines.length,
+            baseY,
             getLine: (index) => {
                 if (index >= 0 && index < lines.length) {
                     return {

package/dist/utils/screenCapture.js

@@ -15,10 +15,13 @@ function lineToString(line, cols) {
 export function captureScreen(terminal) {
     const buffer = terminal.buffer.active;
     const lines = [];
-    // Capture only the visible screen area (terminal.rows lines)
-    // This works correctly for both normal and alternate screen buffers
+    // baseY is the offset of the viewport within the buffer
+    // For alternate buffer: baseY is always 0
+    // For normal buffer: baseY indicates how much has been scrolled
+    const baseY = buffer.baseY;
+    // Capture the visible viewport (not the beginning of scrollback)
     for (let y = 0; y < terminal.rows; y++) {
-        const line = buffer.getLine(y);
+        const line = buffer.getLine(baseY + y);
         lines.push(lineToString(line, terminal.cols));
     }
     return {

package/package.json

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