ccmanager 1.4.3 → 1.4.5

package/dist/components/App.js

@@ -193,33 +193,6 @@ const App = ({ devcontainerConfig }) => {
     const handleCancelDeleteWorktree = () => {
         handleReturnToMenu();
     };
-    const handleMergeWorktree = async (sourceBranch, targetBranch, deleteAfterMerge, useRebase) => {
-        setView('merging-worktree');
-        setError(null);
-        // Perform the merge
-        const mergeResult = worktreeService.mergeWorktree(sourceBranch, targetBranch, useRebase);
-        if (mergeResult.success) {
-            // If user wants to delete the merged branch
-            if (deleteAfterMerge) {
-                const deleteResult = worktreeService.deleteWorktreeByBranch(sourceBranch);
-                if (!deleteResult.success) {
-                    setError(deleteResult.error || 'Failed to delete merged worktree');
-                    setView('merge-worktree');
-                    return;
-                }
-            }
-            // Success - return to menu
-            handleReturnToMenu();
-        }
-        else {
-            // Show error
-            setError(mergeResult.error || 'Failed to merge branches');
-            setView('merge-worktree');
-        }
-    };
-    const handleCancelMergeWorktree = () => {
-        handleReturnToMenu();
-    };
     if (view === 'menu') {
         return (React.createElement(Menu, { key: menuKey, sessionManager: sessionManager, onSelectWorktree: handleSelectWorktree, error: error, onDismissError: () => setError(null) }));
     }
@@ -262,11 +235,7 @@ const App = ({ devcontainerConfig }) => {
                 React.createElement(Text, { color: "red" },
                     "Error: ",
                     error))),
-            React.createElement(MergeWorktree, { onComplete: handleMergeWorktree, onCancel: handleCancelMergeWorktree })));
-    }
-    if (view === 'merging-worktree') {
-        return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Text, { color: "green" }, "Merging worktrees...")));
+            React.createElement(MergeWorktree, { onComplete: handleReturnToMenu, onCancel: handleReturnToMenu })));
     }
     if (view === 'configuration') {
         return React.createElement(Configuration, { onComplete: handleReturnToMenu });

package/dist/components/MergeWorktree.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 interface MergeWorktreeProps {
-    onComplete: (sourceBranch: string, targetBranch: string, deleteAfterMerge: boolean, useRebase: boolean) => void;
+    onComplete: () => void;
     onCancel: () => void;
 }
 declare const MergeWorktree: React.FC<MergeWorktreeProps>;

package/dist/components/MergeWorktree.js

@@ -9,10 +9,12 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
     const [sourceBranch, setSourceBranch] = useState('');
     const [targetBranch, setTargetBranch] = useState('');
     const [branchItems, setBranchItems] = useState([]);
+    const [originalBranchItems, setOriginalBranchItems] = useState([]);
     const [useRebase, setUseRebase] = useState(false);
     const [operationFocused, setOperationFocused] = useState(false);
+    const [mergeError, setMergeError] = useState(null);
+    const [worktreeService] = useState(() => new WorktreeService());
     useEffect(() => {
-        const worktreeService = new WorktreeService();
         const loadedWorktrees = worktreeService.getWorktrees();
         // Create branch items for selection
         const items = loadedWorktrees.map(wt => ({
@@ -21,7 +23,8 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             value: wt.branch ? wt.branch.replace('refs/heads/', '') : 'detached',
         }));
         setBranchItems(items);
-    }, []);
+        setOriginalBranchItems(items);
+    }, [worktreeService]);
     useInput((input, key) => {
         if (shortcutManager.matchesShortcut('cancel', input, key)) {
             onCancel();
@@ -37,11 +40,15 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
                 setStep('confirm-merge');
             }
         }
+        if (step === 'merge-error') {
+            // Any key press returns to menu
+            onCancel();
+        }
     });
     const handleSelectSource = (item) => {
         setSourceBranch(item.value);
         // Filter out the selected source branch for target selection
-        const filteredItems = branchItems.filter(b => b.value !== item.value);
+        const filteredItems = originalBranchItems.filter(b => b.value !== item.value);
         setBranchItems(filteredItems);
         setStep('select-target');
     };
@@ -49,6 +56,24 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
         setTargetBranch(item.value);
         setStep('select-operation');
     };
