ccmanager 4.1.7 → 4.1.8

package/dist/components/ConfigureWorktree.js

@@ -16,6 +16,7 @@ const ConfigureWorktree = ({ onComplete }) => {
     const [copySessionData, setCopySessionData] = useState(worktreeConfig.copySessionData ?? true);
     const [sortByLastSession, setSortByLastSession] = useState(worktreeConfig.sortByLastSession ?? false);
     const [autoUseDefaultBranch, setAutoUseDefaultBranch] = useState(worktreeConfig.autoUseDefaultBranch ?? false);
+    const [includeRemoteBranches, setIncludeRemoteBranches] = useState(worktreeConfig.includeRemoteBranches ?? false);
     const [editMode, setEditMode] = useState('menu');
     const [tempPattern, setTempPattern] = useState(pattern);
     // Show if inheriting from global (for project scope)
@@ -50,6 +51,10 @@ const ConfigureWorktree = ({ onComplete }) => {
             label: `Auto Use Default Branch: ${autoUseDefaultBranch ? '✅ Enabled' : '❌ Disabled'}`,
             value: 'toggleAutoUseDefault',
         },
+        {
+            label: `Include Remote Branches: ${includeRemoteBranches ? '✅ Enabled' : '❌ Disabled'}`,
+            value: 'toggleIncludeRemote',
+        },
         {
             label: '💾 Save Changes',
             value: 'save',
@@ -77,6 +82,9 @@ const ConfigureWorktree = ({ onComplete }) => {
             case 'toggleAutoUseDefault':
                 setAutoUseDefaultBranch(!autoUseDefaultBranch);
                 break;
+            case 'toggleIncludeRemote':
+                setIncludeRemoteBranches(!includeRemoteBranches);
+                break;
             case 'save':
                 // Save the configuration
                 configEditor.setWorktreeConfig({
@@ -85,6 +93,7 @@ const ConfigureWorktree = ({ onComplete }) => {
                     copySessionData,
                     sortByLastSession,
                     autoUseDefaultBranch,
+                    includeRemoteBranches,
                 });
                 onComplete();
                 break;

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 { useDynamicLimit } from '../hooks/useDynamicLimit.js';
 import SearchableList from './SearchableList.js';
 import { Effect } from 'effect';
 import { describePromptInjection, getPromptInjectionMethod, } from '../utils/presetPrompt.js';
@@ -16,7 +17,7 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const presetsConfig = configReader.getCommandPresets();
     const isAutoDirectory = worktreeConfig.autoDirectory;
     const isAutoUseDefaultBranch = worktreeConfig.autoUseDefaultBranch ?? false;
-    const limit = 10;
+    const includeRemoteBranches = worktreeConfig.includeRemoteBranches ?? false;
     const getInitialStep = () => {
         if (isAutoDirectory) {
             return 'base-branch';
@@ -34,20 +35,28 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const [isLoadingBranches, setIsLoadingBranches] = useState(true);
     const [branchLoadError, setBranchLoadError] = useState(null);
     const [branches, setBranches] = useState([]);
+    const [remoteBranches, setRemoteBranches] = useState([]);
     const [defaultBranch, setDefaultBranch] = useState('main');
     useEffect(() => {
         let cancelled = false;
         const service = new WorktreeService(projectPath);
         const loadBranches = async () => {
-            const workflow = Effect.all([service.getAllBranchesEffect(), service.getDefaultBranchEffect()], { concurrency: 2 });
+            const branchesEffect = includeRemoteBranches
+                ? service.getBranchesWithRemotesEffect()
+                : Effect.map(service.getAllBranchesEffect(), (list) => ({
+                    local: list,
+                    remote: [],
+                }));
+            const workflow = Effect.all([branchesEffect, service.getDefaultBranchEffect()], { concurrency: 2 });
             const result = await Effect.runPromise(Effect.match(workflow, {
                 onFailure: (error) => ({
                     type: 'error',
                     message: formatError(error),
                 }),
-                onSuccess: ([branchList, defaultBr]) => ({
+                onSuccess: ([branchData, defaultBr]) => ({
                     type: 'success',
-                    branches: branchList,
+                    local: branchData.local,
+                    remote: branchData.remote,
                     defaultBranch: defaultBr,
                 }),
             }));
@@ -57,7 +66,8 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
                     setIsLoadingBranches(false);
                 }
                 else {
-                    setBranches(result.branches);
+                    setBranches(result.local);
+                    setRemoteBranches(result.remote);
                     setDefaultBranch(result.defaultBranch);
                     setIsLoadingBranches(false);
                     if (isAutoUseDefaultBranch && result.defaultBranch) {
@@ -76,16 +86,31 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
         return () => {
             cancelled = true;
         };
-    }, [projectPath, isAutoUseDefaultBranch]);
-    const allBranchItems = useMemo(() => [
-        { label: `${defaultBranch} (default)`, value: defaultBranch },
-        ...branches
-            .filter(br => br !== defaultBranch)
-            .map(br => ({ label: br, value: br })),
-    ], [branches, defaultBranch]);
+    }, [projectPath, isAutoUseDefaultBranch, includeRemoteBranches]);
+    const allBranchItems = useMemo(() => {
+        const defaultRemoteSuffix = `/${defaultBranch}`;
+        const defaultRemotes = remoteBranches.filter(br => br.endsWith(defaultRemoteSuffix));
+        const otherRemotes = remoteBranches.filter(br => !br.endsWith(defaultRemoteSuffix));
+        return [
+            { label: `${defaultBranch} (default)`, value: defaultBranch },
+            ...defaultRemotes.map(br => ({
+                label: `${br} (default remote)`,
+                value: br,
+            })),
+            ...branches
+                .filter(br => br !== defaultBranch)
+                .map(br => ({ label: br, value: br })),
+            ...otherRemotes.map(br => ({ label: br, value: br })),
+        ];
+    }, [branches, remoteBranches, defaultBranch]);
     const { isSearchMode, searchQuery, selectedIndex, setSearchQuery } = useSearchMode(allBranchItems.length, {
         isDisabled: step !== 'base-branch',
     });
+    const limit = useDynamicLimit({
+        fixedRows: includeRemoteBranches ? 10 : 8,
+        isSearchMode,
+        hasError: !!branchLoadError,
+    });
     const branchItems = useMemo(() => {
         if (!searchQuery)
             return allBranchItems;
@@ -239,7 +264,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" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: 'Tip: Enable "Auto Directory" in settings to generate paths automatically from branch names.' }) })] })) : 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: [
+    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" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: 'Tip: Enable "Auto Directory" in settings to generate paths automatically from branch names.' }) })] })) : 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" }) })), includeRemoteBranches && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Tip: If the branch list feels slow, disable \"Include Remote Branches\" in Configuration \u2192 Configure Worktree Settings." }) }))] })), 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/services/stateDetector/claude.js

