ccmanager 2.2.1 → 2.2.3

package/README.md

@@ -1,13 +1,11 @@
-# CCManager - AI Code Assistant Session Manager
-
-CCManager is a TUI application for managing multiple AI coding assistant sessions (Claude Code, Gemini CLI) across Git worktrees and projects.
+# CCManager - AI Code Agent Session Manager
 
+[![Mentioned in Awesome Gemini CLI](https://awesome.re/mentioned-badge.svg)](https://github.com/Piebald-AI/awesome-gemini-cli)
 
+CCManager is a CLI application for managing multiple AI coding assistant sessions (Claude Code, Gemini CLI, Codex CLI) across Git worktrees and projects.
 
 https://github.com/user-attachments/assets/15914a88-e288-4ac9-94d5-8127f2e19dbf
 
-
-
 ## Features
 
 - Run multiple AI assistant sessions in parallel across different Git worktrees

package/dist/components/ConfigureCommand.js

@@ -4,6 +4,7 @@ import TextInputWrapper from './TextInputWrapper.js';
 import SelectInput from 'ink-select-input';
 import { configurationManager } from '../services/configurationManager.js';
 import { shortcutManager } from '../services/shortcutManager.js';
+import Confirmation from './Confirmation.js';
 const formatDetectionStrategy = (strategy) => {
     const value = strategy || 'claude';
     switch (value) {
@@ -354,12 +355,8 @@ const ConfigureCommand = ({ onComplete }) => {
     // Render delete confirmation
     if (viewMode === 'delete-confirm') {
         const preset = presets.find(p => p.id === selectedPresetId);
-        const confirmItems = [
-            { label: 'Yes, delete', value: 'yes' },
-            { label: 'Cancel', value: 'cancel' },
-        ];
-        const handleConfirmSelect = (item) => {
-            if (item.value === 'yes') {
+        const handleConfirmSelect = (value) => {
+            if (value === 'yes') {
                 handleDeleteConfirm();
             }
             else {
@@ -367,23 +364,16 @@ const ConfigureCommand = ({ onComplete }) => {
                 setSelectedIndex(6); // Return to delete option in edit menu
             }
         };
-        return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, { bold: true, color: "red" }, "Confirm Delete")),
-            React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, null,
-                    "Delete preset \"",
-                    preset?.name,
-                    "\"?")),
-            React.createElement(SelectInput, { items: confirmItems, onSelect: handleConfirmSelect, initialIndex: 1, indicatorComponent: ({ isSelected }) => (React.createElement(Text, { color: isSelected ? 'red' : undefined }, isSelected ? '>' : ' ')), itemComponent: ({ isSelected, label }) => (React.createElement(Text, { color: label === 'Yes, delete'
-                        ? isSelected
-                            ? 'red'
-                            : undefined
-                        : isSelected
-                            ? 'cyan'
-                            : undefined, inverse: isSelected }, label)) }),
-            React.createElement(Box, { marginTop: 1 },
-                React.createElement(Text, { dimColor: true }, "Press \u2191\u2193/j/k to navigate, Enter to confirm"))));
+        const title = (React.createElement(Text, { bold: true, color: "red" }, "Confirm Delete"));
+        const message = React.createElement(Text, null,
+            "Delete preset \"",
+            preset?.name,
+            "\"?");
+        const hint = (React.createElement(Text, { dimColor: true }, "Press \u2191\u2193/j/k to navigate, Enter to confirm"));
+        return (React.createElement(Confirmation, { title: title, message: message, options: [
+                { label: 'Yes, delete', value: 'yes', color: 'red' },
+                { label: 'Cancel', value: 'cancel', color: 'cyan' },
+            ], onSelect: handleConfirmSelect, initialIndex: 1, indicatorColor: "red", hint: hint }));
     }
     // Render edit preset view
     if (viewMode === 'edit') {

package/dist/components/Confirmation.d.ts

@@ -1,5 +1,29 @@
 import React from 'react';
+export interface ConfirmationOption {
+    label: string;
+    value: string;
+    color?: string;
+}
 interface ConfirmationProps {
+    title?: React.ReactNode;
+    message?: React.ReactNode;
+    options: ConfirmationOption[];
+    onSelect: (value: string) => void;
+    initialIndex?: number;
+    indicatorColor?: string;
+    hint?: React.ReactNode;
+    onCancel?: () => void;
+    onEscape?: () => void;
+    onCustomInput?: (input: string, key: {
+        [key: string]: boolean;
+    }) => boolean;
+}
+/**
+ * Reusable confirmation component with SelectInput UI pattern
+ */
+declare const Confirmation: React.FC<ConfirmationProps>;
+export default Confirmation;
+interface SimpleConfirmationProps {
     message: string | React.ReactNode;
     onConfirm: () => void;
     onCancel: () => void;
@@ -8,5 +32,4 @@ interface ConfirmationProps {
     confirmColor?: string;
     cancelColor?: string;
 }
-declare const Confirmation: React.FC<ConfirmationProps>;
-export default Confirmation;
+export declare const SimpleConfirmation: React.FC<SimpleConfirmationProps>;

package/dist/components/Confirmation.js

@@ -1,42 +1,63 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { Box, Text, useInput } from 'ink';
+import SelectInput from 'ink-select-input';
 import { shortcutManager } from '../services/shortcutManager.js';
-const Confirmation = ({ message, onConfirm, onCancel, confirmText = 'Yes', cancelText = 'No', confirmColor = 'green', cancelColor = 'red', }) => {
-    const [focused, setFocused] = useState(true); // true = confirm, false = cancel
+/**
+ * Reusable confirmation component with SelectInput UI pattern
+ */
+const Confirmation = ({ title, message, options, onSelect, initialIndex = 0, indicatorColor, hint, onCancel, onEscape, onCustomInput, }) => {
     useInput((input, key) => {
-        if (key.leftArrow || key.rightArrow) {
-            setFocused(!focused);
+        // Check custom input handler first
+        if (onCustomInput && onCustomInput(input, key)) {
+            return;
         }
-        else if (key.return) {
-            if (focused) {
-                onConfirm();
-            }
-            else {
-                onCancel();
-            }
-        }
-        else if (shortcutManager.matchesShortcut('cancel', input, key)) {
+        // Handle cancel shortcut
+        if (onCancel && shortcutManager.matchesShortcut('cancel', input, key)) {
             onCancel();
+            return;
+        }
+        // Handle escape key
+        if (onEscape && key['escape']) {
+            onEscape();
+            return;
         }
     });
+    const handleSelect = (item) => {
+        onSelect(item.value);
+    };
     return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(Box, { marginBottom: 1 }, message),
-        React.createElement(Box, null,
-            React.createElement(Box, { marginRight: 2 },
-                React.createElement(Text, { color: focused ? confirmColor : 'white', inverse: focused },
-                    ' ',
-                    confirmText,
-                    ' ')),
-            React.createElement(Box, null,
-                React.createElement(Text, { color: !focused ? cancelColor : 'white', inverse: !focused },
-                    ' ',
-                    cancelText,
-                    ' '))),
+        title && React.createElement(Box, { marginBottom: 1 }, title),
+        message && React.createElement(Box, { marginBottom: 1 }, message),
         React.createElement(Box, { marginTop: 1 },
-            React.createElement(Text, { dimColor: true },
-                "Use \u2190 \u2192 to navigate, Enter to select,",
-                ' ',
-                shortcutManager.getShortcutDisplay('cancel'),
-                " to cancel"))));
+            React.createElement(SelectInput, { items: options, onSelect: handleSelect, initialIndex: initialIndex, indicatorComponent: ({ isSelected }) => (React.createElement(Text, { color: isSelected && indicatorColor ? indicatorColor : undefined }, isSelected ? '>' : ' ')), itemComponent: ({ isSelected, label }) => {
+                    // Find the color for this option
+                    const option = options.find(opt => opt.label === label);
+                    const color = option?.color;
+                    return (React.createElement(Text, { color: isSelected && color ? color : isSelected ? undefined : 'white', inverse: isSelected },
+                        ' ',
+                        label,
+                        ' '));
+                } })),
+        hint && React.createElement(Box, { marginTop: 1 }, hint)));
 };
 export default Confirmation;
+export const SimpleConfirmation = ({ message, onConfirm, onCancel, confirmText = 'Yes', cancelText = 'No', confirmColor = 'green', cancelColor = 'red', }) => {
+    const options = [
+        { label: confirmText, value: 'confirm', color: confirmColor },
+        { label: cancelText, value: 'cancel', color: cancelColor },
+    ];
+    const handleSelect = (value) => {
+        if (value === 'confirm') {
+            onConfirm();
+        }
+        else {
+            onCancel();
+        }
+    };
+    const hint = (React.createElement(Text, { dimColor: true },
+        "Use \u2191\u2193/j/k to navigate, Enter to select,",
+        ' ',
+        shortcutManager.getShortcutDisplay('cancel'),
+        " to cancel"));
+    return (React.createElement(Confirmation, { message: message, options: options, onSelect: handleSelect, initialIndex: 0, hint: hint, onCancel: onCancel }));
+};

package/dist/components/DeleteConfirmation.js

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
 import { shortcutManager } from '../services/shortcutManager.js';
+import Confirmation from './Confirmation.js';
 const DeleteConfirmation = ({ worktrees, onConfirm, onCancel, }) => {
     // Check if any worktrees have branches
     const hasAnyBranches = worktrees.some(wt => wt.branch);
@@ -19,36 +20,26 @@ const DeleteConfirmation = ({ worktrees, onConfirm, onCancel, }) => {
             value: 'keepBranch',
         },
     ];
-    // Menu items for actions
-    const actionOptions = [
-        { label: 'Confirm', value: 'confirm' },
-        { label: 'Cancel', value: 'cancel' },
-    ];
     const handleBranchSelect = (item) => {
         // Don't toggle on Enter - only update focused option
         setFocusedOption(item.value);
     };
-    const handleActionSelect = (item) => {
-        if (item.value === 'confirm') {
+    const handleActionSelect = (value) => {
+        if (value === 'confirm') {
             onConfirm(deleteBranch);
         }
         else {
             onCancel();
         }
     };
-    useInput((input, key) => {
-        if (shortcutManager.matchesShortcut('cancel', input, key)) {
-            onCancel();
-        }
-        else if (hasAnyBranches && view === 'options' && key.return) {
-            // Move to confirm view when Enter is pressed in options
+    // Handle keyboard input for branch options view
+    const handleBranchOptionsInput = (input, key) => {
+        if (key['return']) {
+            // Move to confirm view when Enter is pressed
             setView('confirm');
+            return true;
         }
-        else if (hasAnyBranches && view === 'confirm' && key.escape) {
-            // Go back to options when Escape is pressed in confirm
-            setView('options');
-        }
-        else if (hasAnyBranches && view === 'options' && input === ' ') {
+        else if (input === ' ') {
             // Toggle selection on space for radio buttons
             if (focusedOption === 'deleteBranch') {
                 setDeleteBranch(true);
@@ -56,63 +47,75 @@ const DeleteConfirmation = ({ worktrees, onConfirm, onCancel, }) => {
             else {
                 setDeleteBranch(false);
             }
+            return true;
+        }
+        return false;
+    };
+    useInput((input, key) => {
+        if (hasAnyBranches && view === 'options') {
+            if (handleBranchOptionsInput(input, key)) {
+                return;
+            }
+            if (shortcutManager.matchesShortcut('cancel', input, key)) {
+                onCancel();
+            }
         }
     });
-    return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(Text, { bold: true, color: "red" }, "\u26A0\uFE0F Delete Confirmation"),
-        React.createElement(Box, { marginTop: 1, marginBottom: 1, flexDirection: "column" },
-            React.createElement(Text, null, "You are about to delete the following worktrees:"),
-            worktrees.length <= 10 ? (worktrees.map(wt => (React.createElement(Text, { key: wt.path, color: "red" },
+    // Title component
+    const title = (React.createElement(Text, { bold: true, color: "red" }, "\u26A0\uFE0F Delete Confirmation"));
+    // Message component
+    const message = (React.createElement(Box, { flexDirection: "column" },
+        React.createElement(Text, null, "You are about to delete the following worktrees:"),
+        worktrees.length <= 10 ? (worktrees.map(wt => (React.createElement(Text, { key: wt.path, color: "red" },
+            "\u2022 ",
+            wt.branch ? wt.branch.replace('refs/heads/', '') : 'detached',
+            " (",
+            wt.path,
+            ")")))) : (React.createElement(React.Fragment, null,
+            worktrees.slice(0, 8).map(wt => (React.createElement(Text, { key: wt.path, color: "red" },
                 "\u2022 ",
                 wt.branch ? wt.branch.replace('refs/heads/', '') : 'detached',
                 ' ',
                 "(",
                 wt.path,
-                ")")))) : (React.createElement(React.Fragment, null,
-                worktrees.slice(0, 8).map(wt => (React.createElement(Text, { key: wt.path, color: "red" },
-                    "\u2022",
-                    ' ',
-                    wt.branch ? wt.branch.replace('refs/heads/', '') : 'detached',
-                    ' ',
-                    "(",
-                    wt.path,
-                    ")"))),
-                React.createElement(Text, { color: "red", dimColor: true },
-                    "... and ",
-                    worktrees.length - 8,
-                    " more worktrees")))),
-        hasAnyBranches && view === 'options' && (React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
-            React.createElement(Text, { bold: true }, "What do you want to do with the associated branches?"),
+                ")"))),
+            React.createElement(Text, { color: "red", dimColor: true },
+                "... and ",
+                worktrees.length - 8,
+                " more worktrees")))));
+    if (hasAnyBranches && view === 'options') {
+        return (React.createElement(Box, { flexDirection: "column" },
+            title,
+            React.createElement(Box, { marginTop: 1, marginBottom: 1 }, message),
+            React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
+                React.createElement(Text, { bold: true }, "What do you want to do with the associated branches?"),
+                React.createElement(Box, { marginTop: 1 },
+                    React.createElement(SelectInput, { items: branchOptions, onSelect: handleBranchSelect, onHighlight: (item) => {
+                            setFocusedOption(item.value);
+                        }, initialIndex: deleteBranch ? 0 : 1, indicatorComponent: ({ isSelected }) => (React.createElement(Text, { color: isSelected ? 'red' : undefined }, isSelected ? '>' : ' ')), itemComponent: ({ isSelected, label }) => (React.createElement(Text, { color: isSelected ? 'red' : undefined, inverse: isSelected }, label)) }))),
             React.createElement(Box, { marginTop: 1 },
-                React.createElement(SelectInput, { items: branchOptions, onSelect: handleBranchSelect, onHighlight: (item) => {
-                        setFocusedOption(item.value);
-                    }, initialIndex: deleteBranch ? 0 : 1, indicatorComponent: ({ isSelected }) => (React.createElement(Text, { color: isSelected ? 'red' : undefined }, isSelected ? '>' : ' ')), itemComponent: ({ isSelected, label }) => (React.createElement(Text, { color: isSelected ? 'red' : undefined, inverse: isSelected }, label)) })))),
-        hasAnyBranches && view === 'confirm' && (React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
+                React.createElement(Text, { dimColor: true },
+                    "Use \u2191\u2193/j/k to navigate, Space to toggle, Enter to continue,",
+                    ' ',
+                    shortcutManager.getShortcutDisplay('cancel'),
+                    " to cancel"))));
+    }
+    // Confirmation view (either after selecting branch option or if no branches)
+    const confirmHint = (React.createElement(Text, { dimColor: true },
+        "Use \u2191\u2193/j/k to navigate, Enter to select,",
+        ' ',
+        shortcutManager.getShortcutDisplay('cancel'),
+        " to cancel"));
+    const confirmMessage = (React.createElement(Box, { flexDirection: "column" },
+        message,
+        hasAnyBranches && view === 'confirm' && (React.createElement(Box, { marginTop: 1, flexDirection: "column" },
             React.createElement(Text, { bold: true }, "Branch option selected:"),
-            React.createElement(Text, { color: "yellow" }, deleteBranch ? '✓ Delete the branches too' : '✓ Keep the branches'))),
-        (view === 'confirm' || !hasAnyBranches) && (React.createElement(Box, { marginTop: 1 },
-            React.createElement(SelectInput, { items: actionOptions, onSelect: handleActionSelect, initialIndex: 1, indicatorComponent: ({ isSelected }) => (React.createElement(Text, null, isSelected ? '>' : ' ')), itemComponent: ({ isSelected, label }) => {
-                    const color = label === 'Confirm' ? 'green' : 'red';
-                    return (React.createElement(Text, { color: isSelected ? color : 'white', inverse: isSelected },
-                        ' ',
-                        label,
-                        ' '));
-                } }))),
-        React.createElement(Box, { marginTop: 1 },
-            React.createElement(Text, { dimColor: true }, hasAnyBranches && view === 'options' ? (React.createElement(React.Fragment, null,
-                "Use \u2191\u2193/j/k to navigate, Space to toggle, Enter to continue,",
-                ' ',
-                shortcutManager.getShortcutDisplay('cancel'),
-                " to cancel")) : view === 'confirm' ? (React.createElement(React.Fragment, null,
-                "Use \u2191\u2193/j/k to navigate, Enter to select",
-                hasAnyBranches ? ', Esc to go back' : '',
-                ",",
-                ' ',
-                shortcutManager.getShortcutDisplay('cancel'),
-                " to cancel")) : (React.createElement(React.Fragment, null,
-                "Use \u2191\u2193/j/k to navigate, Enter to select,",
-                ' ',
-                shortcutManager.getShortcutDisplay('cancel'),
-                " to cancel"))))));
+            React.createElement(Text, { color: "yellow" }, deleteBranch ? '✓ Delete the branches too' : '✓ Keep the branches')))));
+    return (React.createElement(Confirmation, { title: title, message: confirmMessage, options: [
+            { label: 'Confirm', value: 'confirm', color: 'green' },
+            { label: 'Cancel', value: 'cancel', color: 'red' },
+        ], onSelect: handleActionSelect, initialIndex: 1, hint: confirmHint, onCancel: onCancel, onEscape: hasAnyBranches && view === 'confirm'
+            ? () => setView('options')
+            : undefined }));
 };
 export default DeleteConfirmation;

package/dist/components/MergeWorktree.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
 import { WorktreeService } from '../services/worktreeService.js';
-import Confirmation from './Confirmation.js';
+import Confirmation, { SimpleConfirmation } from './Confirmation.js';
 import { shortcutManager } from '../services/shortcutManager.js';
 const MergeWorktree = ({ onComplete, onCancel, }) => {
     const [step, setStep] = useState('select-source');
@@ -11,7 +11,6 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
     const [branchItems, setBranchItems] = useState([]);
     const [originalBranchItems, setOriginalBranchItems] = useState([]);
     const [useRebase, setUseRebase] = useState(false);
-    const [operationFocused, setOperationFocused] = useState(false);
     const [mergeError, setMergeError] = useState(null);
     const [worktreeService] = useState(() => new WorktreeService());
     useEffect(() => {
@@ -30,16 +29,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             onCancel();
             return;
         }
-        if (step === 'select-operation') {
-            if (key.leftArrow || key.rightArrow) {
-                const newOperationFocused = !operationFocused;
-                setOperationFocused(newOperationFocused);
-                setUseRebase(newOperationFocused);
-            }
-            else if (key.return) {
-                setStep('confirm-merge');
-            }
-        }
+        // Operation selection is now handled by ConfirmationView
         if (step === 'merge-error') {
             // Any key press returns to menu
             onCancel();
@@ -105,34 +95,27 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
                     " to cancel"))));
     }
     if (step === 'select-operation') {
-        return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, { bold: true, color: "green" }, "Select Operation")),
-            React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, null,
-                    "Choose how to integrate ",
-                    React.createElement(Text, { color: "yellow" }, sourceBranch),
-                    ' ',
-                    "into ",
-                    React.createElement(Text, { color: "yellow" }, targetBranch),
-                    ":")),
-            React.createElement(Box, null,
-                React.createElement(Box, { marginRight: 2 },
-                    React.createElement(Text, { color: !operationFocused ? 'green' : 'white', inverse: !operationFocused },
-                        ' ',
-                        "Merge",
-                        ' ')),
-                React.createElement(Box, null,
-                    React.createElement(Text, { color: operationFocused ? 'blue' : 'white', inverse: operationFocused },
-                        ' ',
-                        "Rebase",
-                        ' '))),
-            React.createElement(Box, { marginTop: 1 },
-                React.createElement(Text, { dimColor: true },
-                    "Use \u2190 \u2192 to navigate, Enter to select,",
-                    ' ',
-                    shortcutManager.getShortcutDisplay('cancel'),
-                    " to cancel"))));
+        const title = (React.createElement(Text, { bold: true, color: "green" }, "Select Operation"));
+        const message = (React.createElement(Text, null,
+            "Choose how to integrate ",
+            React.createElement(Text, { color: "yellow" }, sourceBranch),
+            " into",
+            ' ',
+            React.createElement(Text, { color: "yellow" }, targetBranch),
+            ":"));
+        const hint = (React.createElement(Text, { dimColor: true },
+            "Use \u2191\u2193/j/k to navigate, Enter to select,",
+            ' ',
+            shortcutManager.getShortcutDisplay('cancel'),
+            " to cancel"));
+        const handleOperationSelect = (value) => {
+            setUseRebase(value === 'rebase');
+            setStep('confirm-merge');
+        };
+        return (React.createElement(Confirmation, { title: title, message: message, options: [
+                { label: 'Merge', value: 'merge', color: 'green' },
+                { label: 'Rebase', value: 'rebase', color: 'blue' },
+            ], onSelect: handleOperationSelect, initialIndex: 0, hint: hint }));
     }
     if (step === 'confirm-merge') {
         const confirmMessage = (React.createElement(Box, { flexDirection: "column" },
@@ -149,7 +132,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
                 ' ',
                 React.createElement(Text, { color: "yellow" }, targetBranch),
                 "?")));
