ccmanager 3.8.1 → 3.10.0

package/dist/components/Dashboard.test.js

@@ -0,0 +1,348 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from 'ink-testing-library';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+// Mock bunTerminal to avoid native module loading issues
+vi.mock('../services/bunTerminal.js', () => ({
+    spawn: vi.fn(function () {
+        return null;
+    }),
+}));
+// Import the actual component code but skip the useInput hook
+vi.mock('ink', async () => {
+    const actual = await vi.importActual('ink');
+    return {
+        ...actual,
+        useInput: vi.fn(),
+    };
+});
+// Mock SelectInput to render items as simple text
+vi.mock('ink-select-input', async () => {
+    const React = await vi.importActual('react');
+    const { Text, Box } = await vi.importActual('ink');
+    return {
+        default: ({ items }) => {
+            return React.createElement(Box, { flexDirection: 'column' }, items.map((item, index) => React.createElement(Text, { key: index }, item.label)));
+        },
+    };
+});
+// Mock TextInputWrapper to render as simple text
+vi.mock('./TextInputWrapper.js', async () => {
+    const React = await vi.importActual('react');
+    const { Text } = await vi.importActual('ink');
+    return {
+        default: ({ value, placeholder }) => {
+            return React.createElement(Text, {}, value || placeholder || '');
+        },
+    };
+});
+// Mock Effect for testing
+vi.mock('effect', async () => {
+    const actual = await vi.importActual('effect');
+    return actual;
+});
+// Mock the projectManager
+vi.mock('../services/projectManager.js', () => ({
+    projectManager: {
+        instance: {
+            discoverProjectsEffect: vi.fn(),
+        },
+        getRecentProjects: vi.fn().mockReturnValue([]),
+    },
+}));
+// Mock globalSessionOrchestrator
+vi.mock('../services/globalSessionOrchestrator.js', () => ({
+    globalSessionOrchestrator: {
+        getProjectPaths: vi.fn().mockReturnValue([]),
+        getProjectSessions: vi.fn().mockReturnValue([]),
+        getManagerForProject: vi.fn().mockReturnValue({
+            on: vi.fn(),
+            off: vi.fn(),
+            getAllSessions: vi.fn().mockReturnValue([]),
+        }),
+    },
+}));
+// Mock WorktreeService
+vi.mock('../services/worktreeService.js', () => ({
+    WorktreeService: vi.fn().mockImplementation(() => ({
+        getWorktreesEffect: vi.fn(),
+        getGitRootPath: vi.fn().mockReturnValue('/test'),
+    })),
+}));
+// Mock useGitStatus to avoid async polling in tests
+vi.mock('../hooks/useGitStatus.js', () => ({
+    useGitStatus: vi.fn((worktrees) => worktrees),
+}));
+// Mock SessionManager static methods
+vi.mock('../services/sessionManager.js', () => ({
+    SessionManager: {
+        getSessionCounts: vi.fn().mockReturnValue({
+            idle: 0,
+            busy: 0,
+            waiting_input: 0,
+            pending_auto_approval: 0,
+            total: 0,
+            backgroundTasks: 0,
+            teamMembers: 0,
+        }),
+        formatSessionCounts: vi.fn().mockReturnValue(''),
+    },
+}));
+// Now import after mocking
+const { default: Dashboard } = await import('./Dashboard.js');
+const { projectManager } = await import('../services/projectManager.js');
+const { globalSessionOrchestrator } = await import('../services/globalSessionOrchestrator.js');
+const { SessionManager } = await import('../services/sessionManager.js');
+const { WorktreeService } = await import('../services/worktreeService.js');
+const { Effect } = await import('effect');
+describe('Dashboard', () => {
+    const mockOnSelectSession = vi.fn();
+    const mockOnSelectProject = vi.fn();
+    const mockOnDismissError = vi.fn();
+    const mockProjects = [
+        {
+            name: 'my-app',
+            path: '/projects/my-app',
+            relativePath: 'my-app',
+            isValid: true,
+        },
+        {
+            name: 'api-server',
+            path: '/projects/api-server',
+            relativePath: 'api-server',
+            isValid: true,
+        },
+        {
+            name: 'shared-lib',
+            path: '/projects/shared-lib',
+            relativePath: 'shared-lib',
+            isValid: true,
+        },
+    ];
+    beforeEach(() => {
+        vi.clearAllMocks();
+        vi.mocked(projectManager.instance.discoverProjectsEffect).mockReturnValue(Effect.succeed(mockProjects));
+        vi.mocked(globalSessionOrchestrator.getProjectPaths).mockReturnValue([]);
+        vi.mocked(globalSessionOrchestrator.getProjectSessions).mockReturnValue([]);
+        vi.mocked(globalSessionOrchestrator.getManagerForProject).mockReturnValue({
+            on: vi.fn(),
+            off: vi.fn(),
+            getAllSessions: vi.fn().mockReturnValue([]),
+        });
+    });
+    it('should render dashboard with correct title and version', () => {
+        const { lastFrame } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        expect(lastFrame()).toContain('CCManager - Dashboard v3.8.1');
+    });
+    it('should display loading state initially', () => {
+        vi.mocked(projectManager.instance.discoverProjectsEffect).mockReturnValue(Effect.async(() => { }));
+        const { lastFrame } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        expect(lastFrame()).toContain('Discovering projects...');
+    });
+    it('should display projects after loading', async () => {
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            const frame = lastFrame();
+            return frame && !frame.includes('Discovering projects...');
+        }, { timeout: 2000 });
+        const frame = lastFrame();
+        expect(frame).toContain('my-app');
+        expect(frame).toContain('api-server');
+        expect(frame).toContain('shared-lib');
+    });
+    it('should display Projects section separator', async () => {
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('my-app') ?? false;
+        });
+        expect(lastFrame()).toContain('Projects');
+    });
+    it('should display Other section with Refresh and Exit', async () => {
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('my-app') ?? false;
+        });
+        const frame = lastFrame();
+        expect(frame).toContain('Other');
+        expect(frame).toContain('Refresh');
+        expect(frame).toContain('Exit');
+    });
+    it('should display number shortcuts for projects', async () => {
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('my-app') ?? false;
+        });
+        const frame = lastFrame();
+        expect(frame).toContain('0 ❯ my-app');
+        expect(frame).toContain('1 ❯ api-server');
+        expect(frame).toContain('2 ❯ shared-lib');
+    });
+    it('should display status legend', () => {
+        const { lastFrame } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        const frame = lastFrame();
+        expect(frame).toContain('Busy');
+        expect(frame).toContain('Waiting');
+        expect(frame).toContain('Idle');
+    });
+    it('should display error when provided', () => {
+        const { lastFrame } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: "Failed to load", onDismissError: mockOnDismissError, version: "3.8.1" }));
+        expect(lastFrame()).toContain('Error: Failed to load');
+        expect(lastFrame()).toContain('Press any key to dismiss');
+    });
+    it('should show empty state when no projects found', async () => {
+        vi.mocked(projectManager.instance.discoverProjectsEffect).mockReturnValue(Effect.succeed([]));
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            const frame = lastFrame();
+            return frame && !frame.includes('Discovering projects...');
+        }, { timeout: 2000 });
+        expect(lastFrame()).toContain('No git repositories found in /projects');
+    });
+    it('should not show Active Sessions section when there are no sessions', async () => {
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('my-app') ?? false;
+        });
+        expect(lastFrame()).not.toContain('Active Sessions');
+    });
+    it('should show Active Sessions when sessions exist', async () => {
+        const mockSession = {
+            id: 'session-1',
+            worktreePath: '/projects/my-app/worktrees/feature-auth',
+            lastActivity: new Date(),
+            isActive: true,
+            stateMutex: {
+                getSnapshot: () => ({
+                    state: 'busy',
+                    backgroundTaskCount: 0,
+                    teamMemberCount: 0,
+                }),
+            },
+        };
+        const mockWorktrees = [
+            {
+                path: '/projects/my-app/worktrees/feature-auth',
+                branch: 'feature/auth',
+                isMainWorktree: false,
+                hasSession: true,
+            },
+        ];
+        vi.mocked(globalSessionOrchestrator.getProjectPaths).mockReturnValue([
+            '/projects/my-app',
+        ]);
+        vi.mocked(globalSessionOrchestrator.getProjectSessions).mockReturnValue([
+            mockSession,
+        ]);
+        vi.mocked(WorktreeService).mockImplementation(function () {
+            return {
+                getWorktreesEffect: () => Effect.succeed(mockWorktrees),
+                getGitRootPath: () => '/projects/my-app',
+            };
+        });
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 200));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            const frame = lastFrame();
+            return frame?.includes('Active Sessions') ?? false;
+        }, { timeout: 3000 });
+        const frame = lastFrame();
+        expect(frame).toContain('Active Sessions');
+        expect(frame).toContain('my-app :: feature/auth');
+        expect(frame).toContain('Busy');
+    });
+    it('should show session counts next to projects', async () => {
+        vi.mocked(SessionManager.formatSessionCounts).mockReturnValue(' (1 Busy)');
+        vi.mocked(globalSessionOrchestrator.getProjectSessions).mockImplementation((path) => {
+            if (path === '/projects/my-app') {
+                return [{ id: 'session-1' }];
+            }
+            return [];
+        });
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('my-app') ?? false;
+        });
+        expect(lastFrame()).toContain('(1 Busy)');
+    });
+    it('should use relativePath for duplicate project names', async () => {
+        const duplicateProjects = [
+            {
+                name: 'utils',
+                path: '/projects/team-a/utils',
+                relativePath: 'team-a/utils',
+                isValid: true,
+            },
+            {
+                name: 'utils',
+                path: '/projects/team-b/utils',
+                relativePath: 'team-b/utils',
+                isValid: true,
+            },
+        ];
+        vi.mocked(projectManager.instance.discoverProjectsEffect).mockReturnValue(Effect.succeed(duplicateProjects));
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('team-a/utils') ?? false;
+        });
+        const frame = lastFrame();
+        expect(frame).toContain('team-a/utils');
+        expect(frame).toContain('team-b/utils');
+    });
+    it('should display controls help text', () => {
+        const { lastFrame } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        expect(lastFrame()).toContain('Controls:');
+        expect(lastFrame()).toContain('0-9 Quick Select');
+        expect(lastFrame()).toContain('R-Refresh');
+        expect(lastFrame()).toContain('Q-Quit');
+    });
+    it('should handle filesystem error during project discovery', async () => {
+        const { FileSystemError } = await import('../types/errors.js');
+        vi.mocked(projectManager.instance.discoverProjectsEffect).mockReturnValue(Effect.fail(new FileSystemError({
+            operation: 'read',
+            path: '/projects',
+            cause: 'Permission denied',
+        })));
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            const frame = lastFrame();
+            return frame && !frame.includes('Discovering projects...');
+        }, { timeout: 2000 });
+        expect(lastFrame()).toContain('Error:');
+    });
+    it('should show recent projects first in the Projects section', async () => {
+        vi.mocked(projectManager.getRecentProjects).mockReturnValue([
+            {
+                path: '/projects/shared-lib',
+                name: 'shared-lib',
+                lastAccessed: Date.now(),
+            },
+        ]);
+        const { lastFrame, rerender } = render(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await new Promise(resolve => setTimeout(resolve, 100));
+        rerender(_jsx(Dashboard, { projectsDir: "/projects", onSelectSession: mockOnSelectSession, onSelectProject: mockOnSelectProject, error: null, onDismissError: mockOnDismissError, version: "3.8.1" }));
+        await vi.waitFor(() => {
+            return lastFrame()?.includes('shared-lib') ?? false;
+        });
+        const frame = lastFrame();
+        // shared-lib should appear first (index 0) because it's recent
+        expect(frame).toContain('0 ❯ shared-lib');
+    });
+});

