@stigmer/react 3.1.4 → 3.1.5

package/src/workspace/workspaceListingCache.ts

@@ -3,9 +3,12 @@
 // Both surfaces that need a listing read through here: the Files accordion
 // (`useWorkspaceFiles`, one entry) and workspace search (`useWorkspaceFileSearch`,
 // many entries). Keeping one module-level cache — keyed by the stable-within-page
-// `entry.id` — guarantees the two never double-fetch or drift, and lets one fetch
-// produce every shape a consumer needs (flat files for search, a tree for the
-// accordion, and the truncation flag for the banner).
+// `entry.id` plus the entry's effective read ref — guarantees the two never
+// double-fetch or drift, and lets one fetch produce every shape a consumer needs
+// (flat files for search, a tree for the accordion, and the truncation flag for
+// the banner). The ref is part of the key because a listing is a snapshot of one
+// ref: when a session's write-back advances `readRef`, the old listing is stale
+// by definition and must not be served.
 
 import { buildFileTree, type TreeNode } from "../internal/file-tree/index.js";
 import type { WorkspaceEntry } from "./useWorkspaceEntries.js";
@@ -40,13 +43,24 @@ export interface LoadEntryFilesOptions {
 
 const sharedCache = new Map<string, WorkspaceListing>();
 
+/**
+ * Cache key for one entry's listing: identity plus the ref the listing was
+ * taken at. `entry.id` alone is NOT sufficient — it anchors file-selection
+ * identity across the surface and stays stable while `readRef` advances with
+ * each write-back push, so the ref must contribute to the key or consumers
+ * would see the pre-push tree forever.
+ */
+function listingCacheKey(entry: WorkspaceEntry): string {
+  return `${entry.id}\u0000${entry.readRef ?? entry.gitBranch ?? ""}`;
+}
+
 /**
  * Returns a cached {@link WorkspaceListing} for an entry synchronously, or
  * `undefined` when nothing is cached. Lets a consumer render a warm listing
  * instantly (no loading flash) before deciding whether to fetch.
  */
-export function peekEntryListing(entryId: string): WorkspaceListing | undefined {
-  return sharedCache.get(entryId);
+export function peekEntryListing(entry: WorkspaceEntry): WorkspaceListing | undefined {
+  return sharedCache.get(listingCacheKey(entry));
 }
 
 /**
@@ -63,7 +77,7 @@ export async function loadEntryFiles(
   options: LoadEntryFilesOptions = {},
 ): Promise<WorkspaceListing | null> {
   if (!options.bustCache) {
-    const cached = sharedCache.get(entry.id);
+    const cached = sharedCache.get(listingCacheKey(entry));
     if (cached) return cached;
   }
 
@@ -71,7 +85,7 @@ export async function loadEntryFiles(
   if (raw === null) return null;
 
   const listing = buildListing(raw);
-  sharedCache.set(entry.id, listing);
+  sharedCache.set(listingCacheKey(entry), listing);
   return listing;
 }