-        return (React.createElement(Confirmation, { message: confirmMessage, onConfirm: () => setStep('executing-merge'), onCancel: onCancel }));
+        return (React.createElement(SimpleConfirmation, { message: confirmMessage, onConfirm: () => setStep('executing-merge'), onCancel: onCancel }));
     }
     if (step === 'executing-merge') {
         return (React.createElement(Box, { flexDirection: "column" },
@@ -177,7 +160,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
                 React.createElement(Text, { color: "yellow" }, sourceBranch),
                 ' ',
                 "and its worktree?")));
-        return (React.createElement(Confirmation, { message: deleteMessage, onConfirm: () => {
+        return (React.createElement(SimpleConfirmation, { message: deleteMessage, onConfirm: () => {
                 const deleteResult = worktreeService.deleteWorktreeByBranch(sourceBranch);
                 if (deleteResult.success) {
                     onComplete();

package/dist/services/sessionManager.js

@@ -24,7 +24,7 @@ export class SessionManager extends EventEmitter {
         // Create a detector based on the session's detection strategy
         const strategy = session.detectionStrategy || 'claude';
         const detector = createStateDetector(strategy);
-        return detector.detectState(session.terminal);
+        return detector.detectState(session.terminal, session.state);
     }
     constructor() {
         super();

package/dist/services/stateDetector.d.ts

@@ -1,19 +1,19 @@
 import { SessionState, Terminal, StateDetectionStrategy } from '../types/index.js';
 export interface StateDetector {
-    detectState(terminal: Terminal): SessionState;
+    detectState(terminal: Terminal, currentState: SessionState): SessionState;
 }
 export declare function createStateDetector(strategy?: StateDetectionStrategy): StateDetector;
 export declare abstract class BaseStateDetector implements StateDetector {
-    abstract detectState(terminal: Terminal): SessionState;
+    abstract detectState(terminal: Terminal, currentState: SessionState): SessionState;
     protected getTerminalLines(terminal: Terminal, maxLines?: number): string[];
     protected getTerminalContent(terminal: Terminal, maxLines?: number): string;
 }
 export declare class ClaudeStateDetector extends BaseStateDetector {
-    detectState(terminal: Terminal): SessionState;
+    detectState(terminal: Terminal, currentState: SessionState): SessionState;
 }
 export declare class GeminiStateDetector extends BaseStateDetector {
-    detectState(terminal: Terminal): SessionState;
+    detectState(terminal: Terminal, _currentState: SessionState): SessionState;
 }
 export declare class CodexStateDetector extends BaseStateDetector {
-    detectState(terminal: Terminal): SessionState;
+    detectState(terminal: Terminal, _currentState: SessionState): SessionState;
 }

package/dist/services/stateDetector.js

@@ -32,9 +32,13 @@ export class BaseStateDetector {
     }
 }
 export class ClaudeStateDetector extends BaseStateDetector {
-    detectState(terminal) {
+    detectState(terminal, currentState) {
         const content = this.getTerminalContent(terminal);
         const lowerContent = content.toLowerCase();
+        // Check for ctrl+r toggle prompt - maintain current state
+        if (lowerContent.includes('ctrl+r to toggle')) {
+            return currentState;
+        }
         // Check for waiting prompts with box character
         if (content.includes('│ Do you want') ||
             content.includes('│ Would you like')) {
@@ -50,7 +54,7 @@ export class ClaudeStateDetector extends BaseStateDetector {
 }
 // https://github.com/google-gemini/gemini-cli/blob/main/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
 export class GeminiStateDetector extends BaseStateDetector {
-    detectState(terminal) {
+    detectState(terminal, _currentState) {
         const content = this.getTerminalContent(terminal);
         const lowerContent = content.toLowerCase();
         // Check for waiting prompts with box character
@@ -68,7 +72,7 @@ export class GeminiStateDetector extends BaseStateDetector {
     }
 }
 export class CodexStateDetector extends BaseStateDetector {
-    detectState(terminal) {
+    detectState(terminal, _currentState) {
         const content = this.getTerminalContent(terminal);
         const lowerContent = content.toLowerCase();
         // Check for waiting prompts

package/dist/services/stateDetector.test.js

@@ -33,7 +33,7 @@ describe('ClaudeStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input');
         });
@@ -45,7 +45,7 @@ describe('ClaudeStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input');
         });
@@ -56,7 +56,7 @@ describe('ClaudeStateDetector', () => {
                 'Press ESC to interrupt',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('busy');
         });
@@ -67,7 +67,7 @@ describe('ClaudeStateDetector', () => {
                 'press esc to interrupt the process',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('busy');
         });
@@ -79,7 +79,7 @@ describe('ClaudeStateDetector', () => {
                 '> ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -87,7 +87,7 @@ describe('ClaudeStateDetector', () => {
             // Arrange
             terminal = createMockTerminal([]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -106,7 +106,7 @@ describe('ClaudeStateDetector', () => {
             }
             terminal = createMockTerminal(lines);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('idle'); // Should not detect the old prompt
         });
@@ -118,10 +118,42 @@ describe('ClaudeStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input'); // waiting_input should take precedence
         });
+        it('should maintain current state when "ctrl+r to toggle" is present', () => {
+            // Arrange
+            terminal = createMockTerminal([
+                'Some output',
+                'Press Ctrl+R to toggle history search',
+                'More output',
+            ]);
+            // Act - test with different current states
+            const idleState = detector.detectState(terminal, 'idle');
+            const busyState = detector.detectState(terminal, 'busy');
+            const waitingState = detector.detectState(terminal, 'waiting_input');
+            // Assert - should maintain whatever the current state was
+            expect(idleState).toBe('idle');
+            expect(busyState).toBe('busy');
+            expect(waitingState).toBe('waiting_input');
+        });
+        it('should maintain current state for various "ctrl+r" patterns', () => {
+            // Arrange - test different case variations
+            const patterns = [
+                'ctrl+r to toggle',
+                'CTRL+R TO TOGGLE',
+                'Ctrl+R to toggle history',
+                'Press ctrl+r to toggle the search',
+            ];
+            for (const pattern of patterns) {
+                terminal = createMockTerminal(['Some output', pattern]);
+                // Act
+                const state = detector.detectState(terminal, 'busy');
+                // Assert - should maintain the current state
+                expect(state).toBe('busy');
+            }
+        });
     });
 });
 describe('GeminiStateDetector', () => {
@@ -157,7 +189,7 @@ describe('GeminiStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input');
         });
@@ -169,7 +201,7 @@ describe('GeminiStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input');
         });
@@ -181,7 +213,7 @@ describe('GeminiStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input');
         });
@@ -192,7 +224,7 @@ describe('GeminiStateDetector', () => {
                 'Press ESC to cancel',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('busy');
         });
@@ -203,7 +235,7 @@ describe('GeminiStateDetector', () => {
                 'Press Esc to cancel the operation',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('busy');
         });
@@ -214,7 +246,7 @@ describe('GeminiStateDetector', () => {
                 'Type your message below',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -222,7 +254,7 @@ describe('GeminiStateDetector', () => {
             // Arrange
             terminal = createMockTerminal([]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('idle');
         });
@@ -234,7 +266,7 @@ describe('GeminiStateDetector', () => {
                 '│ > ',
             ]);
             // Act
-            const state = detector.detectState(terminal);
+            const state = detector.detectState(terminal, 'idle');
             // Assert
             expect(state).toBe('waiting_input'); // waiting_input should take precedence
         });
@@ -267,7 +299,7 @@ describe('CodexStateDetector', () => {
         // Arrange
         terminal = createMockTerminal(['Some output', '│Allow execution?', '│ > ']);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('waiting_input');
     });
@@ -275,7 +307,7 @@ describe('CodexStateDetector', () => {
         // Arrange
         terminal = createMockTerminal(['Some output', 'Continue? [y/N]', '> ']);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('waiting_input');
     });
@@ -286,7 +318,7 @@ describe('CodexStateDetector', () => {
             'Press any key to continue...',
         ]);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('waiting_input');
     });
@@ -298,7 +330,7 @@ describe('CodexStateDetector', () => {
             'Working...',
         ]);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('busy');
     });
@@ -310,7 +342,7 @@ describe('CodexStateDetector', () => {
             'Working...',
         ]);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('busy');
     });
@@ -318,7 +350,7 @@ describe('CodexStateDetector', () => {
         // Arrange
         terminal = createMockTerminal(['Normal output', 'Some message', 'Ready']);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('idle');
     });
@@ -326,7 +358,7 @@ describe('CodexStateDetector', () => {
         // Arrange
         terminal = createMockTerminal(['press esc to cancel', '[y/N]']);
         // Act
-        const state = detector.detectState(terminal);
+        const state = detector.detectState(terminal, 'idle');
         // Assert
         expect(state).toBe('waiting_input');
     });

package/package.json

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