ccmanager 4.1.7 → 4.1.9

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/sessionManager.d.ts

@@ -18,6 +18,8 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private autoApprovalDisabledWorktrees;
     private restoringSessions;
     private bufferedRestoreData;
+    private restoreRefreshTimers;
+    private restoreRefreshDeadlines;
     private spawn;
     private resolvePreset;
     detectTerminalState(session: Session): SessionState;
@@ -39,6 +41,10 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private createTerminal;
     private shouldResetRestoreScrollback;
     private getRestoreSnapshot;
+    private scheduleRestoreRefresh;
+    private armRestoreRefreshTimer;
+    private cancelRestoreRefresh;
+    private fireRestoreRefresh;
     private createSessionInternal;
     /**
      * Create session with command preset using Effect-based error handling

package/dist/services/sessionManager.js

@@ -21,6 +21,15 @@ const { Terminal } = pkg;
 const TERMINAL_CONTENT_MAX_LINES = 300;
 const TERMINAL_SCROLLBACK_LINES = 5000;
 const TERMINAL_RESTORE_SCROLLBACK_LINES = 200;
+// Claude Code's Ink-based renderer sometimes splits a single UI redraw across
+// multiple PTY writes with short time gaps. If we snapshot between chunks, the
+// resulting viewport can miss rows (e.g. empty middle area while the top/bottom
+// chrome already rendered). Re-emit the snapshot after the PTY output has been
+// quiet for this long so late chunks are accounted for.
+const RESTORE_REFRESH_QUIET_MS = 120;
+// Cap on how long we wait for quiet before forcing the refresh, so continuous
+// streaming output (e.g. a long busy turn) still produces an updated snapshot.
+const RESTORE_REFRESH_MAX_WAIT_MS = 400;
 export class SessionManager extends EventEmitter {
     sessions;
     waitingWithBottomBorder = new Map();
@@ -28,6 +37,8 @@ export class SessionManager extends EventEmitter {
     autoApprovalDisabledWorktrees = new Set();
     restoringSessions = new Set();
     bufferedRestoreData = new Map();
+    restoreRefreshTimers = new Map();
+    restoreRefreshDeadlines = new Map();
     async spawn(command, args, worktreePath, options = {}) {
         const spawnOptions = {
             name: 'xterm-256color',
@@ -205,7 +216,7 @@ export class SessionManager extends EventEmitter {
             data.includes('\x1b[3J') ||
             data.includes('\x1bc'));
     }
-    getRestoreSnapshot(session) {
+    getRestoreSnapshot(session, options = {}) {
         const activeBuffer = session.terminal.buffer.active;
         if (activeBuffer.type !== 'normal') {
             return session.serializer.serialize({
@@ -217,6 +228,22 @@ export class SessionManager extends EventEmitter {
         if (bufferLength === 0) {
             return '';
         }
+        // While the session is busy, cursor-addressed status-box redraws can push
+        // stale frames into scrollback (e.g. Claude's spinner + token stats line).
+        // Those ghost rows render as duplicated status bars when replayed, so
+        // restore only the viewport during busy state. Refresh re-emits also
+        // bypass scrollback to avoid duplicating history into real-terminal
+        // scrollback on top of the initial emit.
+        const isBusy = session.stateMutex.getSnapshot().state === 'busy';
+        if (options.viewportOnly || isBusy) {
+            const snapshot = session.serializer.serialize({
+                scrollback: 0,
+                excludeAltBuffer: true,
+            });
+            const cursorRow = normalBuffer.cursorY + 1;
+            const cursorCol = normalBuffer.cursorX + 1;
+            return `${snapshot}\x1b[${cursorRow};${cursorCol}H`;
+        }
         const scrollbackStart = Math.max(0, normalBuffer.baseY - TERMINAL_RESTORE_SCROLLBACK_LINES);
         const rangeStart = Math.max(session.restoreScrollbackBaseLine, scrollbackStart);
         const rangeEnd = bufferLength - 1;
@@ -231,6 +258,56 @@ export class SessionManager extends EventEmitter {
         const cursorCol = normalBuffer.cursorX + 1;
         return `${snapshot}\x1b[${cursorRow};${cursorCol}H`;
     }
+    scheduleRestoreRefresh(session) {
+        this.restoreRefreshDeadlines.set(session.id, Date.now() + RESTORE_REFRESH_MAX_WAIT_MS);
+        this.armRestoreRefreshTimer(session);
+    }
+    armRestoreRefreshTimer(session) {
+        const deadline = this.restoreRefreshDeadlines.get(session.id);
+        if (deadline === undefined) {
+            return;
+        }
+        const existing = this.restoreRefreshTimers.get(session.id);
+        if (existing !== undefined) {
+            clearTimeout(existing);
+            this.restoreRefreshTimers.delete(session.id);
+        }
+        const remaining = deadline - Date.now();
+        if (remaining <= 0) {
+            this.fireRestoreRefresh(session);
+            return;
+        }
+        const delay = Math.min(RESTORE_REFRESH_QUIET_MS, remaining);
+        const timer = setTimeout(() => this.fireRestoreRefresh(session), delay);
+        this.restoreRefreshTimers.set(session.id, timer);
+    }
+    cancelRestoreRefresh(session) {
+        const existing = this.restoreRefreshTimers.get(session.id);
+        if (existing !== undefined) {
+            clearTimeout(existing);
+            this.restoreRefreshTimers.delete(session.id);
+        }
+        this.restoreRefreshDeadlines.delete(session.id);
+    }
+    fireRestoreRefresh(session) {
+        this.restoreRefreshTimers.delete(session.id);
+        this.restoreRefreshDeadlines.delete(session.id);
+        if (!session.isActive) {
+            return;
+        }
+        const snapshot = this.getRestoreSnapshot(session, { viewportOnly: true });
+        if (snapshot.length > 0) {
+            // \x1b[2J: clear the viewport before repainting — without this, a
+            //   refresh snapshot shorter than the already-displayed content leaves
+            //   a "ghost tail" of pre-refresh rows at the bottom.
+            // \x1b[?7h / \x1b[?7l: Session.tsx disables auto-wrap (DECAWM) after
+            //   the initial restore, but SerializeAddon omits row separators for
+            //   wrapped lines and relies on DECAWM to advance to the next row
+            //   (see PR #276). Re-enable auto-wrap just for the snapshot write so
+            //   wrapped viewport rows don't overlap, then restore the TUI default.
+            this.emit('sessionRestore', session, `\x1b[?7h\x1b[2J\x1b[H${snapshot}\x1b[?7l`);
+        }
+    }
     async createSessionInternal(worktreePath, ptyProcess, options = {}) {
         const existingSessions = this.getSessionsForWorktree(worktreePath);
         const maxNumber = existingSessions.reduce((max, s) => Math.max(max, s.sessionNumber), 0);
@@ -334,6 +411,12 @@ export class SessionManager extends EventEmitter {
                     session.terminal.buffer.normal.baseY;
             }
             session.lastActivity = new Date();
+            // If a restore-refresh is pending, each incoming chunk resets the
+            // quiet timer so the follow-up snapshot only fires after Claude's
+            // multi-chunk redraw has settled.
+            if (this.restoreRefreshDeadlines.has(session.id)) {
+                this.armRestoreRefreshTimer(session);
+            }
             // Only emit data events when session is active
             if (session.isActive) {
                 if (this.restoringSessions.has(session.id)) {
@@ -493,10 +576,12 @@ export class SessionManager extends EventEmitter {
                         }
                     }
                 }
+                this.scheduleRestoreRefresh(session);
             }
             else {
                 this.restoringSessions.delete(session.id);
                 this.bufferedRestoreData.delete(session.id);
+                this.cancelRestoreRefresh(session);
             }
         }
     }
@@ -571,6 +656,7 @@ export class SessionManager extends EventEmitter {
             this.waitingWithBottomBorder.delete(sessionId);
             this.restoringSessions.delete(sessionId);
             this.bufferedRestoreData.delete(sessionId);
+            this.cancelRestoreRefresh(session);
             this.emit('sessionDestroyed', session);
         }
     }
@@ -624,6 +710,7 @@ export class SessionManager extends EventEmitter {
                 }
                 this.sessions.delete(sessionId);
                 this.waitingWithBottomBorder.delete(sessionId);
+                this.cancelRestoreRefresh(session);
                 this.emit('sessionDestroyed', session);
             },
             catch: (error) => {

package/dist/services/sessionManager.test.js

@@ -782,6 +782,7 @@ describe('SessionManager', () => {
             });
             vi.mocked(spawn).mockReturnValue(mockPty);
             const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            await session.stateMutex.update(data => ({ ...data, state: 'idle' }));
             const normalBuffer = session.terminal.buffer.normal;
             normalBuffer.baseY = 260;
             normalBuffer.length = 300;
@@ -803,6 +804,32 @@ describe('SessionManager', () => {
             });
             expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mrestored\u001b[0m\u001b[8;12H');
         });
+        it('should emit a viewport-only restore snapshot while session is busy', async () => {
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                id: '1',
+                name: 'Main',
+                command: 'claude',
+            });
+            vi.mocked(spawn).mockReturnValue(mockPty);
+            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            const normalBuffer = session.terminal.buffer.normal;
+            normalBuffer.baseY = 260;
+            normalBuffer.length = 300;
+            normalBuffer.cursorY = 7;
+            normalBuffer.cursorX = 11;
+            session.restoreScrollbackBaseLine = 120;
+            const serializeMock = vi
+                .spyOn(session.serializer, 'serialize')
+                .mockReturnValue('\u001b[31mbusy-viewport\u001b[0m');
+            const restoreHandler = vi.fn();
+            sessionManager.on('sessionRestore', restoreHandler);
+            sessionManager.setSessionActive(session.id, true);
+            expect(serializeMock).toHaveBeenCalledWith({
+                scrollback: 0,
+                excludeAltBuffer: true,
+            });
+            expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mbusy-viewport\u001b[0m\u001b[8;12H');
+        });
         it('should keep viewport-only restore behavior for alternate screen sessions', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
@@ -872,6 +899,90 @@ describe('SessionManager', () => {
             sessionManager.setSessionActive(session.id, true);
             expect(eventOrder).toEqual(['restore', 'data']);
         });
+        it('should re-emit a viewport-only snapshot after the PTY quiet period', async () => {
+            vi.useFakeTimers();
+            try {
+                vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                    id: '1',
+                    name: 'Main',
+                    command: 'claude',
+                });
+                vi.mocked(spawn).mockReturnValue(mockPty);
+                const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+                session.terminal.buffer.normal.length = 1;
+                const serializeMock = vi
+                    .spyOn(session.serializer, 'serialize')
+                    .mockReturnValue('snap');
+                const restoreHandler = vi.fn();
+                sessionManager.on('sessionRestore', restoreHandler);
+                sessionManager.setSessionActive(session.id, true);
+                expect(restoreHandler).toHaveBeenCalledTimes(1);
+                await vi.advanceTimersByTimeAsync(50);
+                mockPty.emit('data', 'late-chunk');
+                await vi.advanceTimersByTimeAsync(50);
+                expect(restoreHandler).toHaveBeenCalledTimes(1);
+                await vi.advanceTimersByTimeAsync(120);
+                expect(restoreHandler).toHaveBeenCalledTimes(2);
+                expect(restoreHandler.mock.calls[1]?.[1]).toMatch(/^\u001b\[\?7h\u001b\[2J\u001b\[Hsnap.*\u001b\[\?7l$/);
+                expect(serializeMock).toHaveBeenLastCalledWith({
+                    scrollback: 0,
+                    excludeAltBuffer: true,
+                });
+            }
+            finally {
+                vi.useRealTimers();
+            }
+        });
+        it('should force a refresh at the max-wait deadline even while data keeps streaming', async () => {
+            vi.useFakeTimers();
+            try {
+                vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                    id: '1',
+                    name: 'Main',
+                    command: 'claude',
+                });
+                vi.mocked(spawn).mockReturnValue(mockPty);
+                const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+                session.terminal.buffer.normal.length = 1;
+                vi.spyOn(session.serializer, 'serialize').mockReturnValue('snap');
+                const restoreHandler = vi.fn();
+                sessionManager.on('sessionRestore', restoreHandler);
+                sessionManager.setSessionActive(session.id, true);
+                expect(restoreHandler).toHaveBeenCalledTimes(1);
+                for (let elapsed = 0; elapsed < 400; elapsed += 50) {
+                    await vi.advanceTimersByTimeAsync(50);
+                    mockPty.emit('data', 'chunk');
+                }
+                expect(restoreHandler).toHaveBeenCalledTimes(2);
+            }
+            finally {
+                vi.useRealTimers();
+            }
+        });
+        it('should cancel a scheduled refresh when the session is deactivated', async () => {
+            vi.useFakeTimers();
+            try {
+                vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                    id: '1',
+                    name: 'Main',
+                    command: 'claude',
+                });
+                vi.mocked(spawn).mockReturnValue(mockPty);
+                const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+                session.terminal.buffer.normal.length = 1;
+                vi.spyOn(session.serializer, 'serialize').mockReturnValue('snap');
+                const restoreHandler = vi.fn();
+                sessionManager.on('sessionRestore', restoreHandler);
+                sessionManager.setSessionActive(session.id, true);
+                expect(restoreHandler).toHaveBeenCalledTimes(1);
+                sessionManager.setSessionActive(session.id, false);
+                await vi.advanceTimersByTimeAsync(500);
+                expect(restoreHandler).toHaveBeenCalledTimes(1);
+            }
+            finally {
+                vi.useRealTimers();
+            }
+        });
     });
     describe('static methods', () => {
         describe('getSessionCounts', () => {

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.9",
 	"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.9",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.1.9",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.1.9",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.1.9",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.1.9"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",