ccmanager 3.4.0 → 3.5.1

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/stateDetector/base.d.ts

@@ -4,5 +4,5 @@ export declare abstract class BaseStateDetector implements StateDetector {
     abstract detectState(terminal: Terminal, currentState: SessionState): SessionState;
     protected getTerminalLines(terminal: Terminal, maxLines?: number): string[];
     protected getTerminalContent(terminal: Terminal, maxLines?: number): string;
-    abstract detectBackgroundTask(terminal: Terminal): boolean;
+    abstract detectBackgroundTask(terminal: Terminal): number;
 }

package/dist/services/stateDetector/claude.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class ClaudeStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, currentState: SessionState): SessionState;
-    detectBackgroundTask(terminal: Terminal): boolean;
+    detectBackgroundTask(terminal: Terminal): number;
 }

package/dist/services/stateDetector/claude.js

@@ -27,9 +27,16 @@ export class ClaudeStateDetector extends BaseStateDetector {
     detectBackgroundTask(terminal) {
         const lines = this.getTerminalLines(terminal, 3);
         const content = lines.join('\n').toLowerCase();
-        // Detect background task patterns:
-        // - "N background task(s)" in status bar
-        // - "(running)" in status bar for active background commands
-        return content.includes('background task') || content.includes('(running)');
+        // Check for "N background task(s)" pattern first (content already lowercased)
+        const countMatch = content.match(/(\d+)\s+background\s+task/);
+        if (countMatch?.[1]) {
+            return parseInt(countMatch[1], 10);
+        }
+        // Check for "(running)" pattern - indicates at least 1 background task
+        if (content.includes('(running)')) {
+            return 1;
+        }
+        // No background task detected
+        return 0;
     }
 }

package/dist/services/stateDetector/claude.test.js

