ccmanager 3.12.6 → 4.0.0

package/dist/utils/worktreeUtils.js

@@ -102,60 +102,126 @@ export function extractBranchParts(branchName) {
     return { name: branchName };
 }
 /**
- * Prepares worktree content for display with plain and colored versions.
+ * One pass over sessions: group by worktree path and track latest lastAccessedAt per path.
  */
-export function prepareWorktreeItems(worktrees, sessions) {
-    return worktrees.map(wt => {
-        const session = sessions.find(s => s.worktreePath === wt.path);
-        const stateData = session?.stateMutex.getSnapshot();
-        const status = stateData
-            ? ` [${getStatusDisplay(stateData.state, stateData.backgroundTaskCount, stateData.teamMemberCount)}]`
-            : '';
-        const fullBranchName = wt.branch
-            ? wt.branch.replace('refs/heads/', '')
-            : 'detached';
-        const branchName = truncateString(fullBranchName, MAX_BRANCH_NAME_LENGTH);
-        const isMain = wt.isMainWorktree ? ' (main)' : '';
-        const baseLabel = `${branchName}${isMain}${status}`;
-        let fileChanges = '';
-        let aheadBehind = '';
-        let parentBranch = '';
-        let error = '';
-        if (wt.gitStatus) {
-            fileChanges = formatGitFileChanges(wt.gitStatus);
-            aheadBehind = formatGitAheadBehind(wt.gitStatus);
-            parentBranch = formatParentBranch(wt.gitStatus.parentBranch, fullBranchName);
+function indexSessionsByWorktree(sessions) {
+    const byWorktreePath = new Map();
+    const maxAccessAt = new Map();
+    for (const s of sessions) {
+        const path = s.worktreePath;
+        let list = byWorktreePath.get(path);
+        if (!list) {
+            list = [];
+            byWorktreePath.set(path, list);
         }
-        else if (wt.gitStatusError) {
-            // Format error in red
-            error = `\x1b[31m[git error]\x1b[0m`;
+        list.push(s);
+        const prevMax = maxAccessAt.get(path) ?? 0;
+        if (s.lastAccessedAt > prevMax) {
+            maxAccessAt.set(path, s.lastAccessedAt);
         }
-        else {
-            // Show fetching status in dim gray
-            fileChanges = '\x1b[90m[fetching...]\x1b[0m';
-        }
-        // Format last commit date as dim relative time
-        const lastCommitDate = wt.lastCommitDate
-            ? `\x1b[90m${formatRelativeDate(wt.lastCommitDate)}\x1b[0m`
-            : '';
+    }
+    return { byWorktreePath, maxAccessAt };
+}
+function displaySuffix(session, multipleForWorktree) {
+    if (multipleForWorktree) {
+        return session.sessionName
+            ? `: ${session.sessionName}`
+            : ` #${session.sessionNumber}`;
+    }
+    return session.sessionName ? `: ${session.sessionName}` : '';
+}
+function gitStatusColumns(wt, fullBranchName) {
+    if (wt.gitStatus) {
         return {
-            worktree: wt,
-            session,
-            baseLabel,
-            fileChanges,
-            aheadBehind,
-            parentBranch,
-            lastCommitDate,
-            error,
-            lengths: {
-                base: stripAnsi(baseLabel).length,
-                fileChanges: stripAnsi(fileChanges).length,
-                aheadBehind: stripAnsi(aheadBehind).length,
-                parentBranch: stripAnsi(parentBranch).length,
-                lastCommitDate: stripAnsi(lastCommitDate).length,
-            },
+            fileChanges: formatGitFileChanges(wt.gitStatus),
+            aheadBehind: formatGitAheadBehind(wt.gitStatus),
+            parentBranch: formatParentBranch(wt.gitStatus.parentBranch, fullBranchName),
         };
-    });
+    }
+    if (wt.gitStatusError) {
+        return {
+            fileChanges: '',
+            aheadBehind: '',
+            parentBranch: '',
+            error: `\x1b[31m[git error]\x1b[0m`,
+        };
+    }
+    return {
+        fileChanges: '\x1b[90m[fetching...]\x1b[0m',
+        aheadBehind: '',
+        parentBranch: '',
+    };
+}
+/**
+ * Build a single SessionItem row for display.
+ */
+function buildSessionItem(wt, session, sessionSuffix) {
+    const stateData = session?.stateMutex.getSnapshot();
+    const status = stateData
+        ? ` [${getStatusDisplay(stateData.state, stateData.backgroundTaskCount, stateData.teamMemberCount)}]`
+        : '';
+    const fullBranchName = wt.branch
+        ? wt.branch.replace('refs/heads/', '')
+        : 'detached';
+    const branchName = truncateString(fullBranchName, MAX_BRANCH_NAME_LENGTH);
+    const isMain = wt.isMainWorktree ? ' (main)' : '';
+    const baseLabel = `${branchName}${isMain}${sessionSuffix}${status}`;
+    const { fileChanges, aheadBehind, parentBranch, error } = gitStatusColumns(wt, fullBranchName);
+    const lastCommitDate = wt.lastCommitDate
+        ? `\x1b[90m${formatRelativeDate(wt.lastCommitDate)}\x1b[0m`
+        : '';
+    return {
+        worktree: wt,
+        session,
+        baseLabel,
+        fileChanges,
+        aheadBehind,
+        parentBranch,
+        lastCommitDate,
+        error,
+        lengths: {
+            base: stripAnsi(baseLabel).length,
+            fileChanges: stripAnsi(fileChanges).length,
+            aheadBehind: stripAnsi(aheadBehind).length,
+            parentBranch: stripAnsi(parentBranch).length,
+            lastCommitDate: stripAnsi(lastCommitDate).length,
+        },
+    };
+}
+/**
+ * Prepares session items for display.
+ * Supports multiple sessions per worktree.
+ * When sortByLastSession is true, worktrees are sorted by the most recent
+ * session lastAccessedAt timestamp (descending), and sessions within each
+ * worktree are also sorted by lastAccessedAt.
+ */
+export function prepareSessionItems(worktrees, sessions, options) {
+    const { byWorktreePath, maxAccessAt } = indexSessionsByWorktree(sessions);
+    const items = [];
+    const orderedWorktrees = options?.sortByLastSession && sessions.length > 0
+        ? [...worktrees].sort((a, b) => {
+            const timeA = maxAccessAt.get(a.path);
+            const timeB = maxAccessAt.get(b.path);
+            if (timeA === undefined && timeB === undefined)
+                return 0;
+            return (timeB ?? 0) - (timeA ?? 0);
+        })
+        : worktrees;
+    for (const wt of orderedWorktrees) {
+        const wtSessions = byWorktreePath.get(wt.path) ?? [];
+        if (wtSessions.length === 0) {
+            items.push(buildSessionItem(wt, undefined, ''));
+            continue;
+        }
+        const ordered = wtSessions.length > 1
+            ? [...wtSessions].sort((a, b) => b.lastAccessedAt - a.lastAccessedAt)
+            : wtSessions;
+        const multiple = ordered.length > 1;
+        for (const session of ordered) {
+            items.push(buildSessionItem(wt, session, displaySuffix(session, multiple)));
+        }
+    }
+    return items;
 }
 /**
  * Calculates column positions based on content widths.
@@ -194,7 +260,7 @@ function padTo(str, visibleLength, column) {
 /**
  * Assembles the final worktree label with proper column alignment
  */
-export function assembleWorktreeLabel(item, columns) {
+export function assembleSessionLabel(item, columns) {
     // If there's an error, just show the base label with error appended
     if (item.error) {
         return `${item.baseLabel} ${item.error}`;

package/dist/utils/worktreeUtils.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { generateWorktreeDirectory, extractBranchParts, truncateString, prepareWorktreeItems, calculateColumnPositions, assembleWorktreeLabel, } from './worktreeUtils.js';
+import { generateWorktreeDirectory, extractBranchParts, truncateString, prepareSessionItems, calculateColumnPositions, assembleSessionLabel, } from './worktreeUtils.js';
 import { execSync } from 'child_process';
 import { Mutex, createInitialSessionStateData } from './mutex.js';
 import { createStateDetector } from '../services/stateDetector/index.js';
@@ -112,7 +112,7 @@ describe('truncateString', () => {
         expect(truncateString('abcd', 3)).toBe('...');
     });
 });
-describe('prepareWorktreeItems', () => {
+describe('prepareSessionItems', () => {
     const mockWorktree = {
         path: '/path/to/worktree',
         branch: 'feature/test-branch',
@@ -123,6 +123,8 @@ describe('prepareWorktreeItems', () => {
     const mockSession = {
         id: 'test-session',
         worktreePath: '/path/to/worktree',
+        sessionNumber: 1,
+        lastAccessedAt: Date.now(),
         process: {},
         output: [],
         outputHistory: [],
@@ -140,17 +142,17 @@ describe('prepareWorktreeItems', () => {
         stateDetector: createStateDetector('claude'),
     };
     it('should prepare basic worktree without git status', () => {
-        const items = prepareWorktreeItems([mockWorktree], []);
+        const items = prepareSessionItems([mockWorktree], []);
         expect(items).toHaveLength(1);
         expect(items[0]?.baseLabel).toBe('feature/test-branch');
     });
     it('should include session status in label', () => {
-        const items = prepareWorktreeItems([mockWorktree], [mockSession]);
+        const items = prepareSessionItems([mockWorktree], [mockSession]);
         expect(items[0]?.baseLabel).toContain('[○ Idle]');
     });
     it('should mark main worktree', () => {
         const mainWorktree = { ...mockWorktree, isMainWorktree: true };
-        const items = prepareWorktreeItems([mainWorktree], []);
+        const items = prepareSessionItems([mainWorktree], []);
         expect(items[0]?.baseLabel).toContain('(main)');
     });
     it('should truncate long branch names', () => {
@@ -158,7 +160,7 @@ describe('prepareWorktreeItems', () => {
             ...mockWorktree,
             branch: 'feature/this-is-a-very-long-branch-name-that-should-be-truncated',
         };
-        const items = prepareWorktreeItems([longBranch], []);
+        const items = prepareSessionItems([longBranch], []);
         expect(items[0]?.baseLabel.length).toBeLessThanOrEqual(80); // 70 + status + default
     });
 });
@@ -204,7 +206,7 @@ describe('column alignment', () => {
     it('should assemble label with proper alignment', () => {
         const item = mockItems[0];
         const columns = calculateColumnPositions(mockItems);
-        const result = assembleWorktreeLabel(item, columns);
+        const result = assembleSessionLabel(item, columns);
         expect(result).toContain('feature/test-branch');
         expect(result).toContain('\x1b[32m+10\x1b[0m');
         expect(result).toContain('\x1b[33m↑2 ↓3\x1b[0m');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "3.12.6",
+	"version": "4.0.0",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",
@@ -41,11 +41,11 @@
 		"bin"
 	],
 	"optionalDependencies": {
-		"@kodaikabasawa/ccmanager-darwin-arm64": "3.12.6",
-		"@kodaikabasawa/ccmanager-darwin-x64": "3.12.6",
-		"@kodaikabasawa/ccmanager-linux-arm64": "3.12.6",
-		"@kodaikabasawa/ccmanager-linux-x64": "3.12.6",
-		"@kodaikabasawa/ccmanager-win32-x64": "3.12.6"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "4.0.0",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.0.0",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.0.0",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.0.0",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.0.0"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",