ccmanager 3.3.0 → 3.3.2

package/README.md

@@ -112,23 +112,24 @@ Note: Shortcuts from `shortcuts.json` will be automatically migrated to `config.
 
 ## Supported AI Assistants
 
-CCManager now supports multiple AI coding assistants with tailored state detection:
-
-### Claude Code (Default)
-- Command: `claude`
-- State detection: Built-in patterns for Claude's prompts and status messages
-
-### Gemini CLI
-- Command: `gemini`
-- State detection: Custom patterns for Gemini's confirmation prompts
-- Installation: [google-gemini/gemini-cli](https://github.com/google-gemini/gemini-cli)
+CCManager supports multiple AI coding assistants with tailored state detection for each:
+
+| Assistant | Command | Installation |
+|-----------|---------|--------------|
+| Claude Code (Default) | `claude` | [code.claude.com](https://code.claude.com/docs/en/setup) |
+| Gemini CLI | `gemini` | [github.com/google-gemini/gemini-cli](https://github.com/google-gemini/gemini-cli) |
+| Codex CLI | `codex` | [github.com/openai/codex](https://github.com/openai/codex) |
+| Cursor Agent | `cursor-agent` | [cursor.com/cli](https://cursor.com/docs/cli/overview) |
+| Copilot CLI | `copilot` | [github.com/github/copilot-cli](https://github.com/github/copilot-cli) |
+| Cline CLI | `cline` | [github.com/cline/cline](https://github.com/cline/cline) |
+| OpenCode | `opencode` | [opencode.ai/docs](https://opencode.ai/docs) |
 
 Each assistant has its own state detection strategy to properly track:
 - **Idle**: Ready for new input
 - **Busy**: Processing a request
 - **Waiting**: Awaiting user confirmation
 
-See [Gemini Support Documentation](docs/gemini-support.md) for detailed configuration instructions.
+See [Gemini Support Documentation](docs/gemini-support.md) for CCManager-specific configuration.
 
 
 ## Command Configuration

package/dist/components/ConfigureCommand.js

@@ -25,6 +25,16 @@ const createStrategyItems = () => {
 };
 // Type-safe strategy items that ensures all StateDetectionStrategy values are included
 const ALL_STRATEGY_ITEMS = createStrategyItems();
+// Default command mapping for each strategy
+const DEFAULT_COMMANDS = {
+    claude: 'claude',
+    gemini: 'gemini',
+    codex: 'codex',
+    cursor: 'cursor',
+    'github-copilot': 'copilot',
+    cline: 'cline',
+    opencode: 'opencode',
+};
 const formatDetectionStrategy = (strategy) => {
     const value = strategy || 'claude';
     switch (value) {
@@ -57,7 +67,7 @@ const ConfigureCommand = ({ onComplete }) => {
     const [isSelectingStrategy, setIsSelectingStrategy] = useState(false);
     const [isSelectingStrategyInAdd, setIsSelectingStrategyInAdd] = useState(false);
     const [newPreset, setNewPreset] = useState({});
-    const [addStep, setAddStep] = useState('name');
+    const [addStep, setAddStep] = useState('detectionStrategy');
     const [errorMessage, setErrorMessage] = useState(null);
     // Remove handleListNavigation as SelectInput handles navigation internally
     // Remove handleListSelection as we now use handleSelectItem
@@ -142,19 +152,8 @@ const ConfigureCommand = ({ onComplete }) => {
     };
     const handleAddPresetInput = (value) => {
         switch (addStep) {
-            case 'name':
-                // Prevent using "Default" as a name to avoid confusion
-                if (value.trim().toLowerCase() === 'default') {
-                    setErrorMessage('Cannot use "Default" as a preset name. Please choose a different name.');
-                    return;
-                }
-                setNewPreset({ ...newPreset, name: value });
-                setAddStep('command');
-                setInputValue('');
-                setErrorMessage(null);
-                break;
             case 'command':
-                setNewPreset({ ...newPreset, command: value || 'claude' });
+                setNewPreset({ ...newPreset, command: value });
                 setAddStep('args');
                 setInputValue('');
                 break;
@@ -170,8 +169,38 @@ const ConfigureCommand = ({ onComplete }) => {
                     ? value.trim().split(/\s+/)
                     : undefined;
                 setNewPreset({ ...newPreset, fallbackArgs });
+                setAddStep('name');
+                setInputValue('');
+                break;
+            }
+            case 'name': {
+                if (!value.trim()) {
+                    setErrorMessage('Preset name cannot be empty. Please enter a name.');
+                    return;
+                }
+                if (value.trim().toLowerCase() === 'default') {
+                    setErrorMessage('Cannot use "Default" as a preset name. Please choose a different name.');
+                    return;
+                }
+                const id = Date.now().toString();
+                const completePreset = {
+                    id,
+                    name: value,
+                    command: newPreset.command || 'claude',
+                    args: newPreset.args,
+                    fallbackArgs: newPreset.fallbackArgs,
+                    detectionStrategy: newPreset.detectionStrategy || 'claude',
+                };
+                const updatedPresets = [...presets, completePreset];
+                setPresets(updatedPresets);
+                configurationManager.addPreset(completePreset);
+                setViewMode('list');
+                setSelectedIndex(updatedPresets.length - 1);
+                setNewPreset({});
                 setAddStep('detectionStrategy');
-                setIsSelectingStrategyInAdd(true);
+                setInputValue('');
+                setIsSelectingStrategyInAdd(false);
+                setErrorMessage(null);
                 break;
             }
         }
@@ -188,25 +217,16 @@ const ConfigureCommand = ({ onComplete }) => {
         setIsSelectingStrategy(false);
     };
     const handleAddStrategySelect = (item) => {
-        const id = Date.now().toString();
-        const completePreset = {
-            id,
-            name: newPreset.name || 'New Preset',
-            command: newPreset.command || 'claude',
-            args: newPreset.args,
-            fallbackArgs: newPreset.fallbackArgs,
-            detectionStrategy: item.value,
-        };
-        const updatedPresets = [...presets, completePreset];
-        setPresets(updatedPresets);
-        configurationManager.addPreset(completePreset);
-        setViewMode('list');
-        setSelectedIndex(updatedPresets.length - 1);
-        setNewPreset({});
-        setAddStep('name');
-        setInputValue('');
+        const strategy = item.value;
+        const defaultCommand = DEFAULT_COMMANDS[strategy];
+        setNewPreset({
+            ...newPreset,
+            detectionStrategy: strategy,
+            command: defaultCommand,
+        });
+        setAddStep('command');
+        setInputValue(defaultCommand);
         setIsSelectingStrategyInAdd(false);
-        setErrorMessage(null);
     };
     const handleDeleteConfirm = () => {
         if (selectedIndex === 0) {
@@ -239,7 +259,7 @@ const ConfigureCommand = ({ onComplete }) => {
             else if (isSelectingStrategyInAdd) {
                 setIsSelectingStrategyInAdd(false);
                 setViewMode('list');
-                setAddStep('name');
+                setAddStep('detectionStrategy');
                 setNewPreset({});
             }
             else if (editField) {
@@ -338,6 +358,8 @@ const ConfigureCommand = ({ onComplete }) => {
                     React.createElement(Text, { bold: true, color: "green" }, "Add New Preset - Detection Strategy")),
                 React.createElement(Box, { marginBottom: 1 },
                     React.createElement(Text, null, "Choose the state detection strategy for this preset:")),
+                React.createElement(Box, { marginBottom: 1 },
+                    React.createElement(Text, { dimColor: true }, "The command will be auto-set based on the strategy (can be changed later)")),
                 React.createElement(SelectInput, { items: strategyItems, onSelect: handleAddStrategySelect, initialIndex: 0 }),
                 React.createElement(Box, { marginTop: 1 },
                     React.createElement(Text, { dimColor: true },
@@ -347,23 +369,26 @@ const ConfigureCommand = ({ onComplete }) => {
                         " to cancel"))));
         }
         const titles = {
-            name: 'Enter preset name:',
-            command: 'Enter command (e.g., claude):',
+            detectionStrategy: 'Select detection strategy:',
+            command: 'Enter command (default set by strategy, can be modified):',
             args: 'Enter command arguments (space-separated):',
             fallbackArgs: 'Enter fallback arguments (space-separated):',
+            name: 'Enter preset name (freely customizable):',
         };
         return (React.createElement(Box, { flexDirection: "column" },
             React.createElement(Box, { marginBottom: 1 },
                 React.createElement(Text, { bold: true, color: "green" }, "Add New Preset")),
             React.createElement(Box, { marginBottom: 1 },
                 React.createElement(Text, null, titles[addStep])),
+            addStep === 'command' && (React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, { dimColor: true }, "Auto-filled from your strategy selection. You can change this if needed."))),
             errorMessage && (React.createElement(Box, { marginBottom: 1 },
                 React.createElement(Text, { color: "red" }, errorMessage))),
             React.createElement(Box, null,
-                React.createElement(TextInputWrapper, { value: inputValue, onChange: setInputValue, onSubmit: handleAddPresetInput, placeholder: addStep === 'args' || addStep === 'fallbackArgs'
-                        ? 'e.g., --resume or leave empty'
-                        : addStep === 'name'
-                            ? 'e.g., Development'
+                React.createElement(TextInputWrapper, { value: inputValue, onChange: setInputValue, onSubmit: handleAddPresetInput, placeholder: addStep === 'name'
+                        ? 'e.g., Development'
+                        : addStep === 'args' || addStep === 'fallbackArgs'
+                            ? 'e.g., --resume or leave empty'
                             : '' })),
             React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { dimColor: true },
@@ -494,7 +519,8 @@ const ConfigureCommand = ({ onComplete }) => {
             // Add New Preset
             setViewMode('add');
             setNewPreset({});
-            setAddStep('name');
+            setAddStep('detectionStrategy');
+            setIsSelectingStrategyInAdd(true);
             setInputValue('');
         }
         else if (item.value === 'exit') {

package/dist/components/Session.js

@@ -1,68 +1,9 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { Box, Text, useStdout } from 'ink';
+import { useEffect, useState } from 'react';
+import { useStdout } from 'ink';
 import { shortcutManager } from '../services/shortcutManager.js';
 const Session = ({ session, sessionManager, onReturnToMenu, }) => {
     const { stdout } = useStdout();
     const [isExiting, setIsExiting] = useState(false);
-    const deriveStatus = (currentSession) => {
-        const stateData = currentSession.stateMutex.getSnapshot();
-        // Always prioritize showing the manual approval notice when verification failed
-        if (stateData.autoApprovalFailed) {
-            const reason = stateData.autoApprovalReason
-                ? ` Reason: ${stateData.autoApprovalReason}.`
-                : '';
-            return {
-                message: `Auto-approval failed.${reason} Manual approval required—respond to the prompt.`,
-                variant: 'error',
-            };
-        }
-        if (stateData.state === 'pending_auto_approval') {
-            return {
-                message: 'Auto-approval pending... verifying permissions (press any key to cancel)',
-                variant: 'pending',
-            };
-        }
-        return { message: null, variant: null };
-    };
-    const initialStatus = deriveStatus(session);
-    const [statusMessage, setStatusMessage] = useState(initialStatus.message);
-    const [statusVariant, setStatusVariant] = useState(initialStatus.variant);
-    const [columns, setColumns] = useState(() => stdout?.columns ?? process.stdout.columns ?? 80);
-    const { statusLineText, backgroundColor, textColor } = useMemo(() => {
-        if (!statusMessage || !statusVariant) {
-            return {
-                statusLineText: null,
-                backgroundColor: undefined,
-                textColor: undefined,
-            };
-        }
-        const maxContentWidth = Math.max(columns - 4, 0);
-        const prefix = statusVariant === 'error'
-            ? '[AUTO-APPROVAL REQUIRED]'
-            : '[AUTO-APPROVAL]';
-        const prefixed = `${prefix} ${statusMessage}`;
-        const trimmed = prefixed.length > maxContentWidth
-            ? prefixed.slice(0, maxContentWidth)
-            : prefixed;
-        return {
-            statusLineText: ` ${trimmed}`.padEnd(columns, ' '),
-            backgroundColor: statusVariant === 'error' ? '#d90429' : '#ffd166',
-            textColor: statusVariant === 'error' ? 'white' : '#1c1c1c',
-        };
-    }, [columns, statusMessage, statusVariant]);
-    useEffect(() => {
-        const handleSessionStateChange = (updatedSession) => {
-            if (updatedSession.id !== session.id)
-                return;
-            const { message, variant } = deriveStatus(updatedSession);
-            setStatusMessage(message);
-            setStatusVariant(variant);
-        };
-        sessionManager.on('sessionStateChanged', handleSessionStateChange);
-        return () => {
-            sessionManager.off('sessionStateChanged', handleSessionStateChange);
-        };
-    }, [session.id, sessionManager]);
     const stripOscColorSequences = (input) => {
         // Remove default foreground/background color OSC sequences that Codex emits
         // These sequences leak as literal text when replaying buffered output
@@ -168,7 +109,6 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         const handleSessionExit = (exitedSession) => {
             if (exitedSession.id === session.id) {
                 setIsExiting(true);
-                setStatusMessage(null);
                 // Don't call onReturnToMenu here - App component handles it
             }
         };
@@ -178,7 +118,6 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         const handleResize = () => {
             const cols = process.stdout.columns || 80;
             const rows = process.stdout.rows || 24;
-            setColumns(cols);
             session.process.resize(cols, rows);
             // Also resize the virtual terminal
             if (session.terminal) {
@@ -244,7 +183,6 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             stdout.off('resize', handleResize);
         };
     }, [session, sessionManager, stdout, onReturnToMenu, isExiting]);
-    return statusLineText ? (React.createElement(Box, { width: "100%" },
-        React.createElement(Text, { backgroundColor: backgroundColor, color: textColor, bold: true }, statusLineText))) : null;
+    return null;
 };
 export default Session;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "3.3.0",
+	"version": "3.3.2",
 	"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.3.0",
-		"@kodaikabasawa/ccmanager-darwin-x64": "3.3.0",
-		"@kodaikabasawa/ccmanager-linux-arm64": "3.3.0",
-		"@kodaikabasawa/ccmanager-linux-x64": "3.3.0",
-		"@kodaikabasawa/ccmanager-win32-x64": "3.3.0"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "3.3.2",
+		"@kodaikabasawa/ccmanager-darwin-x64": "3.3.2",
+		"@kodaikabasawa/ccmanager-linux-arm64": "3.3.2",
+		"@kodaikabasawa/ccmanager-linux-x64": "3.3.2",
+		"@kodaikabasawa/ccmanager-win32-x64": "3.3.2"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",
@@ -68,14 +68,14 @@
 	},
 	"prettier": "@vdemedes/prettier-config",
 	"dependencies": {
-		"@xterm/headless": "^5.5.0",
+		"@xterm/headless": "^6.0.0",
 		"effect": "^3.18.2",
 		"ink": "5.2.1",
 		"ink-select-input": "^6.0.0",
 		"ink-text-input": "^6.0.0",
 		"meow": "^11.0.0",
 		"react": "18.3.1",
-		"react-devtools-core": "^4.19.1",
+		"react-devtools-core": "^7.0.1",
 		"react-dom": "18.3.1",
 		"strip-ansi": "^7.1.0"
 	}