ccmanager 4.1.9 → 4.1.10

package/dist/components/App.js

@@ -566,7 +566,7 @@ const App = ({ devcontainerConfig, multiProject, version, }) => {
         return (_jsx(Box, { flexDirection: "column", children: _jsx(LoadingSpinner, { message: message, color: "cyan" }) }));
     }
     if (view === 'merge-worktree') {
-        return (_jsxs(Box, { flexDirection: "column", children: [error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "red", children: ["Error: ", error] }) })), _jsx(MergeWorktree, { onComplete: handleReturnToMenu, onCancel: handleReturnToMenu })] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "red", children: ["Error: ", error] }) })), _jsx(MergeWorktree, { projectPath: selectedProject?.path, onComplete: handleReturnToMenu, onCancel: handleReturnToMenu })] }));
     }
     if (view === 'configuration') {
         return (_jsx(Configuration, { scope: configScope, onComplete: handleReturnToMenu }));

package/dist/components/MergeWorktree.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface MergeWorktreeProps {
+    projectPath?: string;
     onComplete: () => void;
     onCancel: () => void;
 }

package/dist/components/MergeWorktree.js

@@ -9,7 +9,7 @@ import Confirmation, { SimpleConfirmation } from './Confirmation.js';
 import { shortcutManager } from '../services/shortcutManager.js';
 import { GitError } from '../types/errors.js';
 import { hasUncommittedChanges } from '../utils/gitUtils.js';
-const MergeWorktree = ({ onComplete, onCancel, }) => {
+const MergeWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const [step, setStep] = useState('select-source');
     const [sourceBranch, setSourceBranch] = useState('');
     const [targetBranch, setTargetBranch] = useState('');
@@ -17,7 +17,6 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
     const [originalBranchItems, setOriginalBranchItems] = useState([]);
     const [operation, setOperation] = useState('merge');
     const [mergeError, setMergeError] = useState(null);
-    const [worktreeService] = useState(() => new WorktreeService());
     const [mergeConfig] = useState(() => configReader.getMergeConfig());
     const [isLoading, setIsLoading] = useState(true);
     const [loadError, setLoadError] = useState(null);
@@ -25,6 +24,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
         let cancelled = false;
         const loadWorktrees = async () => {
             try {
+                const worktreeService = new WorktreeService(projectPath);
                 const loadedWorktrees = await Effect.runPromise(worktreeService.getWorktreesEffect());
                 if (!cancelled) {
                     // Create branch items for selection
@@ -56,7 +56,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
         return () => {
             cancelled = true;
         };
-    }, [worktreeService]);
+    }, [projectPath]);
     useInput((input, key) => {
         if (shortcutManager.matchesShortcut('cancel', input, key)) {
             onCancel();
@@ -85,6 +85,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             return;
         const performMerge = async () => {
             try {
+                const worktreeService = new WorktreeService(projectPath);
                 await Effect.runPromise(worktreeService.mergeWorktreeEffect(sourceBranch, targetBranch, operation, mergeConfig));
                 // Merge successful, check for uncommitted changes before asking about deletion
                 setStep('check-uncommitted');
@@ -101,14 +102,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             }
         };
         performMerge();
-    }, [
-        step,
-        sourceBranch,
-        targetBranch,
-        operation,
-        mergeConfig,
-        worktreeService,
-    ]);
+    }, [step, sourceBranch, targetBranch, operation, mergeConfig, projectPath]);
     // Check for uncommitted changes in source worktree when entering check-uncommitted step
     useEffect(() => {
         if (step !== 'check-uncommitted')
@@ -116,6 +110,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
         const checkUncommitted = async () => {
             try {
                 // Find the worktree path for the source branch
+                const worktreeService = new WorktreeService(projectPath);
                 const worktrees = await Effect.runPromise(worktreeService.getWorktreesEffect());
                 const sourceWorktree = worktrees.find(wt => wt.branch && wt.branch.replace('refs/heads/', '') === sourceBranch);
                 if (sourceWorktree && hasUncommittedChanges(sourceWorktree.path)) {
@@ -131,7 +126,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             }
         };
         checkUncommitted();
-    }, [step, sourceBranch, worktreeService]);
+    }, [step, sourceBranch, projectPath]);
     if (isLoading) {
         return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: "cyan", children: "Loading worktrees..." }) }));
     }
@@ -197,6 +192,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
         return (_jsx(SimpleConfirmation, { message: deleteMessage, onConfirm: async () => {
                 try {
                     // Find the worktree path for the source branch
+                    const worktreeService = new WorktreeService(projectPath);
                     const worktrees = await Effect.runPromise(worktreeService.getWorktreesEffect());
                     const sourceWorktree = worktrees.find(wt => wt.branch &&
                         wt.branch.replace('refs/heads/', '') === sourceBranch);

package/dist/components/MergeWorktree.test.js

@@ -40,6 +40,61 @@ describe('MergeWorktree - Effect Integration', () => {
     beforeEach(() => {
         vi.clearAllMocks();
     });
+    it('should pass projectPath to WorktreeService when provided', async () => {
+        const projectPath = '/test/project';
+        const mockWorktrees = [
+            {
+                path: '/test/project/main',
+                branch: 'main',
+                isMainWorktree: true,
+                hasSession: false,
+            },
+            {
+                path: '/test/project/feature',
+                branch: 'feature-1',
+                isMainWorktree: false,
+                hasSession: false,
+            },
+        ];
+        const mockEffect = Effect.succeed(mockWorktrees);
+        vi.mocked(WorktreeService).mockImplementation(function () {
+            return {
+                getWorktreesEffect: vi.fn(() => mockEffect),
+            };
+        });
+        const onComplete = vi.fn();
+        const onCancel = vi.fn();
+        render(_jsx(MergeWorktree, { projectPath: projectPath, onComplete: onComplete, onCancel: onCancel }));
+        await new Promise(resolve => setTimeout(resolve, 50));
+        expect(WorktreeService).toHaveBeenCalledWith(projectPath);
+    });
+    it('should use undefined when projectPath not provided', async () => {
+        const mockWorktrees = [
+            {
+                path: '/test/main',
+                branch: 'main',
+                isMainWorktree: true,
+                hasSession: false,
+            },
+            {
+                path: '/test/feature',
+                branch: 'feature-1',
+                isMainWorktree: false,
+                hasSession: false,
+            },
+        ];
+        const mockEffect = Effect.succeed(mockWorktrees);
+        vi.mocked(WorktreeService).mockImplementation(function () {
+            return {
+                getWorktreesEffect: vi.fn(() => mockEffect),
+            };
+        });
+        const onComplete = vi.fn();
+        const onCancel = vi.fn();
+        render(_jsx(MergeWorktree, { onComplete: onComplete, onCancel: onCancel }));
+        await new Promise(resolve => setTimeout(resolve, 50));
+        expect(WorktreeService).toHaveBeenCalledWith(undefined);
+    });
     it('should load worktrees using Effect-based method', async () => {
         // GIVEN: Mock worktrees returned by Effect
         const mockWorktrees = [

package/package.json

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