ccmanager 4.1.19 → 4.1.20

package/dist/components/App.js

@@ -18,7 +18,6 @@ import { globalSessionOrchestrator } from '../services/globalSessionOrchestrator
 import { WorktreeService } from '../services/worktreeService.js';
 import { worktreeNameGenerator, generateFallbackBranchName, } from '../services/worktreeNameGenerator.js';
 import { logger } from '../utils/logger.js';
-import { AmbiguousBranchError, } from '../types/index.js';
 import { configReader } from '../services/config/configReader.js';
 import { ENV_VARS } from '../constants/env.js';
 import { MULTI_PROJECT_ERRORS } from '../constants/error.js';
@@ -217,29 +216,6 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
             cancelled = true;
         };
     }, [view, pendingMenuSessionLaunch, startSessionForWorktree]);
-    // Helper function to parse ambiguous branch error and create AmbiguousBranchError
-    const parseAmbiguousBranchError = (errorMessage) => {
-        const pattern = /Ambiguous branch '(.+?)' found in multiple remotes: (.+?)\. Please specify which remote to use\./;
-        const match = errorMessage.match(pattern);
-        if (!match) {
-            return null;
-        }
-        const branchName = match[1];
-        const remoteRefsText = match[2];
-        const remoteRefs = remoteRefsText.split(', ');
-        // Parse remote refs into RemoteBranchMatch objects
-        const matches = remoteRefs.map(fullRef => {
-            const parts = fullRef.split('/');
-            const remote = parts[0];
-            const branch = parts.slice(1).join('/');
-            return {
-                remote,
-                branch,
-                fullRef,
-            };
-        });
-        return new AmbiguousBranchError(branchName, matches);
-    };
     // Helper function to handle worktree creation results
     const handleWorktreeCreationResult = (result, creationData) => {
         if (result.success) {
@@ -266,21 +242,8 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
             handleReturnToMenu();
             return;
         }
-        const errorMessage = result.error || 'Failed to create worktree';
-        const ambiguousError = parseAmbiguousBranchError(errorMessage);
-        if (ambiguousError) {
-            // Handle ambiguous branch error
-            setPendingWorktreeCreation({
-                ...creationData,
-                ambiguousError,
-            });
-            navigateWithClear('remote-branch-selector');
-        }
-        else {
-            // Handle regular error
-            setError(errorMessage);
-            setView('new-worktree');
-        }
+        setError(result.error || 'Failed to create worktree');
+        setView('new-worktree');
     };
     const handleMenuAction = async (action) => {
         switch (action.type) {
@@ -409,9 +372,23 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
         setView('creating-worktree');
         // Create the worktree using Effect
         const result = await Effect.runPromise(Effect.either(worktreeService.createWorktreeEffect(targetPath, branch, request.baseBranch, request.copySessionData, request.copyClaudeDirectory)));
-        // Transform Effect result to legacy format for handleWorktreeCreationResult
         if (result._tag === 'Left') {
-            // Handle error using pattern matching on _tag
+            if (result.left._tag === 'AmbiguousBranchError') {
+                setPendingWorktreeCreation({
+                    path: targetPath,
+                    branch,
+                    baseBranch: request.baseBranch,
+                    copySessionData: request.copySessionData,
+                    copyClaudeDirectory: request.copyClaudeDirectory,
+                    presetId: request.creationMode === 'prompt' ? request.presetId : undefined,
+                    initialPrompt: request.creationMode === 'prompt'
+                        ? request.initialPrompt
+                        : undefined,
+                    ambiguousError: result.left,
+                });
+                navigateWithClear('remote-branch-selector');
+                return;
+            }
             const errorMessage = formatPreCreationHookError(result.left);
             if (result.left._tag === 'ProcessError') {
                 setError(null);
@@ -473,7 +450,11 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
         const result = await Effect.runPromise(Effect.either(worktreeService.createWorktreeEffect(creationData.path, creationData.branch, selectedRemoteRef, // Use the selected remote reference
         creationData.copySessionData, creationData.copyClaudeDirectory)));
         if (result._tag === 'Left') {
-            // Handle error using pattern matching on _tag
+            if (result.left._tag === 'AmbiguousBranchError') {
+                setError(result.left.message);
+                setView('new-worktree');
+                return;
+            }
             const errorMessage = formatPreCreationHookError(result.left);
             if (result.left._tag === 'ProcessError') {
                 setError(null);

package/dist/services/worktreeService.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from 'effect';
-import { Worktree, CreateWorktreeResult, MergeConfig } from '../types/index.js';
+import { Worktree, CreateWorktreeResult, AmbiguousBranchError, MergeConfig } from '../types/index.js';
 import { GitError, FileSystemError, ProcessError } from '../types/errors.js';
 /**
  * WorktreeService - Git worktree management with Effect-based error handling
@@ -53,6 +53,7 @@ export declare class WorktreeService {
      * @throws {AmbiguousBranchError} When branch exists in multiple remotes
      */
     private resolveBranchReference;
+    private resolveBranchReferenceEffect;
     /**
      * SYNCHRONOUS HELPER: Gets all git remotes for this repository.
      *
@@ -323,7 +324,7 @@ export declare class WorktreeService {
      * @throws {GitError} When git worktree add command fails
      * @throws {FileSystemError} When session data copy fails
      */
-    createWorktreeEffect(worktreePath: string, branch: string, baseBranch: string, copySessionData?: boolean, copyClaudeDirectory?: boolean): Effect.Effect<CreateWorktreeResult, GitError | FileSystemError | ProcessError, never>;
+    createWorktreeEffect(worktreePath: string, branch: string, baseBranch: string, copySessionData?: boolean, copyClaudeDirectory?: boolean): Effect.Effect<CreateWorktreeResult, GitError | FileSystemError | ProcessError | AmbiguousBranchError, never>;
     /**
      * Effect-based deleteWorktree operation
      * May fail with GitError

package/dist/services/worktreeService.js

@@ -162,6 +162,18 @@ export class WorktreeService {
             return branchName;
         }
     }
+    resolveBranchReferenceEffect(branchName) {
+        return Effect.try({
+            try: () => this.resolveBranchReference(branchName),
+            catch: error => {
+                if (error instanceof AmbiguousBranchError)
+                    return error;
+                // resolveBranchReference only re-throws AmbiguousBranchError; all
+                // other errors are swallowed internally. This path is unreachable.
+                throw error;
+            },
+        });
+    }
     /**
      * SYNCHRONOUS HELPER: Gets all git remotes for this repository.
      *
@@ -812,12 +824,18 @@ export class WorktreeService {
             if (localBranchExists) {
                 command = `git worktree add "${resolvedPath}" "${branch}"`;
             }
+            else if (baseBranch.endsWith(`/${branch}`)) {
+                // baseBranch is already a remote-tracking ref for branch
+                // (e.g. "origin/feature/x" after the user resolved an ambiguity).
+                // Use it directly to avoid re-triggering AmbiguousBranchError.
+                command = `git worktree add -b "${branch}" "${resolvedPath}" "${baseBranch}"`;
+            }
             else {
-                const resolvedRef = self.resolveBranchReference(branch);
+                const resolvedRef = yield* self.resolveBranchReferenceEffect(branch);
                 const isRemoteBranch = resolvedRef !== branch;
                 const startPoint = isRemoteBranch
                     ? resolvedRef
-                    : self.resolveBranchReference(baseBranch);
+                    : yield* self.resolveBranchReferenceEffect(baseBranch);
                 command = `git worktree add -b "${branch}" "${resolvedPath}" "${startPoint}"`;
             }
             // Execute the worktree creation command

package/dist/services/worktreeService.test.js

@@ -5,6 +5,7 @@ import { existsSync, statSync } from 'fs';
 import { configReader } from './config/configReader.js';
 import { Effect } from 'effect';
 import { GitError, ProcessError } from '../types/errors.js';
+import { AmbiguousBranchError } from '../types/index.js';
 // Mock child_process module
 vi.mock('child_process');
 // Mock fs module
@@ -369,6 +370,61 @@ origin/feature/test
             expect(result).toBe('foo/bar-xyz');
         });
     });
+    describe('resolveBranchReferenceEffect', () => {
+        it('should succeed with remote ref when single remote has the branch', async () => {
+            mockedExecSync.mockImplementation((cmd, _options) => {
+                if (typeof cmd === 'string') {
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/foo/bar-xyz')) {
+                        throw new Error('Local branch not found');
+                    }
+                    if (cmd === 'git remote') {
+                        return 'origin\nupstream\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/origin/foo/bar-xyz')) {
+                        return '';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/upstream/foo/bar-xyz')) {
+                        throw new Error('Remote branch not found in upstream');
+                    }
+                }
+                throw new Error('Command not mocked: ' + cmd);
+            });
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const effect = service.resolveBranchReferenceEffect('foo/bar-xyz');
+            const result = await Effect.runPromise(Effect.either(effect));
+            expect(result._tag).toBe('Right');
+            if (result._tag === 'Right') {
+                expect(result.right).toBe('origin/foo/bar-xyz');
+            }
+        });
+        it('should fail with AmbiguousBranchError (not Die) when multiple remotes have the branch', async () => {
+            mockedExecSync.mockImplementation((cmd, _options) => {
+                if (typeof cmd === 'string') {
+                    if (cmd.includes('show-ref --verify --quiet refs/heads/foo/bar-xyz')) {
+                        throw new Error('Local branch not found');
+                    }
+                    if (cmd === 'git remote') {
+                        return 'origin\nupstream\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/origin/foo/bar-xyz') ||
+                        cmd.includes('show-ref --verify --quiet refs/remotes/upstream/foo/bar-xyz')) {
+                        return '';
+                    }
+                }
+                throw new Error('Command not mocked: ' + cmd);
+            });
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const effect = service.resolveBranchReferenceEffect('foo/bar-xyz');
+            const result = await Effect.runPromise(Effect.either(effect));
+            expect(result._tag).toBe('Left');
+            if (result._tag === 'Left') {
+                expect(result.left).toBeInstanceOf(AmbiguousBranchError);
+                expect(result.left._tag).toBe('AmbiguousBranchError');
+                expect(result.left.branchName).toBe('foo/bar-xyz');
+                expect(result.left.matches).toHaveLength(2);
+            }
+        });
+    });
     describe('hasClaudeDirectoryInBranchEffect', () => {
         it('should return Effect with true when .claude directory exists in branch worktree', async () => {
             mockedExecSync.mockImplementation((cmd, _options) => {
@@ -695,6 +751,65 @@ branch refs/heads/feature
             expect(worktreeAddCmd).toContain('-b "feature/remote-only"');
             expect(worktreeAddCmd).toContain('"origin/feature/remote-only"');
         });
+        it('should return Effect Left with AmbiguousBranchError when branch exists in multiple remotes', 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('show-ref --verify --quiet refs/heads/')) {
+                        throw new Error('Branch not found');
+                    }
+                    if (cmd === 'git remote') {
+                        return 'origin\nkbwo-fork\n';
+                    }
+                    if (cmd.includes('show-ref --verify --quiet refs/remotes/')) {
+                        return ''; // Both remotes have the branch
+                    }
+                }
+                throw new Error('Command not mocked: ' + cmd);
+            });
+            const effect = service.createWorktreeEffect('/path/to/worktree', 'feature/feed-mention', 'main');
+            const result = await Effect.runPromise(Effect.either(effect));
+            expect(result._tag).toBe('Left');
+            if (result._tag === 'Left') {
+                expect(result.left).toBeInstanceOf(AmbiguousBranchError);
+                expect(result.left._tag).toBe('AmbiguousBranchError');
+                expect(result.left.branchName).toBe('feature/feed-mention');
+                expect(result.left.matches).toHaveLength(2);
+                expect(result.left.matches.map(m => m.remote)).toEqual(['origin', 'kbwo-fork']);
+            }
+        });
+        it('should succeed when baseBranch is already a resolved remote ref for branch (retry after disambiguation)', 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.includes('git worktree add')) {
+                        return '';
+                    }
+                }
+                return '';
+            });
+            // Simulate the retry call: user selected "origin/feature/feed-mention",
+            // which is passed as baseBranch.
+            const effect = service.createWorktreeEffect('/path/to/worktree', 'feature/feed-mention', 'origin/feature/feed-mention');
+            const result = await Effect.runPromise(Effect.either(effect));
+            expect(result._tag).toBe('Right');
+            // Should use baseBranch directly as startPoint without calling show-ref
+            const worktreeAddCmd = executedCommands.find(c => c.includes('git worktree add'));
+            expect(worktreeAddCmd).toContain('-b "feature/feed-mention"');
+            expect(worktreeAddCmd).toContain('"origin/feature/feed-mention"');
+            // show-ref for remotes must NOT be called (no re-resolution)
+            expect(executedCommands.some(c => c.includes('show-ref') && c.includes('refs/remotes/'))).toBe(false);
+        });
         it('should return Effect that fails with GitError on git command failure', async () => {
             mockedExecSync.mockImplementation((cmd, _options) => {
                 if (typeof cmd === 'string') {

package/dist/types/index.d.ts

@@ -4,7 +4,8 @@ import type { SerializeAddon } from '@xterm/addon-serialize';
 import { GitStatus } from '../utils/gitStatus.js';
 import { Mutex, SessionStateData } from '../utils/mutex.js';
 import type { StateDetector } from '../services/stateDetector/types.js';
-import type { ProcessError } from './errors.js';
+import type { Effect } from 'effect';
+import type { GitError, FileSystemError, ProcessError } from './errors.js';
 export type Terminal = InstanceType<typeof pkg.Terminal>;
 export type SessionState = 'idle' | 'busy' | 'waiting_input' | 'pending_auto_approval';
 export type StateDetectionStrategy = 'claude' | 'gemini' | 'codex' | 'cursor' | 'github-copilot' | 'cline' | 'opencode' | 'kimi';
@@ -249,16 +250,17 @@ export interface RemoteBranchMatch {
     fullRef: string;
 }
 export declare class AmbiguousBranchError extends Error {
+    readonly _tag: "AmbiguousBranchError";
     branchName: string;
     matches: RemoteBranchMatch[];
     constructor(branchName: string, matches: RemoteBranchMatch[]);
 }
 export interface IWorktreeService {
-    getWorktreesEffect(): import('effect').Effect.Effect<Worktree[], import('../types/errors.js').GitError, never>;
+    getWorktreesEffect(): Effect.Effect<Worktree[], GitError, never>;
     getGitRootPath(): string;
-    createWorktreeEffect(worktreePath: string, branch: string, baseBranch: string, copySessionData?: boolean, copyClaudeDirectory?: boolean): import('effect').Effect.Effect<CreateWorktreeResult, import('../types/errors.js').GitError | import('../types/errors.js').FileSystemError | import('../types/errors.js').ProcessError, never>;
+    createWorktreeEffect(worktreePath: string, branch: string, baseBranch: string, copySessionData?: boolean, copyClaudeDirectory?: boolean): Effect.Effect<CreateWorktreeResult, GitError | FileSystemError | ProcessError | AmbiguousBranchError, never>;
     deleteWorktreeEffect(worktreePath: string, options?: {
         deleteBranch?: boolean;
-    }): import('effect').Effect.Effect<void, import('../types/errors.js').GitError, never>;
-    mergeWorktreeEffect(sourceBranch: string, targetBranch: string, operation?: 'merge' | 'rebase', mergeConfig?: MergeConfig): import('effect').Effect.Effect<void, import('../types/errors.js').GitError, never>;
+    }): Effect.Effect<void, GitError, never>;
+    mergeWorktreeEffect(sourceBranch: string, targetBranch: string, operation?: 'merge' | 'rebase', mergeConfig?: MergeConfig): Effect.Effect<void, GitError, never>;
 }

package/dist/types/index.js

@@ -3,6 +3,7 @@ export const DEFAULT_SHORTCUTS = {
     cancel: { key: 'escape' },
 };
 export class AmbiguousBranchError extends Error {
+    _tag = 'AmbiguousBranchError';
     branchName;
     matches;
     constructor(branchName, matches) {

package/package.json

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