ccmanager 2.9.0 → 2.9.2

package/dist/components/Session.js

@@ -4,6 +4,11 @@ import { shortcutManager } from '../services/shortcutManager.js';
 const Session = ({ session, sessionManager, onReturnToMenu, }) => {
     const { stdout } = useStdout();
     const [isExiting, setIsExiting] = useState(false);
+    const stripOscColorSequences = (input) => {
+        // Remove default foreground/background color OSC sequences that Codex emits
+        // These sequences leak as literal text when replaying buffered output
+        return input.replace(/\x1B\](?:10|11);[^\x07\x1B]*(?:\x07|\x1B\\)/g, '');
+    };
     useEffect(() => {
         if (!stdout)
             return;
@@ -17,7 +22,7 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                     const buffer = restoredSession.outputHistory[i];
                     if (!buffer)
                         continue;
-                    const str = buffer.toString('utf8');
+                    const str = stripOscColorSequences(buffer.toString('utf8'));
                     // Skip clear screen sequences at the beginning
                     if (i === 0 && (str.includes('\x1B[2J') || str.includes('\x1B[H'))) {
                         // Skip this buffer or remove the clear sequence
@@ -25,11 +30,13 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                             .replace(/\x1B\[2J/g, '')
                             .replace(/\x1B\[H/g, '');
                         if (cleaned.length > 0) {
-                            stdout.write(Buffer.from(cleaned, 'utf8'));
+                            stdout.write(cleaned);
                         }
                     }
                     else {
-                        stdout.write(buffer);
+                        if (str.length > 0) {
+                            stdout.write(str);
+                        }
                     }
                 }
             }
@@ -93,9 +100,7 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             if (isExiting)
                 return;
             // Check for return to menu shortcut
-            const returnToMenuShortcut = shortcutManager.getShortcuts().returnToMenu;
-            const shortcutCode = shortcutManager.getShortcutCode(returnToMenuShortcut);
-            if (shortcutCode && data === shortcutCode) {
+            if (shortcutManager.matchesRawInput('returnToMenu', data)) {
                 // Disable focus reporting mode before returning to menu
                 if (stdout) {
                     stdout.write('\x1b[?1004l');

package/dist/services/shortcutManager.d.ts

@@ -7,8 +7,10 @@ export declare class ShortcutManager {
     private isReservedKey;
     saveShortcuts(shortcuts: ShortcutConfig): boolean;
     getShortcuts(): ShortcutConfig;
+    private getRawShortcutCodes;
     matchesShortcut(shortcutName: keyof ShortcutConfig, input: string, key: Key): boolean;
     getShortcutDisplay(shortcutName: keyof ShortcutConfig): string;
     getShortcutCode(shortcut: ShortcutKey): string | null;
+    matchesRawInput(shortcutName: keyof ShortcutConfig, input: string): boolean;
 }
 export declare const shortcutManager: ShortcutManager;

package/dist/services/shortcutManager.js

@@ -60,6 +60,51 @@ export class ShortcutManager {
     getShortcuts() {
         return configurationManager.getShortcuts();
     }
+    getRawShortcutCodes(shortcut) {
+        const codes = new Set();
+        // Direct control-code form (e.g. Ctrl+E -> \u0005)
+        const controlCode = this.getShortcutCode(shortcut);
+        if (controlCode) {
+            codes.add(controlCode);
+        }
+        // Escape key in raw mode
+        if (shortcut.key === 'escape' &&
+            !shortcut.ctrl &&
+            !shortcut.alt &&
+            !shortcut.shift) {
+            codes.add('\u001b');
+        }
+        // Kitty/xterm extended keyboard sequences (CSI <code>;<mod>u)
+        if (shortcut.ctrl &&
+            !shortcut.alt &&
+            !shortcut.shift &&
+            shortcut.key.length === 1) {
+            const lower = shortcut.key.toLowerCase();
+            const upperCode = lower.toUpperCase().charCodeAt(0);
+            const lowerCode = lower.charCodeAt(0);
+            // Include the CSI u format (ESC[<code>;5u) used by Kitty/WezTerm for Ctrl+letters.
+            if (upperCode >= 32 && upperCode <= 126) {
+                codes.add(`\u001b[${upperCode};5u`);
+            }
+            if (lowerCode !== upperCode && lowerCode >= 32 && lowerCode <= 126) {
+                codes.add(`\u001b[${lowerCode};5u`);
+            }
+            // Tmux/xterm with modifyOtherKeys emit ESC[27;5;<code>~ for the same shortcut.
+            if (upperCode >= 32 && upperCode <= 126) {
+                codes.add(`\u001b[27;5;${upperCode}~`);
+            }
+            if (lowerCode !== upperCode && lowerCode >= 32 && lowerCode <= 126) {
+                codes.add(`\u001b[27;5;${lowerCode}~`);
+            }
+            // Some setups (issue #82/#107 repros) send ESC[1;5<letter>; include both upper/lower.
+            const upperKey = lower.toUpperCase();
+            codes.add(`\u001b[1;5${upperKey}`);
+            if (upperKey !== lower) {
+                codes.add(`\u001b[1;5${lower}`);
+            }
+        }
+        return Array.from(codes);
+    }
     matchesShortcut(shortcutName, input, key) {
         const shortcuts = configurationManager.getShortcuts();
         const shortcut = shortcuts[shortcutName];
@@ -115,5 +160,13 @@ export class ShortcutManager {
         }
         return null;
     }
+    matchesRawInput(shortcutName, input) {
+        const shortcuts = configurationManager.getShortcuts();
+        const shortcut = shortcuts[shortcutName];
+        if (!shortcut)
+            return false;
+        const codes = this.getRawShortcutCodes(shortcut);
+        return codes.some(code => input === code || input.includes(code));
+    }
 }
 export const shortcutManager = new ShortcutManager();

package/dist/services/shortcutManager.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/shortcutManager.test.js

@@ -0,0 +1,30 @@
+import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
+import { shortcutManager } from './shortcutManager.js';
+import { configurationManager } from './configurationManager.js';
+describe('shortcutManager.matchesRawInput', () => {
+    const shortcuts = {
+        returnToMenu: { ctrl: true, key: 'e', alt: false, shift: false },
+        cancel: { ctrl: true, key: 'c', alt: false, shift: false },
+    };
+    beforeEach(() => {
+        vi.spyOn(configurationManager, 'getShortcuts').mockReturnValue(shortcuts);
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('matches classic control code', () => {
+        expect(shortcutManager.matchesRawInput('returnToMenu', '\u0005')).toBe(true);
+    });
+    it('matches CSI u sequence', () => {
+        expect(shortcutManager.matchesRawInput('returnToMenu', '\u001b[69;5u')).toBe(true);
+    });
+    it('matches modifyOtherKeys sequence', () => {
+        expect(shortcutManager.matchesRawInput('returnToMenu', '\u001b[27;5;69~')).toBe(true);
+    });
+    it('matches CSI 1;5<key>', () => {
+        expect(shortcutManager.matchesRawInput('returnToMenu', '\u001b[1;5E')).toBe(true);
+    });
+    it('ignores unrelated input', () => {
+        expect(shortcutManager.matchesRawInput('returnToMenu', 'hello')).toBe(false);
+    });
+});

package/dist/services/stateDetector.js

@@ -48,6 +48,10 @@ export class ClaudeStateDetector extends BaseStateDetector {
             content.includes('│ Would you like')) {
             return 'waiting_input';
         }
+        // Check for "Do you want" pattern with options (e.g., "Do you want...\n...Yes")
+        if (/do you want.+\n.*yes/.test(lowerContent)) {
+            return 'waiting_input';
+        }
         // Check for busy state
         if (lowerContent.includes('esc to interrupt')) {
             return 'busy';

package/dist/services/stateDetector.test.js

@@ -153,6 +153,46 @@ describe('ClaudeStateDetector', () => {
                 expect(state).toBe('busy');
             }
         });
+        it('should detect waiting_input when "Do you want" with options prompt is present', () => {
+            // Arrange
+            terminal = createMockTerminal([
+                'Some previous output',
+                'Do you want to make this edit to test.txt?',
+                '❯ 1. Yes',
+                '2. Yes, allow all edits during this session (shift+tab)',
+                '3. No, and tell Claude what to do differently (esc)',
+            ]);
+            // Act
+            const state = detector.detectState(terminal, 'idle');
+            // Assert
+            expect(state).toBe('waiting_input');
+        });
+        it('should detect waiting_input when "Do you want" with options prompt is present (case insensitive)', () => {
+            // Arrange
+            terminal = createMockTerminal([
+                'Some output',
+                'DO YOU WANT to make this edit?',
+                '❯ 1. YES',
+                '2. NO',
+            ]);
+            // Act
+            const state = detector.detectState(terminal, 'idle');
+            // Assert
+            expect(state).toBe('waiting_input');
+        });
+        it('should prioritize "Do you want" with options over busy state', () => {
+            // Arrange
+            terminal = createMockTerminal([
+                'Press ESC to interrupt',
+                'Do you want to continue?',
+                '❯ 1. Yes',
+                '2. No',
+            ]);
+            // Act
+            const state = detector.detectState(terminal, 'idle');
+            // Assert
+            expect(state).toBe('waiting_input'); // waiting_input should take precedence
+        });
     });
 });
 describe('GeminiStateDetector', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "2.9.0",
+	"version": "2.9.2",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",