ccmanager 3.4.0 → 3.5.0

package/dist/services/sessionManager.statePersistence.test.js

@@ -1,4 +1,5 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { Either } from 'effect';
 import { SessionManager } from './sessionManager.js';
 import { spawn } from './bunTerminal.js';
 import { EventEmitter } from 'events';
@@ -8,8 +9,8 @@ vi.mock('./bunTerminal.js', () => ({
         return null;
     }),
 }));
-vi.mock('./configurationManager.js', () => ({
-    configurationManager: {
+vi.mock('./config/configReader.js', () => ({
+    configReader: {
         getConfig: vi.fn().mockReturnValue({
             commands: [
                 {
@@ -21,12 +22,12 @@ vi.mock('./configurationManager.js', () => ({
             ],
             defaultCommandId: 'test',
         }),
-        getPresetById: vi.fn().mockReturnValue({
+        getPresetByIdEffect: vi.fn().mockReturnValue(Either.right({
             id: 'test',
             name: 'Test',
             command: 'test',
             args: [],
-        }),
+        })),
         getDefaultPreset: vi.fn().mockReturnValue({
             id: 'test',
             name: 'Test',

package/dist/services/sessionManager.test.js

@@ -1,5 +1,6 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { Effect } from 'effect';
+import { Effect, Either } from 'effect';
+import { ValidationError } from '../types/errors.js';
 import { spawn } from './bunTerminal.js';
 import { EventEmitter } from 'events';
 import { exec } from 'child_process';
@@ -19,12 +20,11 @@ vi.mock('child_process', () => ({
     }),
 }));
 // Mock configuration manager
-vi.mock('./configurationManager.js', () => ({
-    configurationManager: {
-        getCommandConfig: vi.fn(),
+vi.mock('./config/configReader.js', () => ({
+    configReader: {
         getStatusHooks: vi.fn(() => ({})),
         getDefaultPreset: vi.fn(),
-        getPresetById: vi.fn(),
+        getPresetByIdEffect: vi.fn(),
         setWorktreeLastOpened: vi.fn(),
         getWorktreeLastOpenedTime: vi.fn(),
         getWorktreeLastOpened: vi.fn(() => ({})),
@@ -57,6 +57,9 @@ vi.mock('./worktreeService.js', () => ({
     WorktreeService: vi.fn(function () {
         return {};
     }),
+    setWorktreeLastOpened: vi.fn(),
+    getWorktreeLastOpened: vi.fn(() => ({})),
+    getWorktreeLastOpenedTime: vi.fn(),
 }));
 // Create a mock IPty class
 class MockPty extends EventEmitter {
@@ -102,14 +105,14 @@ describe('SessionManager', () => {
     let sessionManager;
     let mockPty;
     let SessionManager;
-    let configurationManager;
+    let configReader;
     beforeEach(async () => {
         vi.clearAllMocks();
         // Dynamically import after mocks are set up
         const sessionManagerModule = await import('./sessionManager.js');
-        const configManagerModule = await import('./configurationManager.js');
+        const configManagerModule = await import('./config/configReader.js');
         SessionManager = sessionManagerModule.SessionManager;
-        configurationManager = configManagerModule.configurationManager;
+        configReader = configManagerModule.configReader;
         sessionManager = new SessionManager();
         mockPty = new MockPty();
     });
@@ -119,7 +122,7 @@ describe('SessionManager', () => {
     describe('createSessionWithPresetEffect', () => {
         it('should use default preset when no preset ID specified', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -140,19 +143,19 @@ describe('SessionManager', () => {
         });
         it('should use specific preset when ID provided', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getPresetById).mockReturnValue({
+            vi.mocked(configReader.getPresetByIdEffect).mockReturnValue(Either.right({
                 id: '2',
                 name: 'Development',
                 command: 'claude',
                 args: ['--resume', '--dev'],
                 fallbackArgs: ['--no-mcp'],
-            });
+            }));
             // Setup spawn mock
             vi.mocked(spawn).mockReturnValue(mockPty);
             // Create session with specific preset
             await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree', '2'));
-            // Verify getPresetById was called with correct ID
-            expect(configurationManager.getPresetById).toHaveBeenCalledWith('2');
+            // Verify getPresetByIdEffect was called with correct ID
+            expect(configReader.getPresetByIdEffect).toHaveBeenCalledWith('2');
             // Verify spawn was called with preset config
             expect(spawn).toHaveBeenCalledWith('claude', ['--resume', '--dev'], {
                 name: 'xterm-256color',
@@ -164,8 +167,12 @@ describe('SessionManager', () => {
         });
         it('should fall back to default preset if specified preset not found', async () => {
             // Setup mocks
-            vi.mocked(configurationManager.getPresetById).mockReturnValue(undefined);
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getPresetByIdEffect).mockReturnValue(Either.left(new ValidationError({
+                field: 'presetId',
+                constraint: 'Preset not found',
+                receivedValue: 'invalid',
+            })));
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -175,12 +182,12 @@ describe('SessionManager', () => {
             // Create session with non-existent preset
             await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree', 'invalid'));
             // Verify fallback to default preset
-            expect(configurationManager.getDefaultPreset).toHaveBeenCalled();
+            expect(configReader.getDefaultPreset).toHaveBeenCalled();
             expect(spawn).toHaveBeenCalledWith('claude', [], expect.any(Object));
         });
         it('should throw error when spawn fails with preset', async () => {
             // Setup mock preset with fallback
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -199,7 +206,7 @@ describe('SessionManager', () => {
         });
         it('should return existing session if already created', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -216,7 +223,7 @@ describe('SessionManager', () => {
         });
         it('should throw error when spawn fails with fallback args', async () => {
             // Setup mock preset with fallback
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'nonexistent-command',
@@ -230,14 +237,13 @@ describe('SessionManager', () => {
             // Expect createSessionWithPresetEffect to throw the original error
             await expect(Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'))).rejects.toThrow('Command not found');
         });
-        it('should use fallback args when main command exits with code 1', async () => {
-            // Setup mock preset with fallback
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+        it('should fallback to default command when main command exits with code 1', async () => {
+            // Setup mock preset with args
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
                 args: ['--invalid-flag'],
-                fallbackArgs: ['--resume'],
             });
             // First spawn attempt - will exit with code 1
             const firstMockPty = new MockPty();
@@ -255,16 +261,16 @@ describe('SessionManager', () => {
             firstMockPty.emit('exit', { exitCode: 1 });
             // Wait for fallback to occur
             await new Promise(resolve => setTimeout(resolve, 50));
-            // Verify fallback spawn was called
+            // Verify fallback spawn was called (with no args since commandConfig was removed)
             expect(spawn).toHaveBeenCalledTimes(2);
-            expect(spawn).toHaveBeenNthCalledWith(2, 'claude', ['--resume'], expect.objectContaining({ cwd: '/test/worktree' }));
+            expect(spawn).toHaveBeenNthCalledWith(2, 'claude', [], expect.objectContaining({ cwd: '/test/worktree' }));
             // Verify session process was replaced
             expect(session.process).toBe(secondMockPty);
             expect(session.isPrimaryCommand).toBe(false);
         });
         it('should not use fallback if main command succeeds', async () => {
             // Setup mock preset with fallback
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -283,7 +289,7 @@ describe('SessionManager', () => {
         });
         it('should use empty args as fallback when no fallback args specified', async () => {
             // Setup mock preset without fallback args
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -316,7 +322,7 @@ describe('SessionManager', () => {
         });
         it('should handle custom command configuration', async () => {
             // Setup mock preset with custom command
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'my-custom-claude',
@@ -333,7 +339,7 @@ describe('SessionManager', () => {
         });
         it('should throw error when spawn fails and no fallback configured', async () => {
             // Setup mock preset without fallback
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -350,7 +356,7 @@ describe('SessionManager', () => {
     describe('session lifecycle', () => {
         it('should destroy session and clean up resources', async () => {
             // Setup
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -365,7 +371,7 @@ describe('SessionManager', () => {
         });
         it('should handle session exit event', async () => {
             // Setup
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -411,7 +417,7 @@ describe('SessionManager', () => {
         });
         it('should execute devcontainer up command before creating session', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -431,12 +437,12 @@ describe('SessionManager', () => {
         });
         it('should use specific preset when ID provided', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getPresetById).mockReturnValue({
+            vi.mocked(configReader.getPresetByIdEffect).mockReturnValue(Either.right({
                 id: '2',
                 name: 'Development',
                 command: 'claude',
                 args: ['--resume', '--dev'],
-            });
+            }));
             // Setup spawn mock
             vi.mocked(spawn).mockReturnValue(mockPty);
             // Create session with devcontainer and specific preset
@@ -446,7 +452,7 @@ describe('SessionManager', () => {
             };
             await Effect.runPromise(sessionManager.createSessionWithDevcontainerEffect('/test/worktree', devcontainerConfig, '2'));
             // Verify correct preset was used
-            expect(configurationManager.getPresetById).toHaveBeenCalledWith('2');
+            expect(configReader.getPresetByIdEffect).toHaveBeenCalledWith('2');
             expect(spawn).toHaveBeenCalledWith('devcontainer', ['exec', '--', 'claude', '--resume', '--dev'], expect.any(Object));
         });
         it('should throw error when devcontainer up fails', async () => {
@@ -462,7 +468,7 @@ describe('SessionManager', () => {
         });
         it('should return existing session if already created', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -483,7 +489,7 @@ describe('SessionManager', () => {
         });
         it('should handle complex exec commands with multiple arguments', async () => {
             // Setup mock preset
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -514,7 +520,7 @@ describe('SessionManager', () => {
             // Create a new session manager and reset mocks
             vi.clearAllMocks();
             sessionManager = new SessionManager();
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -605,12 +611,12 @@ describe('SessionManager', () => {
                 }
                 return {};
             });
-            vi.mocked(configurationManager.getPresetById).mockReturnValue({
+            vi.mocked(configReader.getPresetByIdEffect).mockReturnValue(Either.right({
                 id: 'claude-with-args',
                 name: 'Claude with Args',
                 command: 'claude',
                 args: ['-m', 'claude-3-opus'],
-            });
+            }));
             await Effect.runPromise(sessionManager.createSessionWithDevcontainerEffect('/test/worktree', {
                 upCommand: 'devcontainer up --workspace-folder .',
                 execCommand: 'devcontainer exec --workspace-folder .',
@@ -638,7 +644,7 @@ describe('SessionManager', () => {
                 return {};
             });
             // Setup preset without fallback args
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
@@ -671,7 +677,7 @@ describe('SessionManager', () => {
             expect(session.process).toBe(secondMockPty);
             expect(session.isPrimaryCommand).toBe(false);
         });
-        it('should use fallback args in devcontainer when primary command exits with code 1', async () => {
+        it('should fallback to default command in devcontainer when primary command exits with code 1', async () => {
             const mockExec = vi.mocked(exec);
             mockExec.mockImplementation((cmd, options, callback) => {
                 if (typeof options === 'function') {
@@ -683,13 +689,12 @@ describe('SessionManager', () => {
                 }
                 return {};
             });
-            // Setup preset with fallback
-            vi.mocked(configurationManager.getDefaultPreset).mockReturnValue({
+            // Setup preset with args
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
                 args: ['--bad-flag'],
-                fallbackArgs: ['--good-flag'],
             });
             // First spawn attempt - will exit with code 1
             const firstMockPty = new MockPty();
@@ -709,9 +714,9 @@ describe('SessionManager', () => {
             firstMockPty.emit('exit', { exitCode: 1 });
             // Wait for fallback to occur
             await new Promise(resolve => setTimeout(resolve, 50));
-            // Verify fallback spawn was called
+            // Verify fallback spawn was called (with no args since commandConfig was removed)
             expect(spawn).toHaveBeenCalledTimes(2);
-            expect(spawn).toHaveBeenNthCalledWith(2, 'devcontainer', ['exec', '--workspace-folder', '.', '--', 'claude', '--good-flag'], expect.objectContaining({ cwd: '/test/worktree' }));
+            expect(spawn).toHaveBeenNthCalledWith(2, 'devcontainer', ['exec', '--workspace-folder', '.', '--', 'claude'], expect.objectContaining({ cwd: '/test/worktree' }));
             // Verify session process was replaced
             expect(session.process).toBe(secondMockPty);
             expect(session.isPrimaryCommand).toBe(false);

package/dist/services/shortcutManager.d.ts

@@ -5,7 +5,6 @@ export declare class ShortcutManager {
     constructor();
     private validateShortcut;
     private isReservedKey;
-    saveShortcuts(shortcuts: ShortcutConfig): boolean;
     getShortcuts(): ShortcutConfig;
     private getRawShortcutCodes;
     matchesShortcut(shortcutName: keyof ShortcutConfig, input: string, key: Key): boolean;

package/dist/services/shortcutManager.js

@@ -1,4 +1,4 @@
-import { configurationManager } from './configurationManager.js';
+import { configReader } from './config/configReader.js';
 export class ShortcutManager {
     constructor() {
         Object.defineProperty(this, "reservedKeys", {
@@ -46,19 +46,8 @@ export class ShortcutManager {
             reserved.alt === shortcut.alt &&
             reserved.shift === shortcut.shift);
     }
-    saveShortcuts(shortcuts) {
-        // Validate all shortcuts
-        const currentShortcuts = configurationManager.getShortcuts();
-        const validated = {
-            returnToMenu: this.validateShortcut(shortcuts.returnToMenu) ||
-                currentShortcuts.returnToMenu,
-            cancel: this.validateShortcut(shortcuts.cancel) || currentShortcuts.cancel,
-        };
-        configurationManager.setShortcuts(validated);
-        return true;
-    }
     getShortcuts() {
-        return configurationManager.getShortcuts();
+        return configReader.getShortcuts();
     }
     getRawShortcutCodes(shortcut) {
         const codes = new Set();
@@ -106,7 +95,7 @@ export class ShortcutManager {
         return Array.from(codes);
     }
     matchesShortcut(shortcutName, input, key) {
-        const shortcuts = configurationManager.getShortcuts();
+        const shortcuts = configReader.getShortcuts();
         const shortcut = shortcuts[shortcutName];
         if (!shortcut)
             return false;
@@ -125,7 +114,7 @@ export class ShortcutManager {
         return input.toLowerCase() === shortcut.key.toLowerCase();
     }
     getShortcutDisplay(shortcutName) {
-        const shortcuts = configurationManager.getShortcuts();
+        const shortcuts = configReader.getShortcuts();
         const shortcut = shortcuts[shortcutName];
         if (!shortcut)
             return '';
@@ -161,7 +150,7 @@ export class ShortcutManager {
         return null;
     }
     matchesRawInput(shortcutName, input) {
-        const shortcuts = configurationManager.getShortcuts();
+        const shortcuts = configReader.getShortcuts();
         const shortcut = shortcuts[shortcutName];
         if (!shortcut)
             return false;

package/dist/services/shortcutManager.test.js

@@ -1,13 +1,13 @@
 import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
 import { shortcutManager } from './shortcutManager.js';
-import { configurationManager } from './configurationManager.js';
+import { configReader } from './config/configReader.js';
 describe('shortcutManager.matchesRawInput', () => {
     const shortcuts = {
         returnToMenu: { ctrl: true, key: 'e', alt: false, shift: false },
         cancel: { ctrl: true, key: 'c', alt: false, shift: false },
     };
     beforeEach(() => {
-        vi.spyOn(configurationManager, 'getShortcuts').mockReturnValue(shortcuts);
+        vi.spyOn(configReader, 'getShortcuts').mockReturnValue(shortcuts);
     });
     afterEach(() => {
         vi.restoreAllMocks();

package/dist/services/worktreeService.d.ts

@@ -1,6 +1,18 @@
 import { Effect } from 'effect';
 import { Worktree } from '../types/index.js';
 import { GitError, FileSystemError } from '../types/errors.js';
+/**
+ * Get all worktree last opened timestamps
+ */
+export declare function getWorktreeLastOpened(): Record<string, number>;
+/**
+ * Set the last opened timestamp for a worktree
+ */
+export declare function setWorktreeLastOpened(worktreePath: string, timestamp: number): void;
+/**
+ * Get the last opened timestamp for a specific worktree
+ */
+export declare function getWorktreeLastOpenedTime(worktreePath: string): number | undefined;
 /**
  * WorktreeService - Git worktree management with Effect-based error handling
  *

package/dist/services/worktreeService.js

@@ -7,8 +7,28 @@ import { GitError, FileSystemError } from '../types/errors.js';
 import { setWorktreeParentBranch } from '../utils/worktreeConfig.js';
 import { getClaudeProjectsDir, pathToClaudeProjectName, } from '../utils/claudeDir.js';
 import { executeWorktreePostCreationHook } from '../utils/hookExecutor.js';
-import { configurationManager } from './configurationManager.js';
+import { configReader } from './config/configReader.js';
 const CLAUDE_DIR = '.claude';
+// Module-level state for worktree last opened tracking (runtime state, not persisted)
+const worktreeLastOpened = new Map();
+/**
+ * Get all worktree last opened timestamps
+ */
+export function getWorktreeLastOpened() {
+    return Object.fromEntries(worktreeLastOpened);
+}
+/**
+ * Set the last opened timestamp for a worktree
+ */
+export function setWorktreeLastOpened(worktreePath, timestamp) {
+    worktreeLastOpened.set(worktreePath, timestamp);
+}
+/**
+ * Get the last opened timestamp for a specific worktree
+ */
+export function getWorktreeLastOpenedTime(worktreePath) {
+    return worktreeLastOpened.get(worktreePath);
+}
 /**
  * WorktreeService - Git worktree management with Effect-based error handling
  *
@@ -641,8 +661,8 @@ export class WorktreeService {
                 if (sortByLastSession) {
                     worktrees.sort((a, b) => {
                         // Get last opened timestamps for both worktrees
-                        const timeA = configurationManager.getWorktreeLastOpenedTime(a.path);
-                        const timeB = configurationManager.getWorktreeLastOpenedTime(b.path);
+                        const timeA = getWorktreeLastOpenedTime(a.path);
+                        const timeB = getWorktreeLastOpenedTime(b.path);
                         // If both timestamps are undefined, preserve original order
                         if (timeA === undefined && timeB === undefined) {
                             return 0;
@@ -804,7 +824,7 @@ export class WorktreeService {
                 });
             }
             // Execute post-creation hook if configured
-            const worktreeHooks = configurationManager.getWorktreeHooks();
+            const worktreeHooks = configReader.getWorktreeHooks();
             if (worktreeHooks.post_creation?.enabled &&
                 worktreeHooks.post_creation?.command) {
                 const newWorktree = {