Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(workdir-browse): seed 过渡窗口两处展开位丢失/空白(复审 P1+P2)

Zhang Yunjina7b6b7ad83fa
diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useFileTree.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useFileTree.test.tsx
index 8e0ed60f70..59eb6d03f1 100644
--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useFileTree.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useFileTree.test.tsx
@@ -524,6 +524,137 @@ describe('useFileTree showIgnoredDirs option', () => {
view.unmount();
});
+ it('seed 结束后的第二次 root 刷新:借来的子列表不当剪枝证据,持久展开位不丢', async () => {
+ const hiddenRoot: readonly DirEntry[] = [
+ { name: 'packages', relPath: 'packages', type: 'directory', size: 0, mtimeMs: 1 },
+ ];
+ const hiddenPackages: readonly DirEntry[] = [];
+ const revealedRoot = hiddenRoot;
+ const revealedPackages: readonly DirEntry[] = [
+ {
+ name: 'node_modules',
+ relPath: 'packages/node_modules',
+ type: 'directory',
+ size: 0,
+ mtimeMs: 2,
+ },
+ ];
+ mocks.loadExpandedSet.mockImplementation(
+ (_workdir: string, opts?: { showIgnoredDirs?: boolean }) =>
+ opts?.showIgnoredDirs
+ ? new Set(['packages', 'packages/node_modules'])
+ : new Set(['packages']), // 隐藏态缓存过 packages:借给放行态的空列表得留在 entries
+ );
+ // packages 的真实列表一直挂着不回:seed 借来的空列表始终留在 entries 里。
+ mocks.listDir.mockImplementation((args: { relPath?: string; showIgnoredDirs?: boolean }) => {
+ if (!args.showIgnoredDirs) {
+ return Promise.resolve((args.relPath ?? '') === '' ? hiddenRoot : hiddenPackages);
+ }
+ if ((args.relPath ?? '') === '') return Promise.resolve(revealedRoot);
+ return deferred<readonly DirEntry[]>().promise;
+ });
+
+ const view = renderHook(
+ ({ reveal }: { reveal: boolean }) =>
+ useFileTree({ workdir: '/workdir-second-prune', showIgnoredDirs: reveal }),
+ { initialProps: { reveal: false } },
+ );
+ await waitFor(() => expect(view.result.current.initialLoading).toBe(false));
+ await act(async () => {
+ view.rerender({ reveal: true });
+ });
+ await waitFor(() => expect(view.result.current.entries.get('')).toEqual(revealedRoot));
+ // 首次 root 成功已把 seeded 清掉(seeded 窗口结束)。
+ expect(view.result.current.expanded.has('packages/node_modules')).toBe(true);
+
+ // watch 事件触发第二次 root 刷新:此时 entries 里的 packages 列表仍是借来的
+ // 空列表,不得当剪枝证据剪掉 packages/node_modules 并覆盖持久记录(评审 P2)。
+ const emitEvent = mocks.eventCallbacks[mocks.eventCallbacks.length - 1];
+ await act(async () => {
+ emitEvent({ workdir: '/workdir-second-prune', relPath: 'other.md' });
+ await new Promise((resolve) => setTimeout(resolve, 70));
+ });
+ await waitFor(() =>
+ expect(mocks.listDir).toHaveBeenCalledWith(
+ expect.objectContaining({ relPath: '', showIgnoredDirs: true }),
+ ),
+ );
+ // eslint-disable-next-line no-console
+ console.log('PROBE listDir calls:', JSON.stringify(mocks.listDir.mock.calls.map((c) => [c[0].relPath, c[0].showIgnoredDirs])));
+ // eslint-disable-next-line no-console
+ console.log('PROBE expanded:', JSON.stringify([...view.result.current.expanded]));
+ // eslint-disable-next-line no-console
+ console.log('PROBE packages list:', JSON.stringify(view.result.current.entries.get('packages')));
+ expect(view.result.current.expanded.has('packages/node_modules')).toBe(true);
+ const revealWrites = mocks.saveExpandedSet.mock.calls
+ .filter(
+ (call) =>
+ (call[2] as { showIgnoredDirs?: boolean } | undefined)?.showIgnoredDirs === true,
+ )
+ .map((call) => call[1] as Set<string>);
+ expect(revealWrites.every((set) => set.has('packages/node_modules'))).toBe(true);
+
+ view.unmount();
+ });
+
+ it('切回隐藏态时继承的展开目录缺缓存要补拉,不能一直「展开但空白」', async () => {
+ const revealedRoot: readonly DirEntry[] = [
+ { name: 'src', relPath: 'src', type: 'directory', size: 0, mtimeMs: 1 },
+ ];
+ const hiddenRoot = revealedRoot;
+ const hiddenSrc: readonly DirEntry[] = [
+ { name: 'a.ts', relPath: 'src/a.ts', type: 'file', size: 1, mtimeMs: 2 },
+ ];
+ // 放行态 scope 持久化过 src 展开位;src 的列表请求挂在半路(切开关前未回)。
+ mocks.loadExpandedSet.mockImplementation(
+ (_workdir: string, opts?: { showIgnoredDirs?: boolean }) =>
+ opts?.showIgnoredDirs ? new Set(['src']) : new Set<string>(),
+ );
+ const revealSrcPending = deferred<readonly DirEntry[]>();
+ mocks.listDir.mockImplementation((args: { relPath?: string; showIgnoredDirs?: boolean }) => {
+ const root = (args.relPath ?? '') === '';
+ if (args.showIgnoredDirs) {
+ if (root) return Promise.resolve(revealedRoot);
+ return revealSrcPending.promise;
+ }
+ if (root) return Promise.resolve(hiddenRoot);
+ return Promise.resolve(hiddenSrc);
+ });
+
+ const view = renderHook(
+ ({ reveal }: { reveal: boolean }) =>
+ useFileTree({ workdir: '/workdir-missing-cache', showIgnoredDirs: reveal }),
+ { initialProps: { reveal: true } },
+ );
+ // root 落地即可(src 的列表还挂在半路,所以 initialLoading 还不会落定)。
+ await waitFor(() => expect(view.result.current.entries.get('')).toEqual(revealedRoot));
+ expect(view.result.current.entries.has('src')).toBe(false); // 列表还在半路
+
+ // 关开关:隐藏态 store 种子继承 src 展开位但没有它的缓存。
+ await act(async () => {
+ view.rerender({ reveal: false });
+ });
+ // 补拉:缺缓存的继承目录要发一次隐藏态 listDir(评审 P1)。
+ await waitFor(() =>
+ expect(mocks.listDir).toHaveBeenCalledWith(
+ expect.objectContaining({ relPath: 'src', showIgnoredDirs: false }),
+ ),
+ );
+ await act(async () => {
+ revealSrcPending.resolve(hiddenSrc);
+ await Promise.resolve();
+ });
+ await waitFor(() => expect(view.result.current.entries.get('src')).toEqual(hiddenSrc));
+ expect(view.result.current.expanded.has('src')).toBe(true);
+
+ // 收尾:把挂着的放行态 src 请求放掉,避免悬挂 promise 噪音。
+ await act(async () => {
+ revealSrcPending.resolve(hiddenSrc);
+ await Promise.resolve();
+ });
+ view.unmount();
+ });
+
/**
* 评审 P1:被忽略目录嵌在已展开的普通目录下时(`packages/foo/node_modules`),
* 只滤根列表的实现会把它一直留在展开的父目录下 —— 而且 prune 拿过期的 reveal
diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts
index dd6d4b3d8d..bbad6e60bf 100644
--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts
@@ -210,6 +210,10 @@ interface FileTreeStore {
/** 本 store 的 entries 是否还是从兄弟 scope **借来**的 seed 数据(切换开关的
* 过渡窗口)。借来的树一旦根请求失败就不代表当前视图,留着会让失败看起来像
* 加载成功(评审 P2)。 */
+ /** seed 窗口里仍属「借来的」条目路径:这些列表不能当剪枝证据 —— 借来的列表
+ * 缺路径 ≠ 本 scope 的展开位过期(评审 P2:第二次 root 刷新借种子子列表剪掉
+ * 并覆盖持久记录)。真实列表每次落地时逐路径移除,清空后恢复精确剪枝。 */
+ borrowedDirs: Set<string>;
seeded: boolean;
/** 本 scope **自己持久化过**的展开位(创建时从 localStorage 读出的那份)。
* seed 窗口收尾的 root 剪枝要继续豁免它们:那时子目录列表可能还是兄弟 scope
@@ -376,7 +380,12 @@ function pruneExpandedForCurrentTree(
let parent = ROOT_KEY;
for (const part of parts) {
const list = store.snapshot.entries.get(parent);
+ // 没有列表,或(ROOT 以下的)列表还是 seed 借来的:证据不足,宁可保留
+ // (借来的子列表缺路径 ≠ 本 scope 的展开位过期;真实列表落地后这段自然
+ // 恢复精确判断。root 例外:创建期首剪正是靠借来的 root 列表裁掉 reveal-only
+ // 顶层目录,且 root 请求通常最先落地,语义保持不变)。
if (!list) return true;
+ if (parent !== ROOT_KEY && store.borrowedDirs.has(parent)) return true;
const child = parent === ROOT_KEY ? part : `${parent}/${part}`;
if (!list.some((entry) => entry.relPath === child)) return false;
parent = child;
@@ -420,6 +429,9 @@ function getOrCreateStore(opts: Required<UseFileTreeOptions>): FileTreeStore {
hideMetaFiles: opts.hideMetaFiles,
docMode: opts.docMode,
showIgnoredDirs: opts.showIgnoredDirs,
+ borrowedDirs: new Set(
+ seedDisplayable && seed ? seed.entries.keys() : [],
+ ),
snapshot:
seedDisplayable && seed
? {
@@ -481,6 +493,9 @@ async function fetchDirOnce(store: FileTreeStore, relPath: string): Promise<void
showIgnoredDirs: store.showIgnoredDirs,
});
if (store.tokens.get(relPath) !== myToken) return; // stale
+ // 这份列表已是本 store 自己请求的真实数据:从「借来的」证据集合里摘除,
+ // 之后 prune 恢复用它做精确可达性判断(见 borrowedDirs 注释)。
+ store.borrowedDirs.delete(relPath);
if (store.snapshot.loadError) {
store.snapshot = { ...store.snapshot, loadError: null };
}
@@ -674,7 +689,13 @@ async function initStore(store: FileTreeStore): Promise<void> {
const inheritedExpanded = [...store.snapshot.expanded].filter(
(p) => p !== ROOT_KEY && !restored.has(p),
);
- const refetchInherited = store.showIgnoredDirs ? inheritedExpanded : [];
+ // reveal 方向全量重拉(旧 matcher 的列表缺被忽略目录);hidden 方向的种子已由
+ // filterSeedTreeForHiddenView 就地滤过、缓存齐备,但「展开请求还在半路就切开关」
+ // 的目录在种子快照里没有缓存(旧请求只会写回旧 store),不补拉会一直「展开但
+ // 空白」(评审 P1)—— 只补拉缺缓存的目录。
+ const refetchInherited = store.showIgnoredDirs
+ ? inheritedExpanded
+ : inheritedExpanded.filter((p) => !store.snapshot.entries.has(p));
invalidateBorrowedCollapsedEntries(store);
await Promise.all([
fetchDir(store, ROOT_KEY),