ccmanager 2.4.0 → 2.5.0

package/dist/components/App.js

@@ -10,7 +10,6 @@ import Configuration from './Configuration.js';
 import PresetSelector from './PresetSelector.js';
 import { globalSessionOrchestrator } from '../services/globalSessionOrchestrator.js';
 import { WorktreeService } from '../services/worktreeService.js';
-import { shortcutManager } from '../services/shortcutManager.js';
 import { configurationManager } from '../services/configurationManager.js';
 import { ENV_VARS } from '../constants/env.js';
 import { MULTI_PROJECT_ERRORS } from '../constants/error.js';
@@ -264,12 +263,7 @@ const App = ({ devcontainerConfig, multiProject }) => {
     }
     if (view === 'session' && activeSession) {
         return (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Session, { key: activeSession.id, session: activeSession, sessionManager: sessionManager, onReturnToMenu: handleReturnToMenu }),
-            React.createElement(Box, { marginTop: 1 },
-                React.createElement(Text, { dimColor: true },
-                    "Press ",
-                    shortcutManager.getShortcutDisplay('returnToMenu'),
-                    " to return to menu"))));
+            React.createElement(Session, { key: activeSession.id, session: activeSession, sessionManager: sessionManager, onReturnToMenu: handleReturnToMenu })));
     }
     if (view === 'new-worktree') {
         return (React.createElement(Box, { flexDirection: "column" },

package/dist/components/NewWorktree.js

@@ -12,7 +12,7 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const isAutoDirectory = worktreeConfig.autoDirectory;
     const limit = 10;
     // Adjust initial step based on auto directory mode
-    const [step, setStep] = useState(isAutoDirectory ? 'branch' : 'path');
+    const [step, setStep] = useState(isAutoDirectory ? 'base-branch' : 'path');
     const [path, setPath] = useState('');
     const [branch, setBranch] = useState('');
     const [baseBranch, setBaseBranch] = useState('');
@@ -59,18 +59,30 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
     const handlePathSubmit = (value) => {
         if (value.trim()) {
             setPath(value.trim());
-            setStep('branch');
+            setStep('base-branch');
         }
     };
     const handleBranchSubmit = (value) => {
         if (value.trim()) {
             setBranch(value.trim());
-            setStep('base-branch');
+            setStep('copy-settings');
         }
     };
     const handleBaseBranchSelect = (item) => {
         setBaseBranch(item.value);
-        setStep('copy-settings');
+        setStep('branch-strategy');
+    };
+    const handleBranchStrategySelect = (item) => {
+        const useExisting = item.value === 'existing';
+        if (useExisting) {
+            // Use the base branch as the branch name for existing branch
+            setBranch(baseBranch);
+            setStep('copy-settings');
+        }
+        else {
+            // Need to input new branch name
+            setStep('branch');
+        }
     };
     const handleCopySettingsSelect = (item) => {
         setCopyClaudeDirectory(item.value);
@@ -107,31 +119,10 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
                 React.createElement(Text, null, "Enter worktree path (relative to repository root):")),
             React.createElement(Box, null,
                 React.createElement(Text, { color: "cyan" }, '> '),
-                React.createElement(TextInputWrapper, { value: path, onChange: setPath, onSubmit: handlePathSubmit, placeholder: "e.g., ../myproject-feature" })))) : step === 'branch' && !isAutoDirectory ? (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, null,
-                    "Enter branch name for worktree at ",
-                    React.createElement(Text, { color: "cyan" }, path),
-                    ":")),
-            React.createElement(Box, null,
-                React.createElement(Text, { color: "cyan" }, '> '),
-                React.createElement(TextInputWrapper, { value: branch, onChange: setBranch, onSubmit: handleBranchSubmit, placeholder: "e.g., feature/new-feature" })))) : step === 'branch' ? (React.createElement(Box, { flexDirection: "column" },
-            React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, null, "Enter branch name (directory will be auto-generated):")),
-            React.createElement(Box, null,
-                React.createElement(Text, { color: "cyan" }, '> '),
-                React.createElement(TextInputWrapper, { value: branch, onChange: setBranch, onSubmit: handleBranchSubmit, placeholder: "e.g., feature/new-feature" })),
-            generatedPath && (React.createElement(Box, { marginTop: 1 },
-                React.createElement(Text, { dimColor: true },
-                    "Worktree will be created at:",
-                    ' ',
-                    React.createElement(Text, { color: "green" }, generatedPath)))))) : null,
+                React.createElement(TextInputWrapper, { value: path, onChange: setPath, onSubmit: handlePathSubmit, placeholder: "e.g., ../myproject-feature" })))) : null,
         step === 'base-branch' && (React.createElement(Box, { flexDirection: "column" },
             React.createElement(Box, { marginBottom: 1 },
-                React.createElement(Text, null,
-                    "Select base branch for ",
-                    React.createElement(Text, { color: "cyan" }, branch),
-                    ":")),
+                React.createElement(Text, null, "Select base branch for the worktree:")),
             isSearchMode && (React.createElement(Box, { marginBottom: 1 },
                 React.createElement(Text, null, "Search: "),
                 React.createElement(TextInputWrapper, { value: searchQuery, onChange: setSearchQuery, focus: true, placeholder: "Type to filter branches..." }))),
@@ -143,6 +134,38 @@ const NewWorktree = ({ projectPath, onComplete, onCancel, }) => {
                 item.label))))) : (React.createElement(SelectInput, { items: branchItems, onSelect: handleBaseBranchSelect, initialIndex: selectedIndex, limit: limit, isFocused: !isSearchMode })),
             !isSearchMode && (React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { dimColor: true }, "Press / to search"))))),
+        step === 'branch-strategy' && (React.createElement(Box, { flexDirection: "column" },
+            React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, null,
+                    "Base branch: ",
+                    React.createElement(Text, { color: "cyan" }, baseBranch))),
+            React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, null, "Choose branch creation strategy:")),
+            React.createElement(SelectInput, { items: [
+                    {
+                        label: 'Create new branch from base branch',
+                        value: 'new',
+                    },
+                    {
+                        label: 'Use existing base branch',
+                        value: 'existing',
+                    },
+                ], onSelect: handleBranchStrategySelect, initialIndex: 0 }))),
+        step === 'branch' && (React.createElement(Box, { flexDirection: "column" },
+            React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, null,
+                    "Enter new branch name (will be created from",
+                    ' ',
+                    React.createElement(Text, { color: "cyan" }, baseBranch),
+                    "):")),
+            React.createElement(Box, null,
+                React.createElement(Text, { color: "cyan" }, '> '),
+                React.createElement(TextInputWrapper, { value: branch, onChange: setBranch, onSubmit: handleBranchSubmit, placeholder: "e.g., feature/new-feature" })),
+            isAutoDirectory && generatedPath && (React.createElement(Box, { marginTop: 1 },
+                React.createElement(Text, { dimColor: true },
+                    "Worktree will be created at:",
+                    ' ',
+                    React.createElement(Text, { color: "green" }, generatedPath)))))),
         step === 'copy-settings' && (React.createElement(Box, { flexDirection: "column" },
             React.createElement(Box, { marginBottom: 1 },
                 React.createElement(Text, null,

package/package.json

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