Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(workdir-browse): borrowedDirs 只在 reveal 方向豁免,隐藏方向不再保住被忽略目录(复审 P1)
Zhang Yunjinf2a0b026f2f4
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.tsxindex 59eb6d03f1..f8dd969eec 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@@ -597,6 +597,66 @@ describe('useFileTree showIgnoredDirs option', () => {view.unmount();});+ it('切回隐藏态:被忽略目录的展开位被剪掉,缺缓存补拉不再去扫它', async () => {+ const hiddenRoot: readonly DirEntry[] = [+ { name: 'packages', relPath: 'packages', type: 'directory', size: 0, mtimeMs: 1 },+ ];+ const hiddenPackages: readonly DirEntry[] = []; // 隐藏视图:node_modules 被滤掉+ 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']),+ );+ const revealNodeModules = deferred<readonly DirEntry[]>();+ mocks.listDir.mockImplementation((args: { relPath?: string; showIgnoredDirs?: boolean }) => {+ if (args.showIgnoredDirs) {+ if ((args.relPath ?? '') === '') return Promise.resolve(revealedRoot);+ if (args.relPath === 'packages') return Promise.resolve(revealedPackages);+ return revealNodeModules.promise; // node_modules 的列表挂在半路+ }+ if ((args.relPath ?? '') === '') return Promise.resolve(hiddenRoot);+ return Promise.resolve(hiddenPackages);+ });++ const view = renderHook(+ ({ reveal }: { reveal: boolean }) =>+ useFileTree({ workdir: '/workdir-hidden-prune', showIgnoredDirs: reveal }),+ { initialProps: { reveal: true } },+ );+ await waitFor(() => expect(view.result.current.entries.get('packages')).toEqual(revealedPackages));++ // 关开关:node_modules 是被忽略目录,隐藏视图里不可达 —— 借来的(已过滤)+ // packages 列表是权威证据,展开位要剪掉,也不能再为它补拉扫描(复审 P1)。+ await act(async () => {+ view.rerender({ reveal: false });+ });+ expect(view.result.current.expanded.has('packages/node_modules')).toBe(false);+ expect(+ mocks.listDir.mock.calls.some(+ (call) =>+ call[0].relPath === 'packages/node_modules' && call[0].showIgnoredDirs === false,+ ),+ ).toBe(false);++ // 收尾:放掉挂着的放行态请求。+ await act(async () => {+ revealNodeModules.resolve(hiddenPackages);+ await Promise.resolve();+ });+ view.unmount();+ });+it('切回隐藏态时继承的展开目录缺缓存要补拉,不能一直「展开但空白」', async () => {const revealedRoot: readonly DirEntry[] = [{ name: 'src', relPath: 'src', type: 'directory', size: 0, mtimeMs: 1 },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.tsindex bbad6e60bf..3712f3775c 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@@ -430,7 +430,12 @@ function getOrCreateStore(opts: Required<UseFileTreeOptions>): FileTreeStore {docMode: opts.docMode,showIgnoredDirs: opts.showIgnoredDirs,borrowedDirs: new Set(- seedDisplayable && seed ? seed.entries.keys() : [],+ // 只在 reveal 方向豁免:借来的 hidden 列表天然缺被忽略目录,缺路径 ≠+ // 过期(评审 P2)。hidden 方向的种子列表已按新视图就地过滤+ //(filterSeedTreeForHiddenView),对「隐藏视图可达与否」是权威证据 ——+ // 再豁免会把被剪掉的被忽略目录展开位保下来、还倒逼缺缓存补拉去扫它+ //(复审 P1)。+ seedDisplayable && seed && opts.showIgnoredDirs ? seed.entries.keys() : [],),snapshot:seedDisplayable && seed