ccmanager 4.1.20 → 4.1.21

package/dist/components/Dashboard.js

@@ -245,6 +245,7 @@ const Dashboard = ({ projectsDir, onSelectSession, onSelectProject, onSessionAct
                     worktree: wt,
                     session: entry.session,
                     baseLabel,
+                    searchableName: `${entry.projectName} :: ${fullBranchName}${isMain}`,
                     fileChanges,
                     aheadBehind,
                     parentBranch,

package/dist/components/Menu.js

@@ -10,7 +10,7 @@ import { prepareSessionItems, calculateColumnPositions, assembleSessionLabel, }
 import { projectManager } from '../services/projectManager.js';
 import { useSearchMode } from '../hooks/useSearchMode.js';
 import { useDynamicLimit } from '../hooks/useDynamicLimit.js';
-import { filterWorktreesByQuery } from '../utils/filterByQuery.js';
+import { filterSessionItemsByQuery } from '../utils/filterByQuery.js';
 import SearchableList from './SearchableList.js';
 import { globalSessionOrchestrator } from '../services/globalSessionOrchestrator.js';
 import { configReader } from '../services/config/configReader.js';
@@ -124,10 +124,9 @@ const Menu = ({ sessionManager, worktreeService, onMenuAction, onSelectRecentPro
             sortByLastSession: worktreeConfig.sortByLastSession,
         });
         const columnPositions = calculateColumnPositions(items);
-        // Filter worktrees based on search query
-        const filteredWorktrees = filterWorktreesByQuery(items.map(item => item.worktree), searchQuery);
-        const filteredWorktreeSet = new Set(filteredWorktrees);
-        const filteredItems = items.filter(item => filteredWorktreeSet.has(item.worktree));
+        // Filter session items based on search query, matching the name shown in
+        // the menu (branch name, " (main)", and session name) plus the path.
+        const filteredItems = filterSessionItemsByQuery(items, searchQuery);
         // Build menu items with proper alignment
         const menuItems = filteredItems.map((item, index) => {
             const baseLabel = assembleSessionLabel(item, columnPositions);

package/dist/utils/filterByQuery.d.ts

@@ -1,5 +1,16 @@
 import { Worktree } from '../types/index.js';
+import { SessionItem } from './worktreeUtils.js';
 /**
  * Filter worktrees by matching search query against branch name and path.
  */
 export declare function filterWorktreesByQuery(worktrees: Worktree[], query: string): Worktree[];
+/**
+ * Filter session items by matching the search query against the name shown in
+ * the menu (branch name, " (main)" indicator, and session name) and the
+ * worktree path. Status icons and git status columns are not matched.
+ *
+ * Filtering happens per session item (not per worktree) so that a query can
+ * match an individual session name within a worktree that has multiple
+ * sessions.
+ */
+export declare function filterSessionItemsByQuery(items: SessionItem[], query: string): SessionItem[];

package/dist/utils/filterByQuery.js

@@ -11,3 +11,19 @@ export function filterWorktreesByQuery(worktrees, query) {
             worktree.path.toLowerCase().includes(searchLower));
     });
 }
+/**
+ * Filter session items by matching the search query against the name shown in
+ * the menu (branch name, " (main)" indicator, and session name) and the
+ * worktree path. Status icons and git status columns are not matched.
+ *
+ * Filtering happens per session item (not per worktree) so that a query can
+ * match an individual session name within a worktree that has multiple
+ * sessions.
+ */
+export function filterSessionItemsByQuery(items, query) {
+    if (!query)
+        return items;
+    const searchLower = query.toLowerCase();
+    return items.filter(item => item.searchableName.toLowerCase().includes(searchLower) ||
+        item.worktree.path.toLowerCase().includes(searchLower));
+}

package/dist/utils/filterByQuery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/filterByQuery.test.js

@@ -0,0 +1,81 @@
+import { describe, it, expect } from 'vitest';
+import { filterWorktreesByQuery, filterSessionItemsByQuery, } from './filterByQuery.js';
+const makeItem = (searchableName, path) => ({
+    worktree: {
+        path,
+        isMainWorktree: false,
+        hasSession: false,
+    },
+    baseLabel: searchableName,
+    searchableName,
+    fileChanges: '',
+    aheadBehind: '',
+    parentBranch: '',
+    lastCommitDate: '',
+    lengths: {
+        base: 0,
+        fileChanges: 0,
+        aheadBehind: 0,
+        parentBranch: 0,
+        lastCommitDate: 0,
+    },
+});
+describe('filterWorktreesByQuery', () => {
+    const worktrees = [
+        {
+            path: '/repo/feature-a',
+            branch: 'feature/a',
+            isMainWorktree: false,
+            hasSession: false,
+        },
+        {
+            path: '/repo/main',
+            branch: 'main',
+            isMainWorktree: true,
+            hasSession: false,
+        },
+    ];
+    it('returns all worktrees when query is empty', () => {
+        expect(filterWorktreesByQuery(worktrees, '')).toEqual(worktrees);
+    });
+    it('matches branch name case-insensitively', () => {
+        const result = filterWorktreesByQuery(worktrees, 'FEATURE');
+        expect(result).toHaveLength(1);
+        expect(result[0]?.branch).toBe('feature/a');
+    });
+    it('matches path', () => {
+        const result = filterWorktreesByQuery(worktrees, '/repo/main');
+        expect(result).toHaveLength(1);
+        expect(result[0]?.path).toBe('/repo/main');
+    });
+});
+describe('filterSessionItemsByQuery', () => {
+    const items = [
+        makeItem('feature/a', '/repo/feature-a'),
+        makeItem('main (main)', '/repo/main'),
+        makeItem('feature/b: my-session', '/repo/feature-b'),
+        makeItem('feature/b: other', '/repo/feature-b'),
+    ];
+    it('returns all items when query is empty', () => {
+        expect(filterSessionItemsByQuery(items, '')).toEqual(items);
+    });
+    it('matches the session name within a worktree', () => {
+        const result = filterSessionItemsByQuery(items, 'my-session');
+        expect(result).toHaveLength(1);
+        expect(result[0]?.searchableName).toBe('feature/b: my-session');
+    });
+    it('matches the (main) indicator', () => {
+        const result = filterSessionItemsByQuery(items, '(main)');
+        expect(result).toHaveLength(1);
+        expect(result[0]?.searchableName).toBe('main (main)');
+    });
+    it('matches branch name case-insensitively', () => {
+        const result = filterSessionItemsByQuery(items, 'FEATURE/A');
+        expect(result).toHaveLength(1);
+        expect(result[0]?.searchableName).toBe('feature/a');
+    });
+    it('matches path', () => {
+        const result = filterSessionItemsByQuery(items, '/repo/feature-b');
+        expect(result).toHaveLength(2);
+    });
+});

package/dist/utils/worktreeUtils.d.ts

@@ -6,6 +6,7 @@ export interface SessionItem {
     worktree: Worktree;
     session?: Session;
     baseLabel: string;
+    searchableName: string;
     fileChanges: string;
     aheadBehind: string;
     parentBranch: string;

package/dist/utils/worktreeUtils.js

@@ -166,6 +166,9 @@ function buildSessionItem(wt, session, sessionSuffix) {
     const branchName = truncateString(fullBranchName, MAX_BRANCH_NAME_LENGTH);
     const isMain = wt.isMainWorktree ? ' (main)' : '';
     const baseLabel = `${branchName}${isMain}${sessionSuffix}${status}`;
+    // Use the full (untruncated) branch name so search still matches the tail
+    // of long branch names; status icons are excluded so they don't match.
+    const searchableName = `${fullBranchName}${isMain}${sessionSuffix}`;
     const { fileChanges, aheadBehind, parentBranch, error } = gitStatusColumns(wt, fullBranchName);
     const lastCommitDate = wt.lastCommitDate
         ? `\x1b[90m${formatRelativeDate(wt.lastCommitDate)}\x1b[0m`
@@ -174,6 +177,7 @@ function buildSessionItem(wt, session, sessionSuffix) {
         worktree: wt,
         session,
         baseLabel,
+        searchableName,
         fileChanges,
         aheadBehind,
         parentBranch,

package/dist/utils/worktreeUtils.test.js

@@ -173,6 +173,7 @@ describe('column alignment', () => {
         {
             worktree: {},
             baseLabel: 'feature/test-branch',
+            searchableName: 'feature/test-branch',
             fileChanges: '\x1b[32m+10\x1b[0m \x1b[31m-5\x1b[0m',
             aheadBehind: '\x1b[33m↑2 ↓3\x1b[0m',
             parentBranch: '',
@@ -188,6 +189,7 @@ describe('column alignment', () => {
         {
             worktree: {},
             baseLabel: 'main',
+            searchableName: 'main',
             fileChanges: '\x1b[32m+2\x1b[0m \x1b[31m-1\x1b[0m',
             aheadBehind: '\x1b[33m↑1\x1b[0m',
             parentBranch: '',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "4.1.20",
+	"version": "4.1.21",
 	"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": "4.1.20",
-		"@kodaikabasawa/ccmanager-darwin-x64": "4.1.20",
-		"@kodaikabasawa/ccmanager-linux-arm64": "4.1.20",
-		"@kodaikabasawa/ccmanager-linux-x64": "4.1.20",
-		"@kodaikabasawa/ccmanager-win32-x64": "4.1.20"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "4.1.21",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.1.21",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.1.21",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.1.21",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.1.21"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",