ccmanager 3.12.0 → 3.12.2

package/dist/components/Dashboard.js

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useState, useEffect, useMemo } from 'react';
-import { Box, Text, useInput, useStdout } from 'ink';
+import { Box, Text, useInput } from 'ink';
 import { Effect } from 'effect';
 import SelectInput from 'ink-select-input';
 import stripAnsi from 'strip-ansi';
@@ -10,10 +10,11 @@ import { SessionManager } from '../services/sessionManager.js';
 import { WorktreeService } from '../services/worktreeService.js';
 import { STATUS_ICONS, STATUS_LABELS, MENU_ICONS, getStatusDisplay, } from '../constants/statusIcons.js';
 import { useSearchMode } from '../hooks/useSearchMode.js';
+import { useDynamicLimit } from '../hooks/useDynamicLimit.js';
 import { useGitStatus } from '../hooks/useGitStatus.js';
 import { truncateString, calculateColumnPositions, assembleWorktreeLabel, formatRelativeDate, } from '../utils/worktreeUtils.js';
 import { formatGitFileChanges, formatGitAheadBehind, formatParentBranch, } from '../utils/gitStatus.js';
-import TextInputWrapper from './TextInputWrapper.js';
+import SearchableList from './SearchableList.js';
 const MAX_BRANCH_NAME_LENGTH = 70;
 const createSeparatorWithText = (text, totalWidth = 35) => {
     const textWithSpaces = ` ${text} `;
@@ -72,14 +73,15 @@ const Dashboard = ({ projectsDir, onSelectSession, onSelectProject, error, onDis
     const [sessionEntries, setSessionEntries] = useState([]);
     const [baseSessionWorktrees, setBaseSessionWorktrees] = useState([]);
     const [sessionRefreshKey, setSessionRefreshKey] = useState(0);
-    const { stdout } = useStdout();
-    const fixedRows = 6;
     const displayError = error || loadError;
     const { isSearchMode, searchQuery, selectedIndex, setSearchQuery } = useSearchMode(items.length, {
         isDisabled: !!displayError,
         skipInTest: false,
     });
-    const limit = Math.max(5, stdout.rows - fixedRows - (isSearchMode ? 1 : 0) - (displayError ? 3 : 0));
+    const limit = useDynamicLimit({
+        isSearchMode,
+        hasError: !!displayError,
+    });
     // Git status polling for session worktrees
     const enrichedWorktrees = useGitStatus(baseSessionWorktrees, baseSessionWorktrees.length > 0 ? 'main' : null);
     // Discover projects on mount
@@ -440,7 +442,7 @@ const Dashboard = ({ projectsDir, onSelectSession, onSelectProject, error, onDis
             });
         }
     };
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, flexDirection: "column", children: _jsxs(Text, { bold: true, color: "green", children: ["CCManager - Dashboard v", version] }) }), isSearchMode && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { children: "Search: " }), _jsx(TextInputWrapper, { value: searchQuery, onChange: setSearchQuery, focus: true, placeholder: "Type to filter..." })] })), loading ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: "Discovering projects..." }) })) : projects.length === 0 && !displayError ? (_jsx(Box, { children: _jsxs(Text, { color: "yellow", children: ["No git repositories found in ", projectsDir] }) })) : isSearchMode && items.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: "No matches found" }) })) : isSearchMode ? (_jsx(Box, { flexDirection: "column", children: items.slice(0, limit).map((item, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', item.label] }, item.value))) })) : (_jsx(SelectInput, { items: items, onSelect: item => handleSelect(item), isFocused: !displayError, limit: limit, initialIndex: selectedIndex })), displayError && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "red", children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", displayError] }), _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to dismiss" })] }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Status: ", STATUS_ICONS.BUSY, " ", STATUS_LABELS.BUSY, ' ', STATUS_ICONS.WAITING, " ", STATUS_LABELS.WAITING, " ", STATUS_ICONS.IDLE, ' ', STATUS_LABELS.IDLE] }), _jsx(Text, { dimColor: true, children: isSearchMode
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, flexDirection: "column", children: _jsxs(Text, { bold: true, color: "green", children: ["CCManager - Dashboard v", version] }) }), loading ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: "Discovering projects..." }) })) : projects.length === 0 && !displayError ? (_jsx(Box, { children: _jsxs(Text, { color: "yellow", children: ["No git repositories found in ", projectsDir] }) })) : (_jsx(SearchableList, { isSearchMode: isSearchMode, searchQuery: searchQuery, onSearchQueryChange: setSearchQuery, selectedIndex: selectedIndex, items: items, limit: limit, placeholder: "Type to filter...", noMatchMessage: "No matches found", children: _jsx(SelectInput, { items: items, onSelect: item => handleSelect(item), isFocused: !displayError, limit: limit, initialIndex: selectedIndex }) })), displayError && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "red", children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", displayError] }), _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to dismiss" })] }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Status: ", STATUS_ICONS.BUSY, " ", STATUS_LABELS.BUSY, ' ', STATUS_ICONS.WAITING, " ", STATUS_LABELS.WAITING, " ", STATUS_ICONS.IDLE, ' ', STATUS_LABELS.IDLE] }), _jsx(Text, { dimColor: true, children: isSearchMode
                             ? 'Search Mode: Type to filter, Enter to exit search, ESC to exit search'
                             : searchQuery
                                 ? `Filtered: "${searchQuery}" | ↑↓ Navigate Enter Select | /-Search ESC-Clear 0-9 Quick Select R-Refresh Q-Quit`