package/dist/components/MergeWorktree.js

@@ -4,6 +4,7 @@ import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
 import { Effect } from 'effect';
 import { WorktreeService } from '../services/worktreeService.js';
+import { configReader } from '../services/config/configReader.js';
 import Confirmation, { SimpleConfirmation } from './Confirmation.js';
 import { shortcutManager } from '../services/shortcutManager.js';
 import { GitError } from '../types/errors.js';
@@ -14,9 +15,10 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
     const [targetBranch, setTargetBranch] = useState('');
     const [branchItems, setBranchItems] = useState([]);
     const [originalBranchItems, setOriginalBranchItems] = useState([]);
-    const [useRebase, setUseRebase] = useState(false);
+    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);
     useEffect(() => {
@@ -83,7 +85,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             return;
         const performMerge = async () => {
             try {
-                await Effect.runPromise(worktreeService.mergeWorktreeEffect(sourceBranch, targetBranch, useRebase));
+                await Effect.runPromise(worktreeService.mergeWorktreeEffect(sourceBranch, targetBranch, operation, mergeConfig));
                 // Merge successful, check for uncommitted changes before asking about deletion
                 setStep('check-uncommitted');
             }
@@ -99,7 +101,14 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             }
         };
         performMerge();
-    }, [step, sourceBranch, targetBranch, useRebase, worktreeService]);
+    }, [
+        step,
+        sourceBranch,
+        targetBranch,
+        operation,
+        mergeConfig,
+        worktreeService,
+    ]);
     // Check for uncommitted changes in source worktree when entering check-uncommitted step
     useEffect(() => {
         if (step !== 'check-uncommitted')
@@ -140,7 +149,7 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
         const message = (_jsxs(Text, { children: ["Choose how to integrate ", _jsx(Text, { color: "yellow", children: sourceBranch }), " into", ' ', _jsx(Text, { color: "yellow", children: targetBranch }), ":"] }));
         const hint = (_jsxs(Text, { dimColor: true, children: ["Use \u2191\u2193/j/k to navigate, Enter to select,", ' ', shortcutManager.getShortcutDisplay('cancel'), " to cancel"] }));
         const handleOperationSelect = (value) => {
-            setUseRebase(value === 'rebase');
+            setOperation(value);
             setStep('confirm-merge');
         };
         return (_jsx(Confirmation, { title: title, message: message, options: [
@@ -149,14 +158,18 @@ const MergeWorktree = ({ onComplete, onCancel, }) => {
             ], onSelect: handleOperationSelect, initialIndex: 0, hint: hint }));
     }
     if (step === 'confirm-merge') {
-        const confirmMessage = (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Confirm ", useRebase ? 'Rebase' : 'Merge'] }) }), _jsxs(Text, { children: [useRebase ? 'Rebase' : 'Merge', ' ', _jsx(Text, { color: "yellow", children: sourceBranch }), ' ', useRebase ? 'onto' : 'into', ' ', _jsx(Text, { color: "yellow", children: targetBranch }), "?"] })] }));
+        const operationLabel = operation === 'rebase' ? 'Rebase' : 'Merge';
+        const preposition = operation === 'rebase' ? 'onto' : 'into';
+        const confirmMessage = (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Confirm ", operationLabel] }) }), _jsxs(Text, { children: [operationLabel, " ", _jsx(Text, { color: "yellow", children: sourceBranch }), ' ', preposition, " ", _jsx(Text, { color: "yellow", children: targetBranch }), "?"] })] }));
         return (_jsx(SimpleConfirmation, { message: confirmMessage, onConfirm: () => setStep('executing-merge'), onCancel: onCancel }));
     }
     if (step === 'executing-merge') {
-        return (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { color: "green", children: [useRebase ? 'Rebasing' : 'Merging', " branches..."] }) }));
+        const executingLabel = operation === 'rebase' ? 'Rebasing' : 'Merging';
+        return (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { color: "green", children: [executingLabel, " branches..."] }) }));
     }
     if (step === 'merge-error') {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "red", children: [useRebase ? 'Rebase' : 'Merge', " Failed"] }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "red", children: mergeError }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press any key to return to menu" }) })] }));
