ccmanager 4.1.15 → 4.1.17

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