package/dist/components/DeleteWorktree.js

@@ -7,6 +7,10 @@ import { Effect } from 'effect';
 import { WorktreeService } from '../services/worktreeService.js';
 import DeleteConfirmation from './DeleteConfirmation.js';
 import { shortcutManager } from '../services/shortcutManager.js';
+import { useSearchMode } from '../hooks/useSearchMode.js';
+import { useDynamicLimit } from '../hooks/useDynamicLimit.js';
+import { filterWorktreesByQuery } from '../utils/filterByQuery.js';
+import SearchableList from './SearchableList.js';
 const DeleteWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const [worktrees, setWorktrees] = useState([]);
     const [selectedIndices, setSelectedIndices] = useState(new Set());
@@ -14,6 +18,15 @@ const DeleteWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const [focusedIndex, setFocusedIndex] = useState(0);
     const [error, setError] = useState(null);
     const [isLoading, setIsLoading] = useState(true);
+    const [menuItems, setMenuItems] = useState([]);
+    // Use the search mode hook
+    const { isSearchMode, searchQuery, selectedIndex, setSearchQuery } = useSearchMode(menuItems.length, {
+        isDisabled: confirmMode,
+    });
+    const limit = useDynamicLimit({
+        isSearchMode,
+        hasError: !!error,
+    });
     useEffect(() => {
         let cancelled = false;
         const loadWorktrees = async () => {
@@ -49,17 +62,22 @@ const DeleteWorktree = ({ projectPath, onComplete, onCancel, }) => {
             cancelled = true;
         };
     }, [projectPath]);
-    // Create menu items from worktrees
-    const menuItems = worktrees.map((worktree, index) => {
-        const branchName = worktree.branch
-            ? worktree.branch.replace('refs/heads/', '')
-            : 'detached';
-        const isSelected = selectedIndices.has(index);
-        return {
-            label: `${isSelected ? '[✓]' : '[ ]'} ${branchName} (${worktree.path})`,
-            value: index.toString(),
-        };
-    });
+    // Build menu items from worktrees, filtering by search query
+    useEffect(() => {
+        const filteredWorktrees = filterWorktreesByQuery(worktrees, searchQuery);
+        const items = filteredWorktrees.map(worktree => {
+            const originalIndex = worktrees.indexOf(worktree);
+            const branchName = worktree.branch
+                ? worktree.branch.replace('refs/heads/', '')
+                : 'detached';
+            const isSelected = selectedIndices.has(originalIndex);
+            return {
+                label: `${isSelected ? '[✓]' : '[ ]'} ${branchName} (${worktree.path})`,
+                value: originalIndex.toString(),
+            };
+        });
+        setMenuItems(items);
+    }, [worktrees, searchQuery, selectedIndices]);
     const handleSelect = (item) => {
         // Don't toggle on Enter - this will be used to confirm
         // We'll handle Space key separately for toggling
@@ -71,6 +89,10 @@ const DeleteWorktree = ({ projectPath, onComplete, onCancel, }) => {
             // Confirmation component handles input
             return;
         }
+        // Don't process other keys if in search mode (handled by useSearchMode)
+        if (isSearchMode) {
+            return;
+        }
         if (input === ' ') {
             // Toggle selection on space
             setSelectedIndices(prev => {
@@ -111,13 +133,14 @@ const DeleteWorktree = ({ projectPath, onComplete, onCancel, }) => {
         };
         return (_jsx(DeleteConfirmation, { worktrees: selectedWorktrees, onConfirm: handleConfirm, onCancel: handleCancel }));
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "red", children: "Delete Worktrees" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Select worktrees to delete (Space to select, Enter to confirm):" }) }), _jsx(SelectInput, { items: menuItems, onSelect: handleSelect, onHighlight: (item) => {
-                    const index = parseInt(item.value, 10);
-                    setFocusedIndex(index);
-                }, limit: 10, indicatorComponent: ({ isSelected }) => (_jsx(Text, { color: isSelected ? 'green' : undefined, children: isSelected ? '>' : ' ' })), itemComponent: ({ isSelected, label }) => {
-                    // Check if this item is actually selected (checkbox checked)
-                    const hasCheckmark = label.includes('[✓]');
-                    return (_jsx(Text, { color: isSelected ? 'green' : undefined, inverse: isSelected, dimColor: !isSelected && !hasCheckmark, children: label }));
-                } }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Controls: \u2191\u2193/j/k Navigate, Space Select, Enter Confirm,", ' ', shortcutManager.getShortcutDisplay('cancel'), " Cancel"] }), selectedIndices.size > 0 && (_jsxs(Text, { color: "yellow", children: [selectedIndices.size, " worktree", selectedIndices.size > 1 ? 's' : '', ' ', "selected"] }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "red", children: "Delete Worktrees" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Select worktrees to delete (Space to select, Enter to confirm):" }) }), _jsx(SearchableList, { isSearchMode: isSearchMode, searchQuery: searchQuery, onSearchQueryChange: setSearchQuery, selectedIndex: selectedIndex, items: menuItems, limit: limit, placeholder: "Type to filter worktrees...", noMatchMessage: "No worktrees match your search", children: _jsx(SelectInput, { items: menuItems, onSelect: handleSelect, onHighlight: (item) => {
+                        const index = parseInt(item.value, 10);
+                        setFocusedIndex(index);
+                    }, limit: limit, indicatorComponent: ({ isSelected }) => (_jsx(Text, { color: isSelected ? 'green' : undefined, children: isSelected ? '>' : ' ' })), itemComponent: ({ isSelected, label }) => {
+                        const hasCheckmark = label.includes('[✓]');
+                        return (_jsx(Text, { color: isSelected ? 'green' : undefined, inverse: isSelected, dimColor: !isSelected && !hasCheckmark, children: label }));
+                    } }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: isSearchMode
+                            ? 'Search Mode: Type to filter, Enter to exit search, ESC to exit search'
+                            : `Controls: ↑↓/j/k Navigate, Space Select, Enter Confirm, /-Search, ${shortcutManager.getShortcutDisplay('cancel')} Cancel` }), selectedIndices.size > 0 && (_jsxs(Text, { color: "yellow", children: [selectedIndices.size, " worktree", selectedIndices.size > 1 ? 's' : '', ' ', "selected"] }))] })] }));
 };
 export default DeleteWorktree;