@@ -6,7 +6,6 @@ const SPINNER_CHARS = '✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃
 const SPINNER_ACTIVITY_PATTERN = new RegExp(`^[${SPINNER_CHARS}] \\S+ing.*\u2026`, 'm');
 // Session stats above the prompt, e.g. "(9m 21s · ↓ 13.7k tokens)" — requires parens, a digit, and "tokens"
 const TOKEN_STATS_LINE_PATTERN = /\([^)]*\d[^)]*tokens\s*\)/i;
-const BUSY_LOOKBACK_LINES = 5;
 // Workaround: Claude Code sometimes appears idle in terminal output while
 // still actively processing (busy). To mitigate false idle transitions,
 // require terminal output to remain unchanged for this duration before
@@ -88,8 +87,7 @@ export class ClaudeStateDetector extends BaseStateDetector {
             }
             start--;
         }
-        const recentBlock = lines.slice(Math.max(start, 0));
-        return recentBlock.slice(-BUSY_LOOKBACK_LINES).join('\n');
+        return lines.slice(Math.max(start, 0)).join('\n');
     }
     detectState(terminal, currentState) {
         // Check for search prompt (⌕ Search…) within 200 lines - always idle (debounced)

package/dist/services/stateDetector/claude.test.js

@@ -446,6 +446,27 @@ describe('ClaudeStateDetector', () => {
             // Assert - Should be idle because search prompt takes precedence
             expect(state).toBe('idle');
         });
+        it('should detect busy when spinner + token stats header is followed by a long TodoWrite checklist', () => {
+            // Regression: the recent block contains a spinner/token header and
+            // many checklist items with no internal blank line. All lines are
+            // part of the same contiguous update and should be inspected.
+            terminal = createMockTerminal([
+                '✽ Add GitHub Actions workflow and commit… (50s · ↓ 794 tokens)',
+                '  ⎿  ✔ Create docs/index.config.json',
+                '     ✔ Reorganize existing docs into topic directories',
+                '     ✔ Add frontmatter to existing docs',
+                '     ✔ Create docs/INDEX.md, docs/README.md, templates, workflow',
+                '     ✔ Create root AGENTS.md and README.md',
+                '     ✔ Write manifest generation Go script',
+                '     ✔ Add Makefile tasks and run first generation',
+                '     ◼ Add GitHub Actions workflow and commit',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            const state = detector.detectState(terminal, 'idle');
+            expect(state).toBe('busy');
+        });
         it('should ignore stale spinner output outside the latest block above the prompt box', () => {
             terminal = createMockTerminal([
                 '✻ Seasoning… (44s · ↓ 247 tokens)',

package/dist/services/worktreeService.d.ts

@@ -201,6 +201,17 @@ export declare class WorktreeService {
      * @throws {GitError} When git branch command fails (but falls back to empty array)
      */
     getAllBranchesEffect(): Effect.Effect<string[], GitError, never>;
+    /**
+     * Effect-based getBranchesWithRemotes operation
+     * Returns local and remote branches separately so callers can distinguish them.
+     * Remote branches keep their `<remote>/<branch>` prefix (e.g. `origin/main`).
+     *
+     * @returns {Effect.Effect<{local: string[]; remote: string[]}, GitError, never>}
+     */
+    getBranchesWithRemotesEffect(): Effect.Effect<{
+        local: string[];
+        remote: string[];
+    }, GitError, never>;
     /**
      * Effect-based getCurrentBranch operation
      * Returns Effect that may fail with GitError

package/dist/services/worktreeService.js

@@ -499,6 +499,43 @@ export class WorktreeService {
             return Effect.succeed([]);
         });
     }
+    /**
+     * Effect-based getBranchesWithRemotes operation
+     * Returns local and remote branches separately so callers can distinguish them.
+     * Remote branches keep their `<remote>/<branch>` prefix (e.g. `origin/main`).
+     *
+     * @returns {Effect.Effect<{local: string[]; remote: string[]}, GitError, never>}
+     */
+    getBranchesWithRemotesEffect() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const self = this;
+        return Effect.catchAll(Effect.try({
+            try: () => {
+                const output = execSync("git branch -a --format='%(refname:short)' | grep -v HEAD | sort -u", {
+                    cwd: self.rootPath,
+                    encoding: 'utf8',
+                    shell: '/bin/bash',
+                });
+                const remotes = self.getAllRemotes();
+                const remotePrefixes = remotes.map(r => `${r}/`);
+                const local = [];
+                const remote = [];
+                for (const raw of output.trim().split('\n')) {
+                    const branch = raw.trim();
+                    if (!branch)
+                        continue;
+                    if (remotePrefixes.some(prefix => branch.startsWith(prefix))) {
+                        remote.push(branch);
+                    }
+                    else {
+                        local.push(branch);
+                    }
+                }
+                return { local, remote };
+            },
+            catch: (error) => error,
+        }), (_error) => Effect.succeed({ local: [], remote: [] }));
+    }
     /**
      * Effect-based getCurrentBranch operation
      * Returns Effect that may fail with GitError

package/dist/types/index.d.ts

@@ -124,6 +124,7 @@ export interface WorktreeConfig {
     copySessionData?: boolean;
     sortByLastSession?: boolean;
     autoUseDefaultBranch?: boolean;
+    includeRemoteBranches?: boolean;
 }
 export interface MergeConfig {
     mergeArgs?: string[];

package/package.json

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