ccmanager 2.11.4 → 2.11.6

package/dist/components/Session.js

@@ -12,6 +12,26 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
     useEffect(() => {
         if (!stdout)
             return;
+        const resetTerminalInputModes = () => {
+            // Reset terminal modes that interactive tools like Codex enable (kitty keyboard
+            // protocol / modifyOtherKeys / focus tracking) so they don't leak into other
+            // sessions after we detach.
+            stdout.write('\x1b[>0u'); // Disable kitty keyboard protocol (CSI u sequences)
+            stdout.write('\x1b[>4m'); // Disable xterm modifyOtherKeys extensions
+            stdout.write('\x1b[?1004l'); // Disable focus reporting
+            stdout.write('\x1b[?2004l'); // Disable bracketed paste (can interfere with shortcuts)
+        };
+        const sanitizeReplayBuffer = (input) => {
+            // Remove terminal mode toggles emitted by Codex so replay doesn't re-enable them
+            // on our own TTY when restoring the session view.
+            return stripOscColorSequences(input)
+                .replace(/\x1B\[>4;?\d*m/g, '') // modifyOtherKeys set/reset
+                .replace(/\x1B\[>[0-9;]*u/g, '') // kitty keyboard protocol enables
+                .replace(/\x1B\[\?1004[hl]/g, '') // focus tracking
+                .replace(/\x1B\[\?2004[hl]/g, ''); // bracketed paste
+        };
+        // Reset modes immediately on entry in case a previous session left them on
+        resetTerminalInputModes();
         // Clear screen when entering session
         stdout.write('\x1B[2J\x1B[H');
         // Handle session restoration
@@ -22,7 +42,7 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                     const buffer = restoredSession.outputHistory[i];
                     if (!buffer)
                         continue;
-                    const str = stripOscColorSequences(buffer.toString('utf8'));
+                    const str = sanitizeReplayBuffer(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
@@ -101,9 +121,9 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                 return;
             // Check for return to menu shortcut
             if (shortcutManager.matchesRawInput('returnToMenu', data)) {
-                // Disable focus reporting mode before returning to menu
+                // Disable any extended input modes that might have been enabled by the PTY
                 if (stdout) {
-                    stdout.write('\x1b[?1004l');
+                    resetTerminalInputModes();
                 }
                 // Restore stdin state before returning to menu
                 stdin.removeListener('data', handleStdinData);
@@ -121,7 +141,7 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             stdin.removeListener('data', handleStdinData);
             // Disable focus reporting mode that might have been enabled by the PTY
             if (stdout) {
-                stdout.write('\x1b[?1004l');
+                resetTerminalInputModes();
             }
             // Restore stdin to its original state
             if (stdin.isTTY) {

package/dist/services/__tests__/stateDetector.codex.test.js

@@ -34,6 +34,26 @@ describe('CodexStateDetector', () => {
         // Assert
         expect(state).toBe('waiting_input');
     });
+    it('should detect waiting_input state for multiline do you want prompt with yes', () => {
+        // Arrange
+        terminal = createMockTerminal([
+            'Would you like to run the following command?',
+            '',
+            'Reason: Need to write to .git/worktrees metadata to stage changes for the requested commi',
+            '',
+            '$ git add test.ts',
+            '',
+            '› 1. Yes, proceed (y)',
+            "  2. Yes, and don't ask again for this command (a)",
+            '  3. No, and tell Codex what to do differently (esc)',
+            '',
+            'Press enter to confirm or esc to cancel',
+        ]);
+        // Act
+        const state = detector.detectState(terminal, 'idle');
+        // Assert
+        expect(state).toBe('waiting_input');
+    });
     it('should detect busy state for Esc to interrupt pattern', () => {
         // Arrange
         terminal = createMockTerminal([

package/dist/services/__tests__/stateDetector.gemini.test.js

@@ -44,6 +44,18 @@ describe('GeminiStateDetector', () => {
             // Assert
             expect(state).toBe('waiting_input');
         });
+        it('should detect waiting_input for multiline confirmation ending with "yes"', () => {
+            // Arrange
+            terminal = createMockTerminal([
+                'Apply this change to the workspace?',
+                'The operation will modify several files.',
+                '   yes',
+            ]);
+            // Act
+            const state = detector.detectState(terminal, 'idle');
+            // Assert
+            expect(state).toBe('waiting_input');
+        });
         it('should detect busy when "esc to cancel" is present', () => {
             // Arrange
             terminal = createMockTerminal([

package/dist/services/stateDetector.js

@@ -83,6 +83,10 @@ export class GeminiStateDetector extends BaseStateDetector {
             content.includes('│ Do you want to proceed?')) {
             return 'waiting_input';
         }
+        // Check for multiline confirmation prompts ending with "yes"
+        if (/(allow execution|do you want to|apply this change)[\s\S]*?\n+[\s\S]*?\byes\b/.test(lowerContent)) {
+            return 'waiting_input';
+        }
         // Check for busy state
         if (lowerContent.includes('esc to cancel')) {
             return 'busy';
@@ -101,6 +105,9 @@ export class CodexStateDetector extends BaseStateDetector {
             lowerContent.includes('yes (y)')) {
             return 'waiting_input';
         }
+        if (/(do you want|would you like)[\s\S]*?\n+[\s\S]*?\byes\b/.test(lowerContent)) {
+            return 'waiting_input';
+        }
         // Check for busy state
         if (/esc.*interrupt/i.test(lowerContent)) {
             return 'busy';

package/package.json

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