package/dist/components/Menu.js

@@ -1,6 +1,6 @@
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
-import { Box, Text, useInput, useStdout } from 'ink';
+import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
 import { Effect } from 'effect';
 import { SessionManager } from '../services/sessionManager.js';
@@ -8,8 +8,10 @@ import { STATUS_ICONS, STATUS_LABELS, MENU_ICONS, } from '../constants/statusIco
 import { useGitStatus } from '../hooks/useGitStatus.js';
 import { prepareWorktreeItems, calculateColumnPositions, assembleWorktreeLabel, } from '../utils/worktreeUtils.js';
 import { projectManager } from '../services/projectManager.js';
-import TextInputWrapper from './TextInputWrapper.js';
 import { useSearchMode } from '../hooks/useSearchMode.js';
+import { useDynamicLimit } from '../hooks/useDynamicLimit.js';
+import { filterWorktreesByQuery } from '../utils/filterByQuery.js';
+import SearchableList from './SearchableList.js';
 import { globalSessionOrchestrator } from '../services/globalSessionOrchestrator.js';
 import { configReader } from '../services/config/configReader.js';
 const createSeparatorWithText = (text, totalWidth = 35) => {
@@ -37,16 +39,14 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
     const [recentProjects, setRecentProjects] = useState([]);
     const [highlightedWorktreePath, setHighlightedWorktreePath] = useState(null);
     const [autoApprovalToggleCounter, setAutoApprovalToggleCounter] = useState(0);
-    const { stdout } = useStdout();
-    const fixedRows = 6;
     // Use the search mode hook
     const { isSearchMode, searchQuery, selectedIndex, setSearchQuery } = useSearchMode(items.length, {
         isDisabled: !!error || !!loadError,
     });
-    const limit = Math.max(5, stdout.rows -
-        fixedRows -
-        (isSearchMode ? 1 : 0) -
-        (error || loadError ? 3 : 0));
+    const limit = useDynamicLimit({
+        isSearchMode,
+        hasError: !!(error || loadError),
+    });
     // Get worktree configuration for sorting
     const worktreeConfig = configReader.getWorktreeConfig();
     useEffect(() => {
@@ -129,14 +129,9 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
         const items = prepareWorktreeItems(worktrees, sessions);
         const columnPositions = calculateColumnPositions(items);
         // Filter worktrees based on search query
-        const filteredItems = searchQuery
-            ? items.filter(item => {
-                const branchName = item.worktree.branch || '';
-                const searchLower = searchQuery.toLowerCase();
-                return (branchName.toLowerCase().includes(searchLower) ||
-                    item.worktree.path.toLowerCase().includes(searchLower));
-            })
-            : items;
+        const filteredWorktrees = filterWorktreesByQuery(items.map(item => item.worktree), searchQuery);
+        const filteredWorktreeSet = new Set(filteredWorktrees);
+        const filteredItems = items.filter(item => filteredWorktreeSet.has(item.worktree));
         // Build menu items with proper alignment
         const menuItems = filteredItems.map((item, index) => {
             const baseLabel = assembleWorktreeLabel(item, columnPositions);
@@ -510,19 +505,17 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
             onSelectWorktree(item.worktree);
         }
     };
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { bold: true, color: "green", children: ["CCManager - Claude Code Worktree Manager v", version] }), projectName && (_jsx(Text, { bold: true, color: "green", children: projectName }))] }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Select a worktree to start or resume a Claude Code session:" }) }), isSearchMode && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { children: "Search: " }), _jsx(TextInputWrapper, { value: searchQuery, onChange: setSearchQuery, focus: true, placeholder: "Type to filter worktrees..." })] })), isSearchMode && items.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: "No worktrees match your search" }) })) : isSearchMode ? (
-            // In search mode, show the items as a list without SelectInput
-            _jsx(Box, { flexDirection: "column", children: items.slice(0, limit).map((item, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', item.label] }, item.value))) })) : (_jsx(SelectInput, { items: items, onSelect: item => handleSelect(item), onHighlight: item => {
-                    // ink-select-input may call onHighlight with undefined when items are empty
-                    // (e.g., during menu re-mount after returning from a session), so guard it.
-                    if (!item) {
-                        return;
-                    }
-                    const menuItem = item;
-                    if (menuItem.type === 'worktree') {
-                        setHighlightedWorktreePath(menuItem.worktree.path);
-                    }
-                }, isFocused: !error, initialIndex: selectedIndex, limit: limit })), (error || loadError) && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "red", children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", error || loadError] }), _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to dismiss" })] }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Status: ", STATUS_ICONS.BUSY, " ", STATUS_LABELS.BUSY, ' ', STATUS_ICONS.WAITING, " ", STATUS_LABELS.WAITING, " ", STATUS_ICONS.IDLE, ' ', STATUS_LABELS.IDLE, configReader.isAutoApprovalEnabled() && (_jsxs(_Fragment, { children: [' | ', _jsx(Text, { color: "green", children: "Auto Approval Enabled" })] }))] }), _jsx(Text, { dimColor: true, children: isSearchMode
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { bold: true, color: "green", children: ["CCManager - Claude Code Worktree Manager v", version] }), projectName && (_jsx(Text, { bold: true, color: "green", children: projectName }))] }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Select a worktree to start or resume a Claude Code session:" }) }), _jsx(SearchableList, { isSearchMode: isSearchMode, searchQuery: searchQuery, onSearchQueryChange: setSearchQuery, selectedIndex: selectedIndex, items: items, limit: limit, placeholder: "Type to filter worktrees...", noMatchMessage: "No worktrees match your search", children: _jsx(SelectInput, { items: items, onSelect: item => handleSelect(item), onHighlight: item => {
+                        // ink-select-input may call onHighlight with undefined when items are empty
+                        // (e.g., during menu re-mount after returning from a session), so guard it.
+                        if (!item) {
+                            return;
+                        }
+                        const menuItem = item;
+                        if (menuItem.type === 'worktree') {
+                            setHighlightedWorktreePath(menuItem.worktree.path);
+                        }
+                    }, isFocused: !error, initialIndex: selectedIndex, limit: limit }) }), (error || loadError) && (_jsx(Box, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "red", children: _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", error || loadError] }), _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to dismiss" })] }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Status: ", STATUS_ICONS.BUSY, " ", STATUS_LABELS.BUSY, ' ', STATUS_ICONS.WAITING, " ", STATUS_LABELS.WAITING, " ", STATUS_ICONS.IDLE, ' ', STATUS_LABELS.IDLE, configReader.isAutoApprovalEnabled() && (_jsxs(_Fragment, { children: [' | ', _jsx(Text, { color: "green", children: "Auto Approval Enabled" })] }))] }), _jsx(Text, { dimColor: true, children: isSearchMode
                             ? 'Search Mode: Type to filter, Enter to exit search, ESC to exit search'
                             : searchQuery
                                 ? `Filtered: "${searchQuery}" | ↑↓ Navigate Enter Select | /-Search ESC-Clear 0-9 Quick Select N-New M-Merge D-Delete ${configReader.isAutoApprovalEnabled() ? 'A-AutoApproval ' : ''}${multiProject ? 'C-Config' : 'P-ProjConfig C-GlobalConfig'} ${projectName ? 'B-Back' : 'Q-Quit'}`