+        const errorLabel = operation === 'rebase' ? 'Rebase' : 'Merge';
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "red", children: [errorLabel, " Failed"] }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "red", children: mergeError }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press any key to return to menu" }) })] }));
     }
     if (step === 'check-uncommitted') {
         return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: "cyan", children: "Checking for uncommitted changes..." }) }));

package/dist/services/config/configEditor.d.ts

@@ -1,4 +1,4 @@
-import { ConfigScope, ProjectConfigurationData, ShortcutConfig, StatusHookConfig, WorktreeHookConfig, WorktreeConfig, CommandPresetsConfig, IConfigEditor, AutoApprovalConfig } from '../../types/index.js';
+import { ConfigScope, ProjectConfigurationData, ShortcutConfig, StatusHookConfig, WorktreeHookConfig, WorktreeConfig, CommandPresetsConfig, MergeConfig, IConfigEditor, AutoApprovalConfig } from '../../types/index.js';
 /**
  * ConfigEditor provides scope-aware configuration editing.
  * The scope is determined at construction time.
@@ -24,6 +24,8 @@ export declare class ConfigEditor implements IConfigEditor {
     setWorktreeConfig(value: WorktreeConfig): void;
     getCommandPresets(): CommandPresetsConfig | undefined;
     setCommandPresets(value: CommandPresetsConfig): void;
+    getMergeConfig(): MergeConfig | undefined;
+    setMergeConfig(value: MergeConfig): void;
     getAutoApprovalConfig(): AutoApprovalConfig | undefined;
     setAutoApprovalConfig(value: AutoApprovalConfig): void;
     reload(): void;

package/dist/services/config/configEditor.js

@@ -77,6 +77,19 @@ export class ConfigEditor {
     setCommandPresets(value) {
         this.configEditor.setCommandPresets(value);
     }
+    getMergeConfig() {
+        const globalConfig = globalConfigManager.getMergeConfig();
+        const scopedConfig = this.configEditor.getMergeConfig();
+        if (!globalConfig && !scopedConfig)
+            return undefined;
+        return {
+            ...(globalConfig || {}),
+            ...(scopedConfig || {}),
+        };
+    }
+    setMergeConfig(value) {
+        this.configEditor.setMergeConfig(value);
+    }
     getAutoApprovalConfig() {
         const globalConfig = globalConfigManager.getAutoApprovalConfig();
         const scopedConfig = this.configEditor.getAutoApprovalConfig();

package/dist/services/config/configReader.d.ts

@@ -1,5 +1,5 @@
 import { Either } from 'effect';
-import { ShortcutConfig, StatusHookConfig, WorktreeHookConfig, WorktreeConfig, CommandPresetsConfig, CommandPreset, ConfigurationData, IConfigReader } from '../../types/index.js';
+import { ShortcutConfig, StatusHookConfig, WorktreeHookConfig, WorktreeConfig, CommandPresetsConfig, MergeConfig, CommandPreset, ConfigurationData, IConfigReader } from '../../types/index.js';
 import { ValidationError } from '../../types/errors.js';
 /**
  * ConfigReader provides merged configuration reading for runtime components.
@@ -14,6 +14,7 @@ export declare class ConfigReader implements IConfigReader {
     getWorktreeHooks(): WorktreeHookConfig;
     getWorktreeConfig(): WorktreeConfig;
     getCommandPresets(): CommandPresetsConfig;
+    getMergeConfig(): MergeConfig | undefined;
     getConfiguration(): ConfigurationData;
     getAutoApprovalConfig(): NonNullable<ConfigurationData['autoApproval']>;
     isAutoApprovalEnabled(): boolean;

package/dist/services/config/configReader.js

@@ -57,6 +57,17 @@ export class ConfigReader {
             ...(projectConfig || {}),
         };
     }
+    // Merge Config - returns merged value (project fields override global fields)
+    getMergeConfig() {
+        const globalConfig = globalConfigManager.getMergeConfig();
+        const projectConfig = projectConfigManager.getMergeConfig();
+        if (!globalConfig && !projectConfig)
+            return undefined;
+        return {
+            ...(globalConfig || {}),
+            ...(projectConfig || {}),
+        };
+    }
     // Get full merged configuration
     getConfiguration() {
         return {
@@ -65,6 +76,7 @@ export class ConfigReader {
             worktreeHooks: this.getWorktreeHooks(),
             worktree: this.getWorktreeConfig(),
             commandPresets: this.getCommandPresets(),
+            mergeConfig: this.getMergeConfig(),
             autoApproval: this.getAutoApprovalConfig(),
         };
     }

package/dist/services/config/globalConfigManager.d.ts

@@ -1,4 +1,4 @@
-import { ConfigurationData, StatusHookConfig, WorktreeHookConfig, ShortcutConfig, WorktreeConfig, CommandPresetsConfig, IConfigEditor } from '../../types/index.js';
+import { ConfigurationData, StatusHookConfig, WorktreeHookConfig, ShortcutConfig, WorktreeConfig, CommandPresetsConfig, MergeConfig, IConfigEditor } from '../../types/index.js';
 declare class GlobalConfigManager implements IConfigEditor {
     private configPath;
     private legacyShortcutsPath;
@@ -21,6 +21,8 @@ declare class GlobalConfigManager implements IConfigEditor {
     private ensureDefaultPresets;
     getCommandPresets(): CommandPresetsConfig;
     setCommandPresets(presets: CommandPresetsConfig): void;
+    getMergeConfig(): MergeConfig | undefined;
+    setMergeConfig(mergeConfig: MergeConfig): void;
     /**
      * Reload configuration from disk
      */