@@ -223,7 +223,7 @@ describe('ClaudeStateDetector', () => {
         });
     });
     describe('detectBackgroundTask', () => {
-        it('should detect background task when pattern is in last 3 lines (status bar)', () => {
+        it('should return count 1 when "1 background task" is in status bar', () => {
             // Arrange
             terminal = createMockTerminal([
                 'Previous conversation content',
@@ -232,11 +232,11 @@ describe('ClaudeStateDetector', () => {
                 '1 background task | api-call',
             ]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(true);
+            expect(count).toBe(1);
         });
-        it('should detect background task with plural "background tasks"', () => {
+        it('should return count 2 when "2 background tasks" is in status bar', () => {
             // Arrange
             terminal = createMockTerminal([
                 'Some output',
@@ -244,11 +244,23 @@ describe('ClaudeStateDetector', () => {
                 '2 background tasks running',
             ]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(true);
+            expect(count).toBe(2);
         });
-        it('should detect background task case-insensitively', () => {
+        it('should return count 3 when "3 background tasks" is in status bar', () => {
+            // Arrange
+            terminal = createMockTerminal([
+                'Some output',
+                'More output',
+                '3 background tasks | build, test, lint',
+            ]);
+            // Act
+            const count = detector.detectBackgroundTask(terminal);
+            // Assert
+            expect(count).toBe(3);
+        });
+        it('should detect background task count case-insensitively', () => {
             // Arrange
             terminal = createMockTerminal([
                 'Output line 1',
@@ -256,11 +268,11 @@ describe('ClaudeStateDetector', () => {
                 '1 BACKGROUND TASK running',
             ]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(true);
+            expect(count).toBe(1);
         });
-        it('should return false when no background task pattern in last 3 lines', () => {
+        it('should return 0 when no background task pattern in last 3 lines', () => {
             // Arrange
             terminal = createMockTerminal([
                 'Command completed successfully',
@@ -268,9 +280,9 @@ describe('ClaudeStateDetector', () => {
                 '> ',
             ]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(false);
+            expect(count).toBe(0);
         });
         it('should not detect background task when pattern is in conversation content (not status bar)', () => {
             // Arrange - "background task" mentioned earlier in conversation, but not in last 3 lines
@@ -283,27 +295,27 @@ describe('ClaudeStateDetector', () => {
                 'Ready',
             ]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert - should only check last 3 lines, not the conversation content
-            expect(hasBackgroundTask).toBe(false);
+            expect(count).toBe(0);
         });
-        it('should handle empty terminal', () => {
+        it('should return 0 for empty terminal', () => {
             // Arrange
             terminal = createMockTerminal([]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(false);
+            expect(count).toBe(0);
         });
         it('should handle terminal with fewer than 3 lines', () => {
             // Arrange
             terminal = createMockTerminal(['1 background task']);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(true);
+            expect(count).toBe(1);
         });
-        it('should detect "(running)" status bar indicator', () => {
+        it('should return 1 when "(running)" status bar indicator is present', () => {
             // Arrange
             terminal = createMockTerminal([
                 'Some conversation output',
@@ -311,17 +323,28 @@ describe('ClaudeStateDetector', () => {
                 'bypass permissions on - uv run pytest tests/integration/e2e/tes... (running)',
             ]);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(true);
+            expect(count).toBe(1);
         });
         it('should detect "(running)" case-insensitively', () => {
             // Arrange
             terminal = createMockTerminal(['Some output', 'command name (RUNNING)']);
             // Act
-            const hasBackgroundTask = detector.detectBackgroundTask(terminal);
+            const count = detector.detectBackgroundTask(terminal);
+            // Assert
+            expect(count).toBe(1);
+        });
+        it('should prioritize count from "N background task" over "(running)"', () => {
+            // Arrange - both patterns present, count should be from explicit pattern
+            terminal = createMockTerminal([
+                'Some output',
+                '3 background tasks | task1, task2 (running)',
+            ]);
+            // Act
+            const count = detector.detectBackgroundTask(terminal);
             // Assert
-            expect(hasBackgroundTask).toBe(true);
+            expect(count).toBe(3);
         });
     });
 });

package/dist/services/stateDetector/cline.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class ClineStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, _currentState: SessionState): SessionState;
-    detectBackgroundTask(_terminal: Terminal): boolean;
+    detectBackgroundTask(_terminal: Terminal): number;
 }

package/dist/services/stateDetector/cline.js

@@ -22,6 +22,6 @@ export class ClineStateDetector extends BaseStateDetector {
         return 'busy';
     }
     detectBackgroundTask(_terminal) {
-        return false;
+        return 0;
     }
 }

package/dist/services/stateDetector/codex.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class CodexStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, _currentState: SessionState): SessionState;
-    detectBackgroundTask(_terminal: Terminal): boolean;
+    detectBackgroundTask(_terminal: Terminal): number;
 }

package/dist/services/stateDetector/codex.js

@@ -25,6 +25,6 @@ export class CodexStateDetector extends BaseStateDetector {
         return 'idle';
     }
     detectBackgroundTask(_terminal) {
-        return false;
+        return 0;
     }
 }

package/dist/services/stateDetector/cursor.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class CursorStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, _currentState: SessionState): SessionState;
-    detectBackgroundTask(_terminal: Terminal): boolean;
+    detectBackgroundTask(_terminal: Terminal): number;
 }

package/dist/services/stateDetector/cursor.js

@@ -17,6 +17,6 @@ export class CursorStateDetector extends BaseStateDetector {
         return 'idle';
     }
     detectBackgroundTask(_terminal) {
-        return false;
+        return 0;
     }
 }

package/dist/services/stateDetector/gemini.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class GeminiStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, _currentState: SessionState): SessionState;
-    detectBackgroundTask(_terminal: Terminal): boolean;
+    detectBackgroundTask(_terminal: Terminal): number;
 }

package/dist/services/stateDetector/gemini.js

@@ -26,6 +26,6 @@ export class GeminiStateDetector extends BaseStateDetector {
         return 'idle';
     }
     detectBackgroundTask(_terminal) {
-        return false;
+        return 0;
     }
 }

package/dist/services/stateDetector/github-copilot.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class GitHubCopilotStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, _currentState: SessionState): SessionState;
-    detectBackgroundTask(_terminal: Terminal): boolean;
+    detectBackgroundTask(_terminal: Terminal): number;
 }

package/dist/services/stateDetector/github-copilot.js

@@ -19,6 +19,6 @@ export class GitHubCopilotStateDetector extends BaseStateDetector {
         return 'idle';
     }
     detectBackgroundTask(_terminal) {
-        return false;
+        return 0;
     }
 }

package/dist/services/stateDetector/opencode.d.ts

@@ -2,5 +2,5 @@ import { SessionState, Terminal } from '../../types/index.js';
 import { BaseStateDetector } from './base.js';
 export declare class OpenCodeStateDetector extends BaseStateDetector {
     detectState(terminal: Terminal, _currentState: SessionState): SessionState;
-    detectBackgroundTask(_terminal: Terminal): boolean;
+    detectBackgroundTask(_terminal: Terminal): number;
 }

package/dist/services/stateDetector/opencode.js

@@ -15,6 +15,6 @@ export class OpenCodeStateDetector extends BaseStateDetector {
         return 'idle';
     }
     detectBackgroundTask(_terminal) {
-        return false;
+        return 0;
     }
 }

package/dist/services/stateDetector/types.d.ts

@@ -1,5 +1,5 @@
 import { SessionState, Terminal } from '../../types/index.js';
 export interface StateDetector {
     detectState(terminal: Terminal, currentState: SessionState): SessionState;
-    detectBackgroundTask(terminal: Terminal): boolean;
+    detectBackgroundTask(terminal: Terminal): number;
 }

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 = {