package/dist/components/NewWorktree.js

@@ -8,6 +8,7 @@ import { configReader } from '../services/config/configReader.js';
 import { generateWorktreeDirectory } from '../utils/worktreeUtils.js';
 import { WorktreeService } from '../services/worktreeService.js';
 import { useSearchMode } from '../hooks/useSearchMode.js';
+import SearchableList from './SearchableList.js';
 import { Effect } from 'effect';
 import { describePromptInjection, getPromptInjectionMethod, } from '../utils/presetPrompt.js';
 const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
@@ -238,7 +239,7 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const promptMethod = selectedPreset
         ? getPromptInjectionMethod(selectedPreset)
         : 'stdin';
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "green", children: "Create New Worktree" }) }), step === 'path' && !isAutoDirectory ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Enter worktree path (relative to repository root):" }) }), _jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '> ' }), _jsx(TextInputWrapper, { value: path, onChange: setPath, onSubmit: handlePathSubmit, placeholder: "e.g., ../myproject-feature" })] })] })) : null, step === 'base-branch' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Select base branch for the worktree:" }) }), isSearchMode && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { children: "Search: " }), _jsx(TextInputWrapper, { value: searchQuery, onChange: setSearchQuery, focus: true, placeholder: "Type to filter branches..." })] })), isSearchMode && branchItems.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: "No branches match your search" }) })) : isSearchMode ? (_jsx(Box, { flexDirection: "column", children: branchItems.slice(0, limit).map((item, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', item.label] }, item.value))) })) : (_jsx(SelectInput, { items: branchItems, onSelect: handleBaseBranchSelect, initialIndex: selectedIndex, limit: limit, isFocused: !isSearchMode })), !isSearchMode && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press / to search" }) }))] })), step === 'creation-mode' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: ["Base branch: ", _jsx(Text, { color: "cyan", children: baseBranch })] }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "How do you want to create the new worktree?" }) }), _jsx(SelectInput, { items: [
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "green", children: "Create New Worktree" }) }), step === 'path' && !isAutoDirectory ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Enter worktree path (relative to repository root):" }) }), _jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: '> ' }), _jsx(TextInputWrapper, { value: path, onChange: setPath, onSubmit: handlePathSubmit, placeholder: "e.g., ../myproject-feature" })] })] })) : null, step === 'base-branch' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Select base branch for the worktree:" }) }), _jsx(SearchableList, { isSearchMode: isSearchMode, searchQuery: searchQuery, onSearchQueryChange: setSearchQuery, selectedIndex: selectedIndex, items: branchItems, limit: limit, placeholder: "Type to filter branches...", noMatchMessage: "No branches match your search", children: _jsx(SelectInput, { items: branchItems, onSelect: handleBaseBranchSelect, initialIndex: selectedIndex, limit: limit, isFocused: !isSearchMode }) }), !isSearchMode && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press / to search" }) }))] })), step === 'creation-mode' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: ["Base branch: ", _jsx(Text, { color: "cyan", children: baseBranch })] }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "How do you want to create the new worktree?" }) }), _jsx(SelectInput, { items: [
                             {
                                 label: '1. Choose the branch name yourself',
                                 value: 'manual',

package/dist/components/PresetSelector.js

@@ -7,11 +7,12 @@ const PresetSelector = ({ onSelect, onCancel, }) => {
     const presetsConfig = configReader.getCommandPresets();
     const [presets] = useState(presetsConfig.presets);
     const defaultPresetId = presetsConfig.defaultPresetId;
-    const selectItems = presets.map(preset => {
+    const selectItems = presets.map((preset, index) => {
         const isDefault = preset.id === defaultPresetId;
         const args = preset.args?.join(' ') || '';
         const fallback = preset.fallbackArgs?.join(' ') || '';
-        let label = preset.name;
+        const numberPrefix = index < 9 ? `[${index + 1}] ` : '';
+        let label = numberPrefix + preset.name;
         if (isDefault)
             label += ' (default)';
         label += `\n    Command: ${preset.command}`;
@@ -39,8 +40,17 @@ const PresetSelector = ({ onSelect, onCancel, }) => {
     useInput((input, key) => {
         if (key.escape) {
             onCancel();
+            return;
+        }
+        // Number keys 1-9: immediate launch
+        if (/^[1-9]$/.test(input)) {
+            const idx = parseInt(input) - 1;
+            if (idx < presets.length && presets[idx]) {
+                onSelect(presets[idx].id);
+            }
+            return;
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "green", children: "Select Command Preset" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Choose a preset to start the session with" }) }), _jsx(SelectInput, { items: selectItems, onSelect: handleSelectItem, initialIndex: initialIndex >= 0 ? initialIndex : 0 }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press \u2191\u2193 to navigate, Enter to select, ESC to cancel" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "green", children: "Select Command Preset" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Choose a preset to start the session with" }) }), _jsx(SelectInput, { items: selectItems, onSelect: handleSelectItem, initialIndex: initialIndex >= 0 ? initialIndex : 0 }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191\u2193 Navigate 1-9 Quick Select Enter Select ESC Cancel" }) })] }));
 };
 export default PresetSelector;

package/dist/components/PresetSelector.test.d.ts

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

package/dist/components/PresetSelector.test.js

@@ -0,0 +1,120 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from 'ink-testing-library';
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+// Hoist mocks to avoid top-level variable access in vi.mock factories
+const { capturedHandlers } = vi.hoisted(() => {
+    const capturedHandlers = {
+        inputHandler: null,
+    };
+    return { capturedHandlers };
+});
+// Mock ink to avoid stdin issues and capture useInput callbacks
+vi.mock('ink', async () => {
+    const actual = await vi.importActual('ink');
+    return {
+        ...actual,
+        useInput: vi.fn((handler) => {
+            capturedHandlers.inputHandler = handler;
+        }),
+    };
+});
+// Mock SelectInput
+vi.mock('ink-select-input', async () => {
+    const React = await vi.importActual('react');
+    const { Text, Box } = await vi.importActual('ink');
+    return {
+        default: ({ items, onSelect: _onSelect, initialIndex = 0, }) => {
+            return React.createElement(Box, { flexDirection: 'column' }, items.map((item, index) => React.createElement(Text, { key: index }, `${index === initialIndex ? '❯ ' : '  '}${item.label}`)));
+        },
+    };
+});
+// Mock configReader
+vi.mock('../services/config/configReader.js', () => ({
+    configReader: {
+        getCommandPresets: vi.fn().mockReturnValue({
+            presets: [
+                { id: 'preset-1', name: 'Claude', command: 'claude' },
+                { id: 'preset-2', name: 'Gemini', command: 'gemini' },
+                { id: 'preset-3', name: 'Cursor', command: 'cursor' },
+            ],
+            defaultPresetId: 'preset-1',
+            selectPresetOnStart: true,
+        }),
+    },
+}));
+import PresetSelector from './PresetSelector.js';
+const makeKey = (overrides = {}) => ({
+    upArrow: false,
+    downArrow: false,
+    leftArrow: false,
+    rightArrow: false,
+    pageDown: false,
+    pageUp: false,
+    home: false,
+    end: false,
+    return: false,
+    escape: false,
+    ctrl: false,
+    shift: false,
+    tab: false,
+    backspace: false,
+    delete: false,
+    meta: false,
+    ...overrides,
+});
+describe('PresetSelector component', () => {
+    let onSelect;
+    let onCancel;
+    beforeEach(() => {
+        onSelect = vi.fn();
+        onCancel = vi.fn();
+        capturedHandlers.inputHandler = null;
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it('renders preset list with number prefixes and default label', () => {
+        const { lastFrame } = render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        const output = lastFrame();
+        expect(output).toContain('[1]');
+        expect(output).toContain('[2]');
+        expect(output).toContain('[3]');
+        expect(output).toContain('(default)');
+        expect(output).toContain('← Cancel');
+    });
+    it('pressing 1 calls onSelect with first preset id immediately', () => {
+        render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        expect(capturedHandlers.inputHandler).not.toBeNull();
+        capturedHandlers.inputHandler('1', makeKey());
+        expect(onSelect).toHaveBeenCalledWith('preset-1');
+        expect(onCancel).not.toHaveBeenCalled();
+    });
+    it('pressing 2 calls onSelect with second preset id immediately', () => {
+        render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        capturedHandlers.inputHandler('2', makeKey());
+        expect(onSelect).toHaveBeenCalledWith('preset-2');
+    });
+    it('pressing 3 calls onSelect with third preset id immediately', () => {
+        render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        capturedHandlers.inputHandler('3', makeKey());
+        expect(onSelect).toHaveBeenCalledWith('preset-3');
+    });
+    it('pressing a number beyond preset count does nothing', () => {
+        render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        capturedHandlers.inputHandler('9', makeKey());
+        expect(onSelect).not.toHaveBeenCalled();
+        expect(onCancel).not.toHaveBeenCalled();
+    });
+    it('pressing ESC calls onCancel', () => {
+        render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        capturedHandlers.inputHandler('', makeKey({ escape: true }));
+        expect(onCancel).toHaveBeenCalled();
+        expect(onSelect).not.toHaveBeenCalled();
+    });
+    it('displays title and subtitle', () => {
+        const { lastFrame } = render(_jsx(PresetSelector, { onSelect: onSelect, onCancel: onCancel }));
+        const output = lastFrame();
+        expect(output).toContain('Select Command Preset');
+        expect(output).toContain('Choose a preset to start the session with');
+    });
+});

package/dist/components/SearchableList.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+interface ListItem {
+    label: string;
+    value: string;
+}
+interface SearchableListProps {
+    isSearchMode: boolean;
+    searchQuery: string;
+    onSearchQueryChange: (query: string) => void;
+    selectedIndex: number;
+    items: ListItem[];
+    limit: number;
+    placeholder?: string;
+    noMatchMessage?: string;
+    children: React.ReactNode;
+}
+/**
+ * Shared search mode UI: search input, filtered result list, and no-match message.
+ * Wraps a SelectInput (passed as children) which is shown when not in search mode.
+ */
+declare const SearchableList: React.FC<SearchableListProps>;
+export default SearchableList;

package/dist/components/SearchableList.js

@@ -0,0 +1,14 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+import TextInputWrapper from './TextInputWrapper.js';
+/**
+ * Shared search mode UI: search input, filtered result list, and no-match message.
+ * Wraps a SelectInput (passed as children) which is shown when not in search mode.
+ */
+const SearchableList = ({ isSearchMode, searchQuery, onSearchQueryChange, selectedIndex, items, limit, placeholder = 'Type to filter...', noMatchMessage = 'No matches found', children, }) => {
+    if (!isSearchMode) {
+        return _jsx(_Fragment, { children: children });
+    }
+    return (_jsxs(_Fragment, { children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { children: "Search: " }), _jsx(TextInputWrapper, { value: searchQuery, onChange: onSearchQueryChange, focus: true, placeholder: placeholder })] }), items.length === 0 ? (_jsx(Box, { children: _jsx(Text, { color: "yellow", children: noMatchMessage }) })) : (_jsx(Box, { flexDirection: "column", children: items.slice(0, limit).map((item, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', item.label] }, item.value))) }))] }));
+};
+export default SearchableList;

package/dist/hooks/useDynamicLimit.d.ts

@@ -0,0 +1,10 @@
+interface UseDynamicLimitOptions {
+    fixedRows?: number;
+    isSearchMode?: boolean;
+    hasError?: boolean;
+}
+/**
+ * Calculate the maximum number of list items to display based on terminal height.
+ */
+export declare function useDynamicLimit(options?: UseDynamicLimitOptions): number;
+export {};

package/dist/hooks/useDynamicLimit.js

@@ -0,0 +1,9 @@
+import { useStdout } from 'ink';
+/**
+ * Calculate the maximum number of list items to display based on terminal height.
+ */
+export function useDynamicLimit(options = {}) {
+    const { fixedRows = 6, isSearchMode = false, hasError = false } = options;
+    const { stdout } = useStdout();
+    return Math.max(5, stdout.rows - fixedRows - (isSearchMode ? 1 : 0) - (hasError ? 3 : 0));
+}

package/dist/utils/filterByQuery.d.ts

@@ -0,0 +1,5 @@
+import { Worktree } from '../types/index.js';
+/**
+ * Filter worktrees by matching search query against branch name and path.
+ */
+export declare function filterWorktreesByQuery(worktrees: Worktree[], query: string): Worktree[];

package/dist/utils/filterByQuery.js

@@ -0,0 +1,13 @@
+/**
+ * Filter worktrees by matching search query against branch name and path.
+ */
+export function filterWorktreesByQuery(worktrees, query) {
+    if (!query)
+        return worktrees;
+    const searchLower = query.toLowerCase();
+    return worktrees.filter(worktree => {
+        const branchName = worktree.branch || '';
+        return (branchName.toLowerCase().includes(searchLower) ||
+            worktree.path.toLowerCase().includes(searchLower));
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "3.12.0",
+	"version": "3.12.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.12.0",
-		"@kodaikabasawa/ccmanager-darwin-x64": "3.12.0",
-		"@kodaikabasawa/ccmanager-linux-arm64": "3.12.0",
-		"@kodaikabasawa/ccmanager-linux-x64": "3.12.0",
-		"@kodaikabasawa/ccmanager-win32-x64": "3.12.0"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "3.12.2",
+		"@kodaikabasawa/ccmanager-darwin-x64": "3.12.2",
+		"@kodaikabasawa/ccmanager-linux-arm64": "3.12.2",
+		"@kodaikabasawa/ccmanager-linux-x64": "3.12.2",
+		"@kodaikabasawa/ccmanager-win32-x64": "3.12.2"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",