package/dist/services/config/globalConfigManager.js

@@ -191,6 +191,13 @@ class GlobalConfigManager {
         this.config.commandPresets = presets;
         this.saveConfig();
     }
+    getMergeConfig() {
+        return this.config.mergeConfig;
+    }
+    setMergeConfig(mergeConfig) {
+        this.config.mergeConfig = mergeConfig;
+        this.saveConfig();
+    }
     /**
      * Reload configuration from disk
      */

package/dist/services/config/projectConfigManager.d.ts

@@ -1,4 +1,4 @@
-import { ProjectConfigurationData, ShortcutConfig, StatusHookConfig, WorktreeHookConfig, WorktreeConfig, CommandPresetsConfig, IConfigEditor, AutoApprovalConfig } from '../../types/index.js';
+import { ProjectConfigurationData, ShortcutConfig, StatusHookConfig, WorktreeHookConfig, WorktreeConfig, CommandPresetsConfig, MergeConfig, IConfigEditor, AutoApprovalConfig } from '../../types/index.js';
 /**
  * ProjectConfigManager handles project-specific configuration.
  * Reads/writes from `<git repository root>/.ccmanager.json`.
@@ -22,6 +22,8 @@ declare class ProjectConfigManager implements IConfigEditor {
     setWorktreeConfig(value: WorktreeConfig): void;
     getCommandPresets(): CommandPresetsConfig | undefined;
     setCommandPresets(value: CommandPresetsConfig): void;
+    getMergeConfig(): MergeConfig | undefined;
+    setMergeConfig(value: MergeConfig): void;
     getAutoApprovalConfig(): AutoApprovalConfig | undefined;
     setAutoApprovalConfig(value: AutoApprovalConfig): void;
     reload(): void;

package/dist/services/config/projectConfigManager.js

@@ -110,6 +110,14 @@ class ProjectConfigManager {
         config.commandPresets = value;
         this.saveProjectConfig();
     }
+    getMergeConfig() {
+        return this.projectConfig?.mergeConfig;
+    }
+    setMergeConfig(value) {
+        const config = this.ensureProjectConfig();
+        config.mergeConfig = value;
+        this.saveProjectConfig();
+    }
     getAutoApprovalConfig() {
         return this.projectConfig?.autoApproval;
     }

package/dist/services/globalSessionOrchestrator.d.ts

@@ -10,6 +10,7 @@ declare class GlobalSessionOrchestrator {
     getAllActiveSessions(): Session[];
     destroyAllSessions(): void;
     destroyProjectSessions(projectPath: string): void;
+    getProjectPaths(): string[];
     getProjectSessions(projectPath: string): Session[];
 }
 export declare const globalSessionOrchestrator: GlobalSessionOrchestrator;

package/dist/services/globalSessionOrchestrator.js

@@ -53,6 +53,9 @@ class GlobalSessionOrchestrator {
             this.projectManagers.delete(projectPath);
         }
     }
+    getProjectPaths() {
+        return Array.from(this.projectManagers.keys());
+    }
     getProjectSessions(projectPath) {
         const manager = this.projectManagers.get(projectPath);
         if (manager) {

package/dist/services/projectManager.d.ts

@@ -32,9 +32,15 @@ export declare class ProjectManager implements IProjectManager {
      */
     private discoverDirectories;
     /**
-     * Quick check for .git directory without running git commands
+     * Quick check for .git presence (directory or file) without running git commands.
+     * Returns true for both main repositories and worktrees.
      */
     private hasGitDirectory;
+    /**
+     * Check if a directory is a main git repository (not a worktree).
+     * Main repositories have .git as a directory; worktrees have .git as a file.
+     */
+    private isMainGitRepository;
     /**
      * Process directories in parallel using worker pool pattern
      */