ccmanager 4.1.24 → 4.1.25

package/dist/hooks/useGitStatus.d.ts

@@ -1,4 +1,6 @@
 import { Worktree } from '../types/index.js';
+/** Clear the module-level git-status cache. Intended for tests. */
+export declare function clearGitStatusCache(): void;
 /**
  * Custom hook for polling git status and commit dates of worktrees with Effect-based execution
  *

package/dist/hooks/useGitStatus.js

@@ -1,6 +1,58 @@
 import { useEffect, useState } from 'react';
 import { Effect, Exit, Cause, Option } from 'effect';
 import { getGitStatusLimited, getLastCommitDateLimited, } from '../utils/gitStatus.js';
+/**
+ * Module-level cache of the last fetched git status, keyed by worktree path.
+ *
+ * The menu is fully unmounted and remounted on every return to it (App renders
+ * `<Menu key={menuKey} />`, and the key changes on navigation), which would
+ * otherwise wipe this hook's state and force every worktree to flash
+ * "[fetching...]" and refetch from scratch each time. Seeding state from this
+ * cache shows each worktree's last known status instantly; background polling
+ * still refreshes it. Entries are intentionally not pruned so switching between
+ * projects keeps each project's cached status.
+ */
+const statusCache = new Map();
+/** Clear the module-level git-status cache. Intended for tests. */
+export function clearGitStatusCache() {
+    statusCache.clear();
+}
+/**
+ * Merge any cached status onto the given worktrees so a remount can show the
+ * last known status immediately instead of "[fetching...]". Returns the same
+ * array reference when nothing was cached, so React can skip a re-render.
+ */
+function hydrateFromCache(worktrees) {
+    let changed = false;
+    const next = worktrees.map(wt => {
+        const cached = statusCache.get(wt.path);
+        if (!cached) {
+            return wt;
+        }
+        changed = true;
+        return {
+            ...wt,
+            gitStatus: cached.gitStatus,
+            gitStatusError: cached.gitStatusError,
+            lastCommitDate: cached.lastCommitDate,
+        };
+    });
+    return changed ? next : worktrees;
+}
+/** Record a worktree's latest status update into the module-level cache. */
+function cacheStatusUpdate(path, update) {
+    const next = { ...statusCache.get(path) };
+    if ('gitStatus' in update) {
+        next.gitStatus = update.gitStatus;
+    }
+    if ('gitStatusError' in update) {
+        next.gitStatusError = update.gitStatusError;
+    }
+    if ('lastCommitDate' in update) {
+        next.lastCommitDate = update.lastCommitDate;
+    }
+    statusCache.set(path, next);
+}
 /**
  * Custom hook for polling git status and commit dates of worktrees with Effect-based execution
  *
@@ -20,7 +72,7 @@ import { getGitStatusLimited, getLastCommitDateLimited, } from '../utils/gitStat
  * @returns Array of worktrees with updated gitStatus, gitStatusError, and lastCommitDate fields
  */
 export function useGitStatus(worktrees, defaultBranch, updateInterval = 5000) {
-    const [worktreesWithStatus, setWorktreesWithStatus] = useState(worktrees);
+    const [worktreesWithStatus, setWorktreesWithStatus] = useState(() => hydrateFromCache(worktrees));
     useEffect(() => {
         if (!defaultBranch) {
             return;
@@ -66,7 +118,7 @@ export function useGitStatus(worktrees, defaultBranch, updateInterval = 5000) {
                 }, updateInterval);
             }
         };
-        setWorktreesWithStatus(worktrees);
+        setWorktreesWithStatus(hydrateFromCache(worktrees));
         runCycle().catch(() => {
             // Ignore errors - the fetch failed or was aborted
         });
@@ -97,6 +149,7 @@ function applyStatusResults(results, setWorktreesWithStatus) {
         const update = buildStatusUpdate(result.statusExit, result.dateExit);
         if (update) {
             updatesByPath.set(result.path, update);
+            cacheStatusUpdate(result.path, update);
         }
     }
     if (updatesByPath.size === 0) {

package/dist/hooks/useGitStatus.test.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { render, cleanup } from 'ink-testing-library';
 import { Text } from 'ink';
 import { Effect, Exit } from 'effect';
-import { useGitStatus } from './useGitStatus.js';
+import { useGitStatus, clearGitStatusCache } from './useGitStatus.js';
 import { getGitStatusLimited, getLastCommitDateLimited, } from '../utils/gitStatus.js';
 import { GitError } from '../types/errors.js';
 // Mock the gitStatus module
@@ -29,6 +29,9 @@ describe('useGitStatus', () => {
     });
     beforeEach(() => {
         vi.useFakeTimers();
+        // The status cache is module-level and persists across tests; clear it so
+        // each test starts from a cold cache.
+        clearGitStatusCache();
         mockGetGitStatus.mockClear();
         mockGetLastCommitDate.mockClear();
         // Default: return a date for all worktrees
@@ -66,6 +69,27 @@ describe('useGitStatus', () => {
         expect(hookResult[0]?.gitStatus).toEqual(gitStatus1);
         expect(hookResult[1]?.gitStatus).toEqual(gitStatus2);
     });
+    it('should hydrate from cache on remount so status shows immediately', async () => {
+        const worktrees = [createWorktree('/path1')];
+        const gitStatus1 = createGitStatus(7, 2);
+        mockGetGitStatus.mockReturnValue(Effect.succeed(gitStatus1));
+        let hookResult = [];
+        const TestComponent = () => {
+            hookResult = useGitStatus(worktrees, 'main', 100);
+            return React.createElement(Text, null, 'test');
+        };
+        // First mount: fetch populates the module-level cache.
+        const first = render(React.createElement(TestComponent));
+        await vi.waitFor(() => {
+            expect(hookResult[0]?.gitStatus).toEqual(gitStatus1);
+        });
+        first.unmount();
+        // Remount: cached status must be present on the very first render, before
+        // any new fetch resolves, so the menu does not flash "[fetching...]".
+        hookResult = [];
+        render(React.createElement(TestComponent));
+        expect(hookResult[0]?.gitStatus).toEqual(gitStatus1);
+    });
     it('should handle empty worktree array', () => {
         let hookResult = [];
         const TestComponent = () => {

package/package.json

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