ccmanager 3.5.2 → 3.5.4

package/dist/components/TextInputWrapper.d.ts

@@ -9,10 +9,5 @@ interface TextInputWrapperProps {
     showCursor?: boolean;
     highlightPastedText?: boolean;
 }
-/**
- * Custom text input component that handles rapid input correctly.
- * This is a replacement for ink-text-input that uses refs for immediate
- * state updates, which is necessary for text expansion tools like Espanso.
- */
 declare const TextInputWrapper: React.FC<TextInputWrapperProps>;
 export default TextInputWrapper;

package/dist/components/TextInputWrapper.js

@@ -1,142 +1,15 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useRef } from 'react';
-import { Text, useInput } from 'ink';
+import { jsx as _jsx } from "react/jsx-runtime";
+import TextInput from 'ink-text-input';
 import stripAnsi from 'strip-ansi';
-/**
- * Custom text input component that handles rapid input correctly.
- * This is a replacement for ink-text-input that uses refs for immediate
- * state updates, which is necessary for text expansion tools like Espanso.
- */
-const TextInputWrapper = ({ value, onChange, onSubmit, placeholder = '', focus = true, mask, showCursor = true, }) => {
-    // Use ref to track the actual current value for immediate updates
-    // This is critical for handling rapid input from tools like Espanso
-    const valueRef = useRef(value);
-    const cursorRef = useRef(value.length);
-    // State for triggering re-renders
-    const [, forceUpdate] = useState({});
-    // Sync refs when value prop changes from parent
-    useEffect(() => {
-        valueRef.current = value;
-        // Adjust cursor if it's beyond the new value length
-        if (cursorRef.current > value.length) {
-            cursorRef.current = value.length;
-        }
-    }, [value]);
-    const cleanValue = (val) => {
-        let cleaned = stripAnsi(val);
-        cleaned = cleaned.replace(/\[200~/g, '').replace(/\[201~/g, '');
-        return cleaned;
+const TextInputWrapper = ({ value, onChange, ...props }) => {
+    const handleChange = (newValue) => {
+        // First strip all ANSI escape sequences
+        let cleanedValue = stripAnsi(newValue);
+        // Then specifically remove bracketed paste mode markers that might remain
+        // These sometimes appear as literal text after ANSI stripping
+        cleanedValue = cleanedValue.replace(/\[200~/g, '').replace(/\[201~/g, '');
+        onChange(cleanedValue);
     };
-    // Process backspace characters that might be embedded in input string
-    // This handles cases where text expansion tools send backspaces as characters
-    const processBackspaces = (input, currentValue, cursor) => {
-        let newValue = currentValue;
-        let newCursor = cursor;
-        let remaining = '';
-        for (let i = 0; i < input.length; i++) {
-            const char = input[i];
-            const charCode = char?.charCodeAt(0);
-            // Check for backspace characters (ASCII 8 or 127)
-            if (charCode === 8 || charCode === 127) {
-                if (newCursor > 0) {
-                    newValue =
-                        newValue.slice(0, newCursor - 1) + newValue.slice(newCursor);
-                    newCursor--;
-                }
-            }
-            else {
-                // Regular character - add to remaining
-                remaining += char;
-            }
-        }
-        return { value: newValue, cursor: newCursor, remainingInput: remaining };
-    };
-    useInput((input, key) => {
-        // Ignore certain keys
-        if (key.upArrow ||
-            key.downArrow ||
-            (key.ctrl && input === 'c') ||
-            key.tab ||
-            (key.shift && key.tab)) {
-            return;
-        }
-        // Handle Enter/Return
-        if (key.return) {
-            if (onSubmit) {
-                onSubmit(valueRef.current);
-            }
-            return;
-        }
-        let currentValue = valueRef.current;
-        let cursor = cursorRef.current;
-        if (key.leftArrow) {
-            if (showCursor && cursor > 0) {
-                cursorRef.current = cursor - 1;
-                forceUpdate({});
-            }
-            return;
-        }
-        if (key.rightArrow) {
-            if (showCursor && cursor < currentValue.length) {
-                cursorRef.current = cursor + 1;
-                forceUpdate({});
-            }
-            return;
-        }
-        if (key.backspace || key.delete) {
-            if (cursor > 0) {
-                const nextValue = currentValue.slice(0, cursor - 1) + currentValue.slice(cursor);
-                valueRef.current = nextValue;
-                cursorRef.current = cursor - 1;
-                onChange(nextValue);
-                forceUpdate({});
-            }
-            return;
-        }
-        // Process input that might contain embedded backspace characters
-        // (some text expansion tools send backspaces as part of the input string)
-        const { value: processedValue, cursor: processedCursor, remainingInput, } = processBackspaces(input, currentValue, cursor);
-        currentValue = processedValue;
-        cursor = processedCursor;
-        // Add remaining characters (non-backspace)
-        if (remainingInput) {
-            const cleanedInput = cleanValue(remainingInput);
-            if (cleanedInput) {
-                currentValue =
-                    currentValue.slice(0, cursor) +
-                        cleanedInput +
-                        currentValue.slice(cursor);
-                cursor = cursor + cleanedInput.length;
-            }
-        }
-        // Update refs immediately (synchronously)
-        valueRef.current = currentValue;
-        cursorRef.current = cursor;
-        // Notify parent of value change
-        onChange(currentValue);
-        // Force re-render to update display
-        forceUpdate({});
-    }, { isActive: focus });
-    // Render the text with cursor
-    const displayValue = mask
-        ? mask.repeat(valueRef.current.length)
-        : valueRef.current;
-    const cursor = cursorRef.current;
-    if (!showCursor || !focus) {
-        return (_jsx(Text, { children: displayValue.length > 0 ? (displayValue) : placeholder ? (_jsx(Text, { dimColor: true, children: placeholder })) : null }));
-    }
-    // Show cursor
-    if (displayValue.length === 0) {
-        // Show placeholder with cursor on first char
-        if (placeholder) {
-            return (_jsxs(Text, { children: [_jsx(Text, { inverse: true, children: placeholder[0] || ' ' }), _jsx(Text, { dimColor: true, children: placeholder.slice(1) })] }));
-        }
-        return _jsx(Text, { inverse: true, children: " " });
-    }
-    // Render value with cursor
-    const beforeCursor = displayValue.slice(0, cursor);
-    const atCursor = displayValue[cursor] || ' ';
-    const afterCursor = displayValue.slice(cursor + 1);
-    return (_jsxs(Text, { children: [beforeCursor, _jsx(Text, { inverse: true, children: atCursor }), afterCursor] }));
+    return _jsx(TextInput, { value: value, onChange: handleChange, ...props });
 };
 export default TextInputWrapper;

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.2",
+	"version": "3.5.4",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",
@@ -26,7 +26,7 @@
 		"build:binary:native": "bun run scripts/build-binaries.ts --target=native",
 		"build:binary:all": "bun run scripts/build-binaries.ts --target=all",
 		"dev": "bun run tsc --watch",
-		"start": "bun dist/cli.js",
+		"start": "bun --no-env-file dist/cli.js",
 		"test": "vitest --run",
 		"lint": "bun run eslint src",
 		"lint:fix": "bun run eslint src --fix",
@@ -41,11 +41,11 @@
 		"bin"
 	],
 	"optionalDependencies": {
-		"@kodaikabasawa/ccmanager-darwin-arm64": "3.5.2",
-		"@kodaikabasawa/ccmanager-darwin-x64": "3.5.2",
-		"@kodaikabasawa/ccmanager-linux-arm64": "3.5.2",
-		"@kodaikabasawa/ccmanager-linux-x64": "3.5.2",
-		"@kodaikabasawa/ccmanager-win32-x64": "3.5.2"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "3.5.4",
+		"@kodaikabasawa/ccmanager-darwin-x64": "3.5.4",
+		"@kodaikabasawa/ccmanager-linux-arm64": "3.5.4",
+		"@kodaikabasawa/ccmanager-linux-x64": "3.5.4",
+		"@kodaikabasawa/ccmanager-win32-x64": "3.5.4"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",