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): seed 窗口收尾剪枝继续豁免本 scope 自己的持久展开位
Zhang Yunjin7cd0d091ea99
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 d30c57ac13..fbd109f02c 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@@ -446,6 +446,84 @@ describe('useFileTree showIgnoredDirs option', () => {view.unmount();});+ /**+ * 评审(切开关丢失展开记录):seed 窗口内 root 先回、子目录列表还是兄弟 scope+ * 借来的(借来的 `packages` 列表没有 node_modules)。此时收尾剪枝不得用借来的+ * 列表否定本 scope 自己持久化的 `packages/node_modules` 展开位 —— 否则它被剪掉+ * 并覆盖 localStorage,之后子目录响应只更新列表、不会恢复展开位。+ */+ it('seed 窗口 root 先回、子目录还是借来的列表时,保留本 scope 自己的展开位', 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,+ },+ ];+ // 放行态 scope 上次会话存过 packages/node_modules 展开位。+ mocks.loadExpandedSet.mockImplementation(+ (_workdir: string, opts?: { showIgnoredDirs?: boolean }) =>+ opts?.showIgnoredDirs ? new Set(['packages/node_modules']) : new Set<string>(),+ );+ // 挂住放行态的首次 root listDir(模拟 root 先于子目录数据就绪的窗口)。+ const pendingRevealRoot = deferred<readonly DirEntry[]>();+ let revealRootCalls = 0;+ mocks.listDir.mockImplementation((args: { relPath?: string; showIgnoredDirs?: boolean }) => {+ if (!args.showIgnoredDirs) {+ return Promise.resolve((args.relPath ?? '') === '' ? hiddenRoot : hiddenPackages);+ }+ if ((args.relPath ?? '') === '') {+ revealRootCalls += 1;+ return revealRootCalls === 1+ ? pendingRevealRoot.promise+ : Promise.resolve(revealedRoot);+ }+ return Promise.resolve(revealedPackages);+ });++ const view = renderHook(+ ({ reveal }: { reveal: boolean }) =>+ useFileTree({ workdir: '/workdir-seed-root-first', showIgnoredDirs: reveal }),+ { initialProps: { reveal: false } },+ );+ await waitFor(() => expect(view.result.current.initialLoading).toBe(false));++ await act(async () => {+ view.rerender({ reveal: true });+ });+ // seed 窗口内:创建时 creation prune 已用 keep 保住本 scope 的展开位。+ expect(view.result.current.expanded.has('packages/node_modules')).toBe(true);++ // root 这才返回(此时 entries 里的 packages 列表仍是借来的空列表)。+ await act(async () => {+ pendingRevealRoot.resolve(revealedRoot);+ await Promise.resolve();+ });+ await waitFor(() => expect(view.result.current.entries.get('')).toEqual(revealedRoot));++ // 借来的 packages 列表缺 node_modules ≠ 本 scope 的展开位过期:不得剪掉、+ // 不得覆盖持久记录。+ 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>);+ // 修好后的行为:借来的列表没有可剪的东西 → prune 早退、可能零回写;+ // 旧代码会剪掉并回写一份不含它的记录 —— 两种情况下这条都必须成立。+ expect(revealWrites.every((set) => set.has('packages/node_modules'))).toBe(true);++ view.unmount();+ });+/*** 评审 P1:被忽略目录嵌在已展开的普通目录下时(`packages/foo/node_modules`),* 只滤根列表的实现会把它一直留在展开的父目录下 —— 而且 prune 拿过期的 revealdiff --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 d83cc0c006..296858c37c 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@@ -215,6 +215,10 @@ interface FileTreeStore {* 过渡窗口)。借来的树一旦根请求失败就不代表当前视图,留着会让失败看起来像* 加载成功(评审 P2)。 */seeded: boolean;+ /** 本 scope **自己持久化过**的展开位(创建时从 localStorage 读出的那份)。+ * seed 窗口收尾的 root 剪枝要继续豁免它们:那时子目录列表可能还是兄弟 scope+ * 借来的,列表缺路径 ≠ 本 scope 的展开位过期(评审:切开关丢失展开记录)。 */+ readonly persistedExpanded: ReadonlySet<string>;/** 同一 relPath 的并发 listDir,latest 赢:每次开 listDir 前 bump,resolve* 时比对 —— 不一致就丢结果。 */tokens: Map<string, number>;@@ -457,6 +461,7 @@ function getOrCreateStore(opts: Required<UseFileTreeOptions>): FileTreeStore {loadError: null,},seeded: seedDisplayable && !!seed,+ persistedExpanded,tokens: new Map(),inFlight: new Map(),pendingEventParents: new Set(),@@ -499,12 +504,19 @@ async function fetchDirOnce(store: FileTreeStore, relPath: string): Promise<void// 根请求**成功**(无论后面是否结构等价而跳过替换)都代表「借来的树」窗口// 结束:之后任何一次根刷新失败都不能再把已属于本 scope 的树当成借来的清掉// (评审 P1;结构等价的路径同样要落定,否则会长久停在"借来"态)。+ // wasSeeded 必须在清标志前捕获:seed 窗口收尾的这次 root 剪枝,子目录列表+ // 可能还是兄弟 scope 借来的(root 先回、子目录后回)—— 借来的列表缺路径 ≠+ // 本 scope 的展开位过期,要继续豁免本 scope 自己的持久记录;等后续 root+ // 刷新(entries 已全属本 scope)再做精确剪枝(评审:切开关丢失展开记录)。+ const wasSeeded = store.seeded;if (relPath === ROOT_KEY) store.seeded = false;// 结构等价 → 跳过 setEntries,避免子组件无意义重渲(参见函数顶部注释)。// root 仍要 prune 一次:seed 的 root 可能与新 root 结构一致而展开态还是借的。const prevList = store.snapshot.entries.get(relPath);if (prevList && entriesStructurallyEqual(prevList, list)) {- if (relPath === ROOT_KEY) pruneExpandedForCurrentTree(store);+ if (relPath === ROOT_KEY) {+ pruneExpandedForCurrentTree(store, wasSeeded ? { keep: store.persistedExpanded } : undefined);+ }return;}const nextEntries = new Map(store.snapshot.entries);@@ -512,7 +524,9 @@ async function fetchDirOnce(store: FileTreeStore, relPath: string): Promise<voidstore.snapshot = { ...store.snapshot, entries: nextEntries };emit(store);// 过渡期(seed)借来的展开态在新树里可能已不可达,root 数据落地即剪。- if (relPath === ROOT_KEY) pruneExpandedForCurrentTree(store);+ if (relPath === ROOT_KEY) {+ pruneExpandedForCurrentTree(store, wasSeeded ? { keep: store.persistedExpanded } : undefined);+ }} catch (err) {log.warn(`listDir failed for ${relPath}`, err);// root 失败要可见:空树 + 无提示会被读成"项目是空的"。device-link 的