ccmanager 3.5.3 → 3.6.0

package/dist/components/Menu.js

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
-import { Box, Text, useInput } from 'ink';
+import { Box, Text, useInput, useStdout } from 'ink';
 import SelectInput from 'ink-select-input';
 import { Effect } from 'effect';
 import { SessionManager } from '../services/sessionManager.js';
@@ -35,13 +35,29 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
     const [sessions, setSessions] = useState([]);
     const [items, setItems] = useState([]);
     const [recentProjects, setRecentProjects] = useState([]);
-    const limit = 10;
-    // Get worktree configuration for sorting
-    const worktreeConfig = configReader.getWorktreeConfig();
+    const { stdout } = useStdout();
+    const fixedRows = 6;
+    const [terminalRows, setTerminalRows] = useState(stdout.rows);
+    // Update terminal rows on resize
+    useEffect(() => {
+        const handleResize = () => {
+            setTerminalRows(stdout.rows);
+        };
+        stdout.on('resize', handleResize);
+        return () => {
+            stdout.off('resize', handleResize);
+        };
+    }, [stdout]);
     // Use the search mode hook
     const { isSearchMode, searchQuery, selectedIndex, setSearchQuery } = useSearchMode(items.length, {
         isDisabled: !!error || !!loadError,
     });
+    const limit = Math.max(5, terminalRows -
+        fixedRows -
+        (isSearchMode ? 1 : 0) -
+        (error || loadError ? 3 : 0));
+    // Get worktree configuration for sorting
+    const worktreeConfig = configReader.getWorktreeConfig();
     useEffect(() => {
         let cancelled = false;
         // Load worktrees and default branch using Effect composition

package/dist/services/sessionManager.d.ts

@@ -17,7 +17,6 @@ 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,11 +46,6 @@ 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');
@@ -61,7 +56,7 @@ export class SessionManager extends EventEmitter {
             autoApprovalReason: undefined,
         }));
         // Get terminal content for verification
-        const terminalContent = this.getTerminalContent(session);
+        const terminalContent = getTerminalScreenContent(session.terminal, TERMINAL_CONTENT_MAX_LINES);
         // Verify if permission is needed
         void Effect.runPromise(autoApprovalVerifier.verifyNeedsPermission(terminalContent, {
             signal: abortController.signal,
@@ -277,6 +272,11 @@ export class SessionManager extends EventEmitter {
         session.process.onData((data) => {
             // Write data to virtual terminal
             session.terminal.write(data);
+            // Check for screen clear escape sequence (e.g., from /clear command)
+            // When detected, clear the output history to prevent replaying old content on restore
+            if (data.includes('\x1B[2J')) {
+                session.outputHistory = [];
+            }
             // Store in output history as Buffer
             const buffer = Buffer.from(data, 'utf8');
             session.outputHistory.push(buffer);

package/dist/services/stateDetector/base.js

@@ -1,21 +1,10 @@
+import { getTerminalScreenContent } from '../../utils/screenCapture.js';
 export class BaseStateDetector {
     getTerminalLines(terminal, maxLines = 30) {
-        const buffer = terminal.buffer.active;
-        const lines = [];
-        // Start from the bottom and work our way up
-        for (let i = buffer.length - 1; i >= 0 && lines.length < maxLines; i--) {
-            const line = buffer.getLine(i);
-            if (line) {
-                const text = line.translateToString(true);
-                // Skip empty lines at the bottom
-                if (lines.length > 0 || text.trim() !== '') {
-                    lines.unshift(text);
-                }
-            }
-        }
-        return lines;
+        const content = getTerminalScreenContent(terminal, maxLines);
+        return content.split('\n');
     }
     getTerminalContent(terminal, maxLines = 30) {
-        return this.getTerminalLines(terminal, maxLines).join('\n');
+        return getTerminalScreenContent(terminal, maxLines);
     }
 }

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

@@ -2,6 +2,10 @@ 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
  * @returns Mock Terminal object with buffer interface
  */
-export declare const createMockTerminal: (lines: string[]) => Terminal;
+export declare const createMockTerminal: (lines: string[], options?: {
+    rows?: number;
+    cols?: number;
+}) => Terminal;

package/dist/services/stateDetector/testUtils.js

@@ -1,9 +1,12 @@
 /**
  * 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
  * @returns Mock Terminal object with buffer interface
  */
-export const createMockTerminal = (lines) => {
+export const createMockTerminal = (lines, options) => {
+    const rows = options?.rows ?? lines.length;
+    const cols = options?.cols ?? 80;
     const buffer = {
         length: lines.length,
         active: {
@@ -11,12 +14,12 @@ export const createMockTerminal = (lines) => {
             getLine: (index) => {
                 if (index >= 0 && index < lines.length) {
                     return {
-                        translateToString: () => lines[index],
+                        translateToString: (_trimRight, _startCol, _endCol) => lines[index],
                     };
                 }
                 return null;
             },
         },
     };
-    return { buffer };
+    return { buffer, rows, cols };
 };

package/package.json

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