@tutti-os/workspace-file-reference 0.0.14 → 0.0.15

package/dist/{chunk-CD3YNHYJ.js → chunk-KSK6PILG.js}

@@ -4,7 +4,7 @@ import {
   nodeRefKey,
   sortReferenceNodes,
   uniqueWorkspaceFileReferences
-} from "./chunk-7C3RZYQE.js";
+} from "./chunk-HRC2MZ5H.js";
 
 // src/react/internal/reference/WorkspaceFileReferencePickerState.ts
 var workspaceFileReferenceDefaultExpandedDepth = 4;
@@ -162,7 +162,15 @@ var defaultDirectoryPath = "/";
 var defaultSearchDebounceMs = 180;
 function createWorkspaceFileReferencePickerController(input) {
   const searchDebounceMs = input.searchDebounceMs ?? defaultSearchDebounceMs;
-  let browseSequence = 0;
+  let nextBrowseSeq = 0;
+  const latestBrowseSeqByKey = /* @__PURE__ */ new Map();
+  const stampBrowse = (seqKey) => {
+    const sequence = ++nextBrowseSeq;
+    latestBrowseSeqByKey.set(seqKey, sequence);
+    return sequence;
+  };
+  const isBrowseStale = (seqKey, sequence) => !retained || latestBrowseSeqByKey.get(seqKey) !== sequence;
+  const REVEAL_SEQ_KEY = "\0reveal";
   let previewObjectUrl = null;
   let previewSequence = 0;
   let retained = false;
@@ -223,7 +231,7 @@ function createWorkspaceFileReferencePickerController(input) {
     searchAbortController = null;
   };
   const cancelCurrentBrowse = () => {
-    browseSequence += 1;
+    latestBrowseSeqByKey.clear();
   };
   const cancelCurrentPreview = () => {
     previewSequence += 1;
@@ -310,7 +318,8 @@ function createWorkspaceFileReferencePickerController(input) {
     if (normalizedRoot && snapshot.directoryStateByPath[normalizedRoot]?.loaded) {
       return;
     }
-    const sequence = ++browseSequence;
+    const seqKey = normalizedRoot ?? "";
+    const sequence = stampBrowse(seqKey);
     setSnapshot({
       browseError: null,
       isBrowseLoading: true
@@ -323,7 +332,7 @@ function createWorkspaceFileReferencePickerController(input) {
           prefetchDepth: 4,
           workspaceId: input.workspaceId
         });
-        if (!retained || sequence !== browseSequence) {
+        if (isBrowseStale(seqKey, sequence)) {
           return;
         }
         setSnapshot({
@@ -338,7 +347,7 @@ function createWorkspaceFileReferencePickerController(input) {
         return;
       }
       const listing = await loadDirectoryListing(activeBrowseRootPath);
-      if (!retained || sequence !== browseSequence || !listing) {
+      if (isBrowseStale(seqKey, sequence) || !listing) {
         return;
       }
       setSnapshot((current) => ({
@@ -356,7 +365,7 @@ function createWorkspaceFileReferencePickerController(input) {
         isBrowseLoading: false
       }));
     } catch (error) {
-      if (!retained || sequence !== browseSequence) {
+      if (isBrowseStale(seqKey, sequence)) {
         return;
       }
       setSnapshot({
@@ -373,7 +382,7 @@ function createWorkspaceFileReferencePickerController(input) {
     if (!retained || snapshot.directoryStateByPath[folderKey]?.loaded || snapshot.directoryStateByPath[folderKey]?.loading) {
       return;
     }
-    const sequence = ++browseSequence;
+    const sequence = stampBrowse(folderKey);
     setSnapshot((current) => ({
       ...current,
       directoryStateByPath: {
@@ -388,7 +397,7 @@ function createWorkspaceFileReferencePickerController(input) {
     }));
     try {
       const listing = await loadDirectoryListing(folderKey);
-      if (!retained || sequence !== browseSequence || !listing) {
+      if (isBrowseStale(folderKey, sequence) || !listing) {
         return;
       }
       setSnapshot((current) => ({
@@ -404,7 +413,7 @@ function createWorkspaceFileReferencePickerController(input) {
         }
       }));
     } catch {
-      if (!retained || sequence !== browseSequence) {
+      if (isBrowseStale(folderKey, sequence)) {
         return;
       }
       setSnapshot((current) => ({
@@ -542,7 +551,7 @@ function createWorkspaceFileReferencePickerController(input) {
         });
         return null;
       }
-      const sequence = ++browseSequence;
+      const sequence = stampBrowse(REVEAL_SEQ_KEY);
       const loadedDirectories = {};
       const expandedDirectories = {};
       const directoryState = (path) => loadedDirectories[path] ?? snapshot.directoryStateByPath[path];
@@ -573,7 +582,7 @@ function createWorkspaceFileReferencePickerController(input) {
           loading: false
         };
       }
-      if (!retained || sequence !== browseSequence) {
+      if (isBrowseStale(REVEAL_SEQ_KEY, sequence)) {
         return null;
       }
       setSnapshot((current) => ({
@@ -899,6 +908,8 @@ var ROOT_CHILDREN_KEY = nodeRefKey({
   nodeId: SOURCE_ROOT_NODE_ID
 });
 var defaultSearchDebounceMs2 = 180;
+var SEARCH_PAGE_SIZE = 30;
+var SEARCH_MAX_LIMIT = 200;
 function emptyTabState(sourceId) {
   return {
     sourceId,
@@ -906,8 +917,13 @@ function emptyTabState(sourceId) {
     childrenByKey: {},
     mode: "browse",
     searchQuery: "",
+    searchFilters: [],
+    searchScopeNodeId: null,
     searchEntries: [],
     searchNextCursor: null,
+    searchLimit: 0,
+    searchHasMore: false,
+    isSearchLoadingMore: false,
     isSearchLoading: false,
     searchError: null
   };
@@ -925,8 +941,10 @@ function createReferenceSourcePickerController(input) {
   const { aggregator, scope } = input;
   const searchDebounceMs = input.searchDebounceMs ?? defaultSearchDebounceMs2;
   let retained = false;
+  let tabsReady = Promise.resolve();
   let tabsSequence = 0;
-  let browseSequence = 0;
+  let nextBrowseSeq = 0;
+  const latestBrowseSeqByKey = /* @__PURE__ */ new Map();
   let searchSequence = 0;
   let searchAbortController = null;
   let searchTimer = null;
@@ -987,7 +1005,9 @@ function createReferenceSourcePickerController(input) {
     if (options.append && !cursor) {
       return;
     }
-    const sequence = ++browseSequence;
+    const seqKey = `${sourceId}\0${key}`;
+    const sequence = ++nextBrowseSeq;
+    latestBrowseSeqByKey.set(seqKey, sequence);
     setChildrenState(sourceId, key, { loading: true, error: null });
     try {
       const result = await aggregator.listChildren(
@@ -995,7 +1015,7 @@ function createReferenceSourcePickerController(input) {
         node ? node.ref : { sourceId, nodeId: SOURCE_ROOT_NODE_ID },
         { cursor }
       );
-      if (!retained || sequence !== browseSequence) {
+      if (!retained || latestBrowseSeqByKey.get(seqKey) !== sequence) {
         return;
       }
       const prior = snapshot.bySource[sourceId]?.childrenByKey[key]?.entries ?? [];
@@ -1008,7 +1028,7 @@ function createReferenceSourcePickerController(input) {
         error: null
       });
     } catch (error) {
-      if (!retained || sequence !== browseSequence) {
+      if (!retained || latestBrowseSeqByKey.get(seqKey) !== sequence) {
         return;
       }
       setChildrenState(sourceId, key, {
@@ -1073,7 +1093,7 @@ function createReferenceSourcePickerController(input) {
     searchAbortController?.abort();
     searchAbortController = null;
   };
-  const runSearch = async (sourceId, query) => {
+  const runSearch = async (sourceId, query, filters, scopeNodeId, limit, loadingMore) => {
     if (!retained) {
       return;
     }
@@ -1083,13 +1103,16 @@ function createReferenceSourcePickerController(input) {
     searchAbortController = abortController;
     updateTab(sourceId, (tab) => ({
       ...tab,
-      isSearchLoading: true,
+      ...loadingMore ? { isSearchLoadingMore: true } : { isSearchLoading: true },
       searchError: null
     }));
     try {
       const result = await aggregator.search(scope, sourceId, {
         query,
-        signal: abortController.signal
+        limit,
+        signal: abortController.signal,
+        ...filters.length > 0 ? { filters } : {},
+        ...scopeNodeId == null ? {} : { withinNodeId: scopeNodeId }
       });
       if (!retained || sequence !== searchSequence) {
         return;
@@ -1097,8 +1120,12 @@ function createReferenceSourcePickerController(input) {
       updateTab(sourceId, (tab) => ({
         ...tab,
         isSearchLoading: false,
+        isSearchLoadingMore: false,
         searchEntries: sortReferenceNodes(result.entries),
         searchNextCursor: result.nextCursor ?? null,
+        searchLimit: limit,
+        // 本页返回数达到请求上限、且未触全局上限 → 认为可能还有更多(增长式分页启发式)。
+        searchHasMore: result.entries.length >= limit && limit < SEARCH_MAX_LIMIT,
         searchError: null
       }));
     } catch (error) {
@@ -1108,7 +1135,9 @@ function createReferenceSourcePickerController(input) {
       updateTab(sourceId, (tab) => ({
         ...tab,
         isSearchLoading: false,
-        searchEntries: [],
+        isSearchLoadingMore: false,
+        // 加载更多失败时保留已有结果,仅新查询失败才清空。
+        ...loadingMore ? {} : { searchEntries: [], searchHasMore: false },
         searchError: normalizeError(error, "reference search failed")
       }));
     } finally {
@@ -1144,18 +1173,32 @@ function createReferenceSourcePickerController(input) {
     await walk(folder);
     return files;
   };
-  const scheduleSearch = (sourceId, query) => {
+  const scheduleSearch = (sourceId, query, filters, scopeNodeId) => {
     clearSearchTimer();
-    if (!retained || !query) {
+    if (!retained || !query && filters.length === 0) {
       return;
     }
     if (searchDebounceMs <= 0) {
-      void runSearch(sourceId, query);
+      void runSearch(
+        sourceId,
+        query,
+        filters,
+        scopeNodeId,
+        SEARCH_PAGE_SIZE,
+        false
+      );
       return;
     }
     searchTimer = setTimeout(() => {
       searchTimer = null;
-      void runSearch(sourceId, query);
+      void runSearch(
+        sourceId,
+        query,
+        filters,
+        scopeNodeId,
+        SEARCH_PAGE_SIZE,
+        false
+      );
     }, searchDebounceMs);
   };
   return {
@@ -1170,17 +1213,17 @@ function createReferenceSourcePickerController(input) {
         return;
       }
       retained = true;
-      void loadTabs();
+      tabsReady = loadTabs();
     },
     close() {
       retained = false;
       cancelSearch();
-      browseSequence += 1;
+      latestBrowseSeqByKey.clear();
       tabsSequence += 1;
     },
     reset() {
       cancelSearch();
-      browseSequence += 1;
+      latestBrowseSeqByKey.clear();
       tabsSequence += 1;
       setSnapshot({
         isLoadingTabs: false,
@@ -1192,17 +1235,77 @@ function createReferenceSourcePickerController(input) {
       });
     },
     setActiveSource(sourceId) {
-      if (!snapshot.tabs.some((tab2) => tab2.sourceId === sourceId)) {
+      if (!snapshot.tabs.some((tab) => tab.sourceId === sourceId)) {
         return;
       }
+      const prevTab = snapshot.activeSourceId ? snapshot.bySource[snapshot.activeSourceId] : void 0;
+      const carriedQuery = prevTab?.searchQuery ?? "";
+      const carriedFilters = prevTab?.searchFilters ?? [];
+      const trimmed = carriedQuery.trim();
       cancelSearch();
       setSnapshot({ activeSourceId: sourceId });
-      const tab = snapshot.bySource[sourceId];
-      if (tab?.mode === "search" && tab.searchQuery.trim()) {
-        scheduleSearch(sourceId, tab.searchQuery.trim());
-      } else {
+      if (trimmed === "" && carriedFilters.length === 0) {
+        updateTab(
+          sourceId,
+          (tab) => tab.mode === "browse" && tab.searchQuery === "" && tab.searchFilters.length === 0 ? tab : {
+            ...tab,
+            mode: "browse",
+            searchQuery: "",
+            searchFilters: [],
+            searchEntries: [],
+            searchHasMore: false,
+            isSearchLoading: false,
+            isSearchLoadingMore: false,
+            searchError: null
+          }
+        );
         ensureRootLoaded(sourceId);
+        return;
       }
+      const nextScopeNodeId = snapshot.bySource[sourceId]?.searchScopeNodeId ?? null;
+      updateTab(sourceId, (tab) => ({
+        ...tab,
+        searchQuery: carriedQuery,
+        searchFilters: carriedFilters,
+        searchScopeNodeId: nextScopeNodeId,
+        mode: "search",
+        // 沿用旧结果直到新结果就绪,避免切源瞬间闪空。
+        isSearchLoading: true,
+        searchError: null
+      }));
+      scheduleSearch(sourceId, trimmed, carriedFilters, nextScopeNodeId);
+    },
+    async locatePath(target) {
+      await tabsReady;
+      if (!retained) {
+        return [];
+      }
+      const refs = await aggregator.locateTarget(
+        scope,
+        target.sourceId,
+        target.params
+      );
+      if (!refs || refs.length === 0) {
+        return [];
+      }
+      const path = [];
+      let parent = {
+        sourceId: target.sourceId,
+        nodeId: SOURCE_ROOT_NODE_ID
+      };
+      for (const ref of refs) {
+        const { entries } = await aggregator.listChildren(scope, parent);
+        const targetKey = nodeRefKey(ref);
+        const node = entries.find(
+          (entry) => nodeRefKey(entry.ref) === targetKey
+        );
+        if (!node) {
+          break;
+        }
+        path.push(node);
+        parent = ref;
+      }
+      return path;
     },
     ensureChildren(node) {
       const sourceId = node ? node.ref.sourceId : snapshot.activeSourceId;
@@ -1245,26 +1348,108 @@ function createReferenceSourcePickerController(input) {
       }
       void loadChildren(sourceId, node, { append: true });
     },
-    setSearchQuery(query) {
+    loadMoreSourceRoot(sourceId) {
+      if (!sourceId) {
+        return;
+      }
+      void loadChildren(sourceId, null, { append: true });
+    },
+    setSearchQuery(query, scopeNodeId = null) {
       const sourceId = snapshot.activeSourceId;
       if (!sourceId) {
         return;
       }
+      const filters = snapshot.bySource[sourceId]?.searchFilters ?? [];
       const trimmed = query.trim();
-      const nextMode = trimmed ? "search" : "browse";
+      const nextMode = trimmed || filters.length > 0 ? "search" : "browse";
       updateTab(sourceId, (tab) => ({
         ...tab,
         searchQuery: query,
+        searchScopeNodeId: scopeNodeId,
         mode: nextMode,
-        ...nextMode === "browse" ? { isSearchLoading: false, searchEntries: [], searchError: null } : {}
+        // 进入搜索:立刻置 loading(搜索是 debounce 的,否则键入到取数之间会先渲染空态,
+        // 造成「空态 → spinner → 结果」闪烁)。保留上次 searchEntries,细化关键词时沿用旧结果而非闪空。
+        ...nextMode === "browse" ? { isSearchLoading: false, searchEntries: [], searchError: null } : { isSearchLoading: true, searchError: null }
       }));
       if (nextMode === "search") {
-        scheduleSearch(sourceId, trimmed);
+        scheduleSearch(sourceId, trimmed, filters, scopeNodeId);
       } else {
         cancelSearch();
         ensureRootLoaded(sourceId);
       }
     },
+    setSearchFilters(filters, scopeNodeId = null) {
+      const sourceId = snapshot.activeSourceId;
+      if (!sourceId) {
+        return;
+      }
+      const tab = snapshot.bySource[sourceId];
+      const trimmed = tab?.searchQuery.trim() ?? "";
+      const scopeId = scopeNodeId ?? tab?.searchScopeNodeId ?? null;
+      const nextMode = trimmed || filters.length > 0 ? "search" : "browse";
+      updateTab(sourceId, (current) => ({
+        ...current,
+        searchFilters: filters,
+        searchScopeNodeId: scopeId,
+        mode: nextMode,
+        ...nextMode === "browse" ? { isSearchLoading: false, searchEntries: [], searchError: null } : { isSearchLoading: true, searchError: null }
+      }));
+      if (nextMode === "search") {
+        scheduleSearch(sourceId, trimmed, filters, scopeId);
+      } else {
+        cancelSearch();
+        ensureRootLoaded(sourceId);
+      }
+    },
+    setSearchScope(scopeNodeId) {
+      const sourceId = snapshot.activeSourceId;
+      if (!sourceId) {
+        return;
+      }
+      const tab = snapshot.bySource[sourceId];
+      if (!tab || tab.searchScopeNodeId === scopeNodeId) {
+        return;
+      }
+      updateTab(sourceId, (current) => ({
+        ...current,
+        searchScopeNodeId: scopeNodeId
+      }));
+      const trimmed = tab.searchQuery.trim();
+      const filters = tab.searchFilters;
+      if (tab.mode === "search" && (trimmed || filters.length > 0)) {
+        scheduleSearch(sourceId, trimmed, filters, scopeNodeId);
+      }
+    },
+    loadMoreSearch() {
+      const sourceId = snapshot.activeSourceId;
+      if (!sourceId) {
+        return;
+      }
+      const tab = snapshot.bySource[sourceId];
+      if (!tab || tab.mode !== "search" || !tab.searchHasMore || tab.isSearchLoadingMore) {
+        return;
+      }
+      const trimmed = tab.searchQuery.trim();
+      if (!trimmed && tab.searchFilters.length === 0) {
+        return;
+      }
+      const nextLimit = Math.min(
+        (tab.searchLimit || SEARCH_PAGE_SIZE) + SEARCH_PAGE_SIZE,
+        SEARCH_MAX_LIMIT
+      );
+      if (nextLimit <= tab.searchLimit) {
+        return;
+      }
+      clearSearchTimer();
+      void runSearch(
+        sourceId,
+        trimmed,
+        tab.searchFilters,
+        tab.searchScopeNodeId,
+        nextLimit,
+        true
+      );
+    },
     toggleSelection(node) {
       const key = nodeRefKey(node.ref);
       setSnapshot((current) => {
@@ -1306,6 +1491,38 @@ function createReferenceSourcePickerController(input) {
         }
       }
       return resolved;
+    },
+    async confirmGrouped() {
+      const files = [];
+      const bundles = [];
+      const seenPaths = /* @__PURE__ */ new Set();
+      const pushFile = (ref) => {
+        if (seenPaths.has(ref.path)) {
+          return;
+        }
+        seenPaths.add(ref.path);
+        files.push(ref);
+      };
+      for (const node of snapshot.selection) {
+        const navigable = node.kind === "folder" && (aggregator.getLoadedSource(node.ref.sourceId)?.capabilities.navigable ?? false);
+        if (!navigable) {
+          pushFile(aggregator.resolveSelection(node));
+          continue;
+        }
+        const fileNodes = await collectFolderFiles(node);
+        const bundleSeen = /* @__PURE__ */ new Set();
+        const bundleFiles = [];
+        for (const fileNode of fileNodes) {
+          const ref = aggregator.resolveSelection(fileNode);
+          if (bundleSeen.has(ref.path)) {
+            continue;
+          }
+          bundleSeen.add(ref.path);
+          bundleFiles.push(ref);
+        }
+        bundles.push({ root: node, files: bundleFiles });
+      }
+      return { files, bundles };
     }
   };
 }
@@ -1328,4 +1545,4 @@ export {
   ROOT_CHILDREN_KEY,
   createReferenceSourcePickerController
 };
-//# sourceMappingURL=chunk-CD3YNHYJ.js.map
+//# sourceMappingURL=chunk-KSK6PILG.js.map