+    // Execute the merge operation when step changes to executing-merge
+    useEffect(() => {
+        if (step !== 'executing-merge')
+            return;
+        const performMerge = async () => {
+            const result = worktreeService.mergeWorktree(sourceBranch, targetBranch, useRebase);
+            if (result.success) {
+                // Merge successful, ask about deleting source branch
+                setStep('delete-confirm');
+            }
+            else {
+                // Merge failed, show error
+                setMergeError(result.error || 'Merge operation failed');
+                setStep('merge-error');
+            }
+        };
+        performMerge();
+    }, [step, sourceBranch, targetBranch, useRebase, worktreeService]);
     if (step === 'select-source') {
         return (React.createElement(Box, { flexDirection: "column" },
             React.createElement(Box, { marginBottom: 1 },
@@ -124,7 +149,24 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
                 ' ',
                 React.createElement(Text, { color: "yellow" }, targetBranch),
                 "?")));
-        return (React.createElement(Confirmation, { message: confirmMessage, onConfirm: () => setStep('delete-confirm'), onCancel: onCancel }));
+        return (React.createElement(Confirmation, { message: confirmMessage, onConfirm: () => setStep('executing-merge'), onCancel: onCancel }));
+    }
+    if (step === 'executing-merge') {
+        return (React.createElement(Box, { flexDirection: "column" },
+            React.createElement(Text, { color: "green" },
+                useRebase ? 'Rebasing' : 'Merging',
+                " branches...")));
+    }
+    if (step === 'merge-error') {
+        return (React.createElement(Box, { flexDirection: "column" },
+            React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, { bold: true, color: "red" },
+                    useRebase ? 'Rebase' : 'Merge',
+                    " Failed")),
+            React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, { color: "red" }, mergeError)),
+            React.createElement(Box, { marginTop: 1 },
+                React.createElement(Text, { dimColor: true }, "Press any key to return to menu"))));
     }
     if (step === 'delete-confirm') {
         const deleteMessage = (React.createElement(Box, { flexDirection: "column" },
@@ -135,7 +177,19 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
                 React.createElement(Text, { color: "yellow" }, sourceBranch),
                 ' ',
                 "and its worktree?")));
-        return (React.createElement(Confirmation, { message: deleteMessage, onConfirm: () => onComplete(sourceBranch, targetBranch, true, useRebase), onCancel: () => onComplete(sourceBranch, targetBranch, false, useRebase) }));
+        return (React.createElement(Confirmation, { message: deleteMessage, onConfirm: () => {
+                const deleteResult = worktreeService.deleteWorktreeByBranch(sourceBranch);
+                if (deleteResult.success) {
+                    onComplete();
+                }
+                else {
+                    setMergeError(deleteResult.error || 'Failed to delete worktree');
+                    setStep('merge-error');
+                }
+            }, onCancel: () => {
+                // Skip deletion and complete
+                onComplete();
+            } }));
     }
     return null;
 };

package/dist/components/Session.js

@@ -73,20 +73,10 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         const handleResize = () => {
             const cols = process.stdout.columns || 80;
             const rows = process.stdout.rows || 24;
-            try {
-                session.process.resize(cols, rows);
-                // Also resize the virtual terminal
-                if (session.terminal) {
-                    try {
-                        session.terminal.resize(cols, rows);
-                    }
-                    catch {
-                        // Suppress xterm.js parsing errors
-                    }
-                }
-            }
-            catch {
-                // Suppress PTY resize errors
+            session.process.resize(cols, rows);
+            // Also resize the virtual terminal
+            if (session.terminal) {
+                session.terminal.resize(cols, rows);
             }
         };
         stdout.on('resize', handleResize);

package/dist/services/sessionManager.js

@@ -55,6 +55,7 @@ export class SessionManager extends EventEmitter {
             cols: process.stdout.columns || 80,
             rows: process.stdout.rows || 24,
             allowProposedApi: true,
+            logLevel: 'off',
         });
     }
     async createSessionInternal(worktreePath, ptyProcess, commandConfig, options = {}) {
@@ -109,13 +110,8 @@ export class SessionManager extends EventEmitter {
     setupDataHandler(session) {
         // This handler always runs for all data
         session.process.onData((data) => {
-            // Write data to virtual terminal with error suppression
-            try {
-                session.terminal.write(data);
-            }
-            catch {
-                // Suppress xterm.js parsing errors
-            }
+            // Write data to virtual terminal
+            session.terminal.write(data);
             // Store in output history as Buffer
             const buffer = Buffer.from(data, 'utf8');
             session.outputHistory.push(buffer);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "1.4.3",
+	"version": "1.4.5",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",