ccmanager 4.1.15 → 4.1.18

package/dist/components/PresetSelector.js

@@ -37,18 +37,11 @@ const PresetSelector = ({ onSelect, onCancel, }) => {
     };
     // Find initial index based on default preset
     const initialIndex = selectItems.findIndex(item => item.value === defaultPresetId);
-    useInput((input, key) => {
+    // ink-select-input v6+ handles number keys 1-9 natively, so only handle ESC here
+    // to avoid double-firing onSelect (which would create two sessions for one worktree).
+    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: "\u2191\u2193 Navigate 1-9 Quick Select Enter Select ESC Cancel" }) })] }));

package/dist/components/PresetSelector.test.js

@@ -86,26 +86,15 @@ describe('PresetSelector component', () => {
         expect(output).toContain('(default)');
         expect(output).toContain('← Cancel');
     });
-    it('pressing 1 calls onSelect with first preset id immediately', () => {
+    // Number key selection is handled by ink-select-input v6+ natively.
+    // PresetSelector's useInput only handles ESC to avoid double-firing onSelect
+    // (which would create two sessions for one worktree).
+    it('pressing number keys via useInput does NOT trigger onSelect', () => {
         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();
     });

package/dist/components/Session.js

@@ -45,6 +45,8 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                 return;
             // Check for return to menu shortcut
             if (shortcutManager.matchesRawInput('returnToMenu', data)) {
+                isExitingRef.current = true;
+                sessionManager.setSessionActive(session.id, false);
                 // Disable any extended input modes that might have been enabled by the PTY
                 if (stdout) {
                     resetTerminalInputModes();
@@ -72,7 +74,7 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         // restore and the deferred restore that may fire after Session.tsx
         // has already disabled DECAWM for live TUI redraws.
         const handleSessionRestore = (restoredSession, restoreSnapshot) => {
-            if (restoredSession.id === session.id) {
+            if (restoredSession.id === session.id && !isExitingRef.current) {
                 if (restoreSnapshot.length > 0) {
                     stdout.write(`\x1b[?7h${restoreSnapshot}\x1b[?7l`);
                 }
@@ -86,7 +88,9 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         // appends below the (already-clipped) viewport, producing duplicated
         // rows equal to the resize delta.
         const handleSessionResize = (resizedSession, redrawPayload) => {
-            if (resizedSession.id === session.id && redrawPayload.length > 0) {
+            if (resizedSession.id === session.id &&
+                redrawPayload.length > 0 &&
+                !isExitingRef.current) {
                 stdout.write(redrawPayload);
             }
         };

package/dist/components/Session.test.js

@@ -99,4 +99,56 @@ describe('Session', () => {
         expect(testState.stdout?.write).toHaveBeenNthCalledWith(2, '\x1b[?7h\nrestored\x1b[?7l');
         expect(testState.stdout?.write).toHaveBeenNthCalledWith(3, '\x1b[?7l');
     });
+    it('detaches synchronously when returning to menu so late session output cannot repaint', async () => {
+        const listeners = new Map();
+        const session = {
+            id: 'session-1',
+            process: {
+                write: vi.fn(),
+                resize: vi.fn(),
+            },
+            terminal: {
+                resize: vi.fn(),
+            },
+            stateMutex: {
+                getSnapshot: () => ({ state: 'busy' }),
+            },
+        };
+        const onReturnToMenu = vi.fn();
+        const setSessionActive = vi.fn();
+        const sessionManager = {
+            on: vi.fn((event, handler) => {
+                const handlers = listeners.get(event) ?? new Set();
+                handlers.add(handler);
+                listeners.set(event, handlers);
+                return sessionManager;
+            }),
+            off: vi.fn((event, handler) => {
+                listeners.get(event)?.delete(handler);
+                return sessionManager;
+            }),
+            setSessionActive,
+            cancelAutoApproval: vi.fn(),
+            performResize: vi.fn(),
+        };
+        const { unmount } = render(_jsx(Session, { session: session, sessionManager: sessionManager, onReturnToMenu: onReturnToMenu }));
+        await new Promise(resolve => setTimeout(resolve, 0));
+        testState.stdout?.write.mockClear();
+        process.stdin.emit('data', '\u0005');
+        for (const handler of listeners.get('sessionData') ?? []) {
+            handler(session, 'late-data');
+        }
+        for (const handler of listeners.get('sessionRestore') ?? []) {
+            handler(session, 'late-restore');
+        }
+        for (const handler of listeners.get('sessionResize') ?? []) {
+            handler(session, 'late-resize');
+        }
+        expect(setSessionActive).toHaveBeenCalledWith(session.id, false);
+        expect(onReturnToMenu).toHaveBeenCalledTimes(1);
+        expect(testState.stdout?.write).not.toHaveBeenCalledWith('late-data');
+        expect(testState.stdout?.write).not.toHaveBeenCalledWith('\x1b[?7hlate-restore\x1b[?7l');
+        expect(testState.stdout?.write).not.toHaveBeenCalledWith('late-resize');
+        unmount();
+    });
 });

package/dist/services/sessionManager.d.ts

@@ -22,6 +22,8 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private resizeSuppressTimers;
     private restoreDeferTimers;
     private restoreDeferDeadlines;
+    private cursorRedrawSessions;
+    private cursorRedrawTimers;
     private spawn;
     private resolvePreset;
     detectTerminalState(session: Session): SessionState;
@@ -42,6 +44,9 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     constructor();
     private createTerminal;
     private shouldResetRestoreScrollback;
+    private hasCursorAddressedRedraw;
+    private markCursorRedrawActive;
+    private handleScrollbackGrowthDuringRedraw;
     private getRestoreSnapshot;
     private getViewportRedrawSnapshot;
     /**
@@ -89,6 +94,7 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     private armRestoreDeferTimer;
     private fireRestoreDefer;
     private cancelRestoreDefer;
+    private clearCursorRedrawTracking;
     cancelAutoApproval(sessionId: string, reason?: string): void;
     toggleAutoApprovalForWorktree(worktreePath: string): boolean;
     isAutoApprovalDisabledForWorktree(worktreePath: string): boolean;

package/dist/services/sessionManager.js

@@ -20,7 +20,7 @@ import { preparePresetLaunch } from '../utils/presetPrompt.js';
 const { Terminal } = pkg;
 const TERMINAL_CONTENT_MAX_LINES = 300;
 const TERMINAL_SCROLLBACK_LINES = 5000;
-const TERMINAL_RESTORE_SCROLLBACK_LINES = 200;
+const TERMINAL_RESTORE_SCROLLBACK_LINES = TERMINAL_SCROLLBACK_LINES;
 // How long to suppress PTY → stdout forwarding after a viewport resize so the
 // child process's SIGWINCH-triggered re-emission of static content does not
 // duplicate already-displayed rows in the user's terminal.
@@ -33,6 +33,11 @@ const RESIZE_SUPPRESS_MS = 250;
 // streaming session still restores within a small bounded delay.
 const RESTORE_DEFER_QUIET_MS = 80;
 const RESTORE_DEFER_MAX_MS = 250;
+// Cursor-addressed redraws (progress bars, spinners, TUIs) can leave transient
+// rows in scrollback if the viewport scrolls before those rows are overwritten.
+// Keep a short generic redraw window so restore can skip that ghost-bearing
+// range without depending on any specific CLI output text.
+const REDRAW_SCROLLBACK_QUIET_MS = 500;
 export class SessionManager extends EventEmitter {
     sessions;
     waitingWithBottomBorder = new Map();
@@ -44,6 +49,8 @@ export class SessionManager extends EventEmitter {
     resizeSuppressTimers = new Map();
     restoreDeferTimers = new Map();
     restoreDeferDeadlines = new Map();
+    cursorRedrawSessions = new Set();
+    cursorRedrawTimers = new Map();
     async spawn(command, args, worktreePath, options = {}) {
         const spawnOptions = {
             name: 'xterm-256color',
@@ -231,6 +238,35 @@ export class SessionManager extends EventEmitter {
             data.includes('\x1b[3J') ||
             data.includes('\x1bc'));
     }
+    hasCursorAddressedRedraw(data) {
+        return (
+        // CSI cursor movement/positioning, erase, and scroll controls.
+        /\x1b\[[0-?]*[ -/]*[ABCDEFGHJKSTX`abcdefg]/.test(data) ||
+            // DEC save/restore cursor.
+            /\x1b[78]/.test(data) ||
+            // Synchronized output mode usually brackets full-frame redraws.
+            /\x1b\[\?2026[hl]/.test(data));
+    }
+    markCursorRedrawActive(session) {
+        this.cursorRedrawSessions.add(session.id);
+        const existing = this.cursorRedrawTimers.get(session.id);
+        if (existing !== undefined) {
+            clearTimeout(existing);
+        }
+        const timer = setTimeout(() => {
+            this.cursorRedrawTimers.delete(session.id);
+            this.cursorRedrawSessions.delete(session.id);
+        }, REDRAW_SCROLLBACK_QUIET_MS);
+        this.cursorRedrawTimers.set(session.id, timer);
+    }
+    handleScrollbackGrowthDuringRedraw(session, beforeBaseY) {
+        const afterBaseY = session.terminal.buffer.normal.baseY;
+        if (afterBaseY <= beforeBaseY ||
+            !this.cursorRedrawSessions.has(session.id)) {
+            return;
+        }
+        session.restoreScrollbackBaseLine = Math.max(session.restoreScrollbackBaseLine, afterBaseY);
+    }
     getRestoreSnapshot(session) {
         const activeBuffer = session.terminal.buffer.active;
         if (activeBuffer.type !== 'normal') {
@@ -245,19 +281,6 @@ export class SessionManager extends EventEmitter {
         }
         const cursorRow = normalBuffer.cursorY + 1;
         const cursorCol = normalBuffer.cursorX + 1;
-        // When the live viewport shows a transient footer (spinner activity,
-        // token stats, persistent shift+tab footer, etc.), the renderer keeps
-        // redrawing it in place and earlier copies have likely been pushed into
-        // scrollback by chat output scrolling beneath it. Replaying that
-        // scrollback would paint duplicated footer rows, so emit only the
-        // viewport in this case.
-        if (session.stateDetector.hasTransientRenderFooter(session.terminal)) {
-            const viewportSnapshot = session.serializer.serialize({
-                scrollback: 0,
-                excludeAltBuffer: true,
-            });
-            return `${viewportSnapshot}\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;
@@ -434,8 +457,13 @@ export class SessionManager extends EventEmitter {
     setupDataHandler(session) {
         // This handler always runs for all data
         session.process.onData((data) => {
+            const beforeBaseY = session.terminal.buffer.normal.baseY;
+            if (this.hasCursorAddressedRedraw(data)) {
+                this.markCursorRedrawActive(session);
+            }
             // Write data to virtual terminal
             session.terminal.write(data);
+            this.handleScrollbackGrowthDuringRedraw(session, beforeBaseY);
             if (this.shouldResetRestoreScrollback(data)) {
                 session.restoreScrollbackBaseLine =
                     session.terminal.buffer.normal.baseY;
@@ -678,6 +706,14 @@ export class SessionManager extends EventEmitter {
         }
         this.restoreDeferDeadlines.delete(sessionId);
     }
+    clearCursorRedrawTracking(sessionId) {
+        this.cursorRedrawSessions.delete(sessionId);
+        const timer = this.cursorRedrawTimers.get(sessionId);
+        if (timer !== undefined) {
+            clearTimeout(timer);
+            this.cursorRedrawTimers.delete(sessionId);
+        }
+    }
     cancelAutoApproval(sessionId, reason = 'User input received') {
         const session = this.sessions.get(sessionId);
         if (!session) {
@@ -755,6 +791,7 @@ export class SessionManager extends EventEmitter {
                 clearTimeout(resizeTimer);
                 this.resizeSuppressTimers.delete(sessionId);
             }
+            this.clearCursorRedrawTracking(sessionId);
             this.cancelRestoreDefer(sessionId);
             this.emit('sessionDestroyed', session);
         }
@@ -815,6 +852,7 @@ export class SessionManager extends EventEmitter {
                     clearTimeout(resizeTimer);
                     this.resizeSuppressTimers.delete(sessionId);
                 }
+                this.clearCursorRedrawTracking(sessionId);
                 this.cancelRestoreDefer(sessionId);
                 this.emit('sessionDestroyed', session);
             },

package/dist/services/sessionManager.test.js

@@ -774,7 +774,7 @@ describe('SessionManager', () => {
         });
     });
     describe('session restore snapshots', () => {
-        it('should emit a bounded normal-buffer restore snapshot and restore the cursor position', async () => {
+        it('should emit a normal-buffer restore snapshot from the restore baseline and restore the cursor position', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
@@ -803,6 +803,32 @@ describe('SessionManager', () => {
             });
             expect(restoreHandler).toHaveBeenCalledWith(session, '\u001b[31mrestored\u001b[0m\u001b[8;12H');
         });
+        it('should restore all retained normal-buffer scrollback when no baseline excludes it', 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 = 0;
+            const serializeMock = vi
+                .spyOn(session.serializer, 'serialize')
+                .mockReturnValue('\u001b[31mrestored\u001b[0m');
+            sessionManager.setSessionActive(session.id, true);
+            expect(serializeMock).toHaveBeenCalledWith({
+                range: {
+                    start: 0,
+                    end: 299,
+                },
+                excludeAltBuffer: true,
+            });
+        });
         it('should keep viewport-only restore behavior for alternate screen sessions', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
@@ -847,6 +873,69 @@ describe('SessionManager', () => {
             mockPty.emit('data', '\x1b[2J\x1b[Hfresh');
             expect(session.restoreScrollbackBaseLine).toBe(17);
         });
+        it('should keep full scrollback for normal output that scrolls', 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 = 10;
+            vi.mocked(session.terminal.write).mockImplementation(() => {
+                normalBuffer.baseY = 12;
+            });
+            mockPty.emit('data', 'ordinary output\n');
+            expect(session.restoreScrollbackBaseLine).toBe(0);
+        });
+        it('should skip scrollback that grows during cursor-addressed redraws', 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 = 10;
+            vi.mocked(session.terminal.write).mockImplementation(() => {
+                normalBuffer.baseY = 12;
+            });
+            mockPty.emit('data', '\x1b[Hredrawn status\n');
+            expect(session.restoreScrollbackBaseLine).toBe(12);
+        });
+        it('should keep cursor-addressed redraw tracking active for a short quiet window', 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'));
+                const normalBuffer = session.terminal.buffer.normal;
+                normalBuffer.baseY = 10;
+                vi.mocked(session.terminal.write).mockImplementation(() => {
+                    if (normalBuffer.baseY === 10) {
+                        return;
+                    }
+                    normalBuffer.baseY++;
+                });
+                mockPty.emit('data', '\x1b[Hredraw frame');
+                normalBuffer.baseY = 11;
+                mockPty.emit('data', 'plain continuation that scrolls');
+                expect(session.restoreScrollbackBaseLine).toBe(12);
+                vi.advanceTimersByTime(501);
+                normalBuffer.baseY = 20;
+                mockPty.emit('data', 'ordinary output after quiet window');
+                expect(session.restoreScrollbackBaseLine).toBe(12);
+            }
+            finally {
+                vi.useRealTimers();
+            }
+        });
         it('should flush live session data after the restore snapshot completes', async () => {
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
@@ -872,7 +961,7 @@ describe('SessionManager', () => {
             sessionManager.setSessionActive(session.id, true);
             expect(eventOrder).toEqual(['restore', 'data']);
         });
-        it('should defer the viewport-only restore until PTY output is quiet when a transient footer is visible', async () => {
+        it('should defer the scrollback restore until PTY output is quiet when a transient footer is visible', async () => {
             vi.useFakeTimers();
             try {
                 vi.mocked(configReader.getDefaultPreset).mockReturnValue({
@@ -899,10 +988,13 @@ describe('SessionManager', () => {
                 expect(serializeMock).not.toHaveBeenCalled();
                 vi.advanceTimersByTime(80);
                 expect(serializeMock).toHaveBeenCalledWith({
-                    scrollback: 0,
+                    range: {
+                        start: 120,
+                        end: 299,
+                    },
                     excludeAltBuffer: true,
                 });
-                expect(serializeMock).not.toHaveBeenCalledWith(expect.objectContaining({ range: expect.anything() }));
+                expect(serializeMock).not.toHaveBeenCalledWith(expect.objectContaining({ scrollback: 0 }));
                 expect(restoreHandler).toHaveBeenCalledWith(session, 'viewport');
             }
             finally {

package/dist/services/worktreeService.js

@@ -775,10 +775,14 @@ export class WorktreeService {
                 copySessionData,
                 copyClaudeDirectory,
             });
-            // Check if branch exists
-            const branchExists = yield* Effect.catchAll(Effect.try({
+            // Check if a LOCAL branch exists (refs/heads/ only).
+            // Using `git rev-parse --verify` without qualifying the ref would also
+            // match remote-tracking refs (e.g. refs/remotes/origin/<branch>), which
+            // causes `git worktree add` to create the worktree in detached-HEAD
+            // state instead of on a proper local branch.
+            const localBranchExists = yield* Effect.catchAll(Effect.try({
                 try: () => {
-                    execSync(`git rev-parse --verify ${branch}`, {
+                    execSync(`git show-ref --verify --quiet refs/heads/${branch}`, {
                         cwd: self.rootPath,
                         encoding: 'utf8',
                     });
@@ -798,15 +802,23 @@ export class WorktreeService {
                 worktreeHooksConfig.pre_creation?.command) {
                 yield* executeWorktreePreCreationHook(worktreeHooksConfig.pre_creation.command, resolvedPath, branch, absoluteGitRoot, baseBranch);
             }
-            // Create the worktree command
+            // Create the worktree command.
+            // Three cases:
+            // 1. Local branch exists → attach worktree directly
+            // 2. No local branch, but remote-tracking branch exists → create
+            //    local branch from the remote ref (avoids detached HEAD)
+            // 3. Branch is brand-new → create from baseBranch
             let command;
-            if (branchExists) {
+            if (localBranchExists) {
                 command = `git worktree add "${resolvedPath}" "${branch}"`;
             }
             else {
-                // Resolve the base branch to its proper git reference
-                const resolvedBaseBranch = self.resolveBranchReference(baseBranch);
-                command = `git worktree add -b "${branch}" "${resolvedPath}" "${resolvedBaseBranch}"`;
+                const resolvedRef = self.resolveBranchReference(branch);
+                const isRemoteBranch = resolvedRef !== branch;
+                const startPoint = isRemoteBranch
+                    ? resolvedRef
+                    : self.resolveBranchReference(baseBranch);
+                command = `git worktree add -b "${branch}" "${resolvedPath}" "${startPoint}"`;
             }
             // Execute the worktree creation command
             yield* Effect.try({

package/dist/services/worktreeService.test.js

@@ -631,9 +631,15 @@ branch refs/heads/feature
                     if (cmd === 'git rev-parse --git-common-dir') {
                         return '/fake/path/.git\n';
                     }
-                    if (cmd.includes('rev-parse --verify')) {
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/')) {
                         throw new Error('Branch not found');
                     }
+                    if (cmd === 'git remote') {
+                        return 'origin\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/')) {
+                        throw new Error('Remote branch not found');
+                    }
                     if (cmd.includes('git worktree add')) {
                         return '';
                     }
@@ -648,15 +654,62 @@ branch refs/heads/feature
                 isMainWorktree: false,
             });
         });
+        it('should create local branch from remote ref when only remote branch exists', async () => {
+            const executedCommands = [];
+            mockedExecSync.mockImplementation((cmd, _options) => {
+                if (typeof cmd === 'string') {
+                    executedCommands.push(cmd);
+                    if (cmd === 'git rev-parse --git-common-dir') {
+                        return '/fake/path/.git\n';
+                    }
+                    // No local branch
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/')) {
+                        throw new Error('Branch not found');
+                    }
+                    if (cmd === 'git remote') {
+                        return 'origin\n';
+                    }
+                    // Remote branch exists
+                    if (cmd ===
+                        'git show-ref --verify --quiet refs/remotes/origin/feature/remote-only') {
+                        return '';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/')) {
+                        throw new Error('Remote branch not found');
+                    }
+                    if (cmd.includes('git worktree add')) {
+                        return '';
+                    }
+                }
+                return '';
+            });
+            const effect = service.createWorktreeEffect('/path/to/worktree', 'feature/remote-only', 'main');
+            const result = await Effect.runPromise(effect);
+            expect(result.worktree).toMatchObject({
+                path: '/path/to/worktree',
+                branch: 'feature/remote-only',
+                isMainWorktree: false,
+            });
+            // Should use -b with the remote ref as start point, not baseBranch
+            const worktreeAddCmd = executedCommands.find(c => c.includes('git worktree add'));
+            expect(worktreeAddCmd).toContain('-b "feature/remote-only"');
+            expect(worktreeAddCmd).toContain('"origin/feature/remote-only"');
+        });
         it('should return Effect that fails with GitError on git command failure', async () => {
             mockedExecSync.mockImplementation((cmd, _options) => {
                 if (typeof cmd === 'string') {
                     if (cmd === 'git rev-parse --git-common-dir') {
                         return '/fake/path/.git\n';
                     }
-                    if (cmd.includes('rev-parse --verify')) {
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/')) {
                         throw new Error('Branch not found');
                     }
+                    if (cmd === 'git remote') {
+                        return 'origin\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/')) {
+                        throw new Error('Remote branch not found');
+                    }
                     if (cmd.includes('git worktree add')) {
                         const error = new Error('fatal: invalid reference: main');
                         error.status = 128;
@@ -696,9 +749,15 @@ branch refs/heads/feature
                     if (cmd === 'git rev-parse --git-common-dir') {
                         return '/fake/path/.git\n';
                     }
-                    if (cmd.includes('rev-parse --verify')) {
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/')) {
                         throw new Error('Branch not found');
                     }
+                    if (cmd === 'git remote') {
+                        return 'origin\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/')) {
+                        throw new Error('Remote branch not found');
+                    }
                     if (cmd.includes('git worktree add')) {
                         throw new Error('git worktree add should not be called');
                     }
@@ -732,9 +791,15 @@ branch refs/heads/feature
                     if (cmd === 'git rev-parse --git-common-dir') {
                         return '/fake/path/.git\n';
                     }
-                    if (cmd.includes('rev-parse --verify')) {
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/')) {
                         throw new Error('Branch not found');
                     }
+                    if (cmd === 'git remote') {
+                        return 'origin\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/')) {
+                        throw new Error('Remote branch not found');
+                    }
                     if (cmd.includes('git worktree add')) {
                         return '';
                     }

package/package.json

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