用户实测反馈:
1) `/sidebar/api/fs.tree` 性能极差 —— 先测后改(10k 条目目录、热缓存、中位数):
- 冷调用 cap=1000:22.76ms → **3.77ms**;TTL 内重复:≈23ms → **0.000ms**
- 改法:opendir for-await → readdir(withFileTypes) 一次取回;只为 cap 条建行
(slice + 定长数组);路径用字符串拼接而非 path.join;排序弃 localeCompare
(14.6ms/10k → 0.35ms)改小写比较 + 原名码点兜底;新增 1.5s 目录级缓存
(键 绝对路径\0cap,上限 512),由 fs.write/rename/remove/mkdir/upload 与
fs-watch 的变更通知显式失效
- 契约逐字不变;新增 tests/fs-tree.spec.ts 6 例 + fs-watch 失效用例(判别性验证)
2) 删除工作区路径检测(默认不检测、放开权限):
- path-security 变纯词法解析(realpath/包含性判定删除)、fs-operations 去 fence
分支、所有 fs 路由不再读 fence、403 分支消失、config 删 workspaceFence 字段
(schemastery 容忍未知键,旧 profile 不会加载失败)、settings 开关删除
- ⚠️ 安全影响:插件 fs 路由(tree/read/write/rename/remove/mkdir/媒体/HTML/
upload/archive)现在可读写宿主用户可访问的任意路径,只受 OS 权限约束;
指南 §8.1 已加醒目声明
- 死代码清理:FenceErrorNotice 组件 + EditorHost 分支 + 4 个词条(settingsFence*、
fenceErrorReason、fenceDisableAction)+ isOutsideWorkspace* 助手 + TreePanel 的
store prop + 相关 CSS 块
3) 批量列举路由 `fs.trees`(单层失败只在该层带 error)+ 客户端批量加载:
挂载/刷新时的 N+1 请求变为 1 个(8 个展开目录:9 → 1,探针断言)
refreshTick 不再先清缓存(旧行保留到新答案;失败保留旧行 + warn 提示)
4) 修复「关闭文件后返回文件树,展开状态被重置」:
原生承载面的展开集合原来存在每个 tab 的记录里(drop 即丢),改为**每会话状态**
的投影(ensure 从会话态读、toggleExpanded 写回会话态、registerNativeSurface 用
attachStore 订阅);同一会话多 tab 共享、不同会话隔离;revealed 保持 per-tab
验证:typecheck / lint / test(136 文件 / 1484 通过 / 9 跳过)/ build 全绿;
DSH_CMD='npx -y --package @deepseek-ai/dsh@0.1.7-rc.1 dsh' pnpm test:mount 7/7 通过;
版本镜像同步(dsh.plugin.json + SIDEBAR_SERVICE_VERSION)
232 lines
9.3 KiB
TypeScript
232 lines
9.3 KiB
TypeScript
/**
|
|
* FileTree explorer mutations: the context menu's rename (inline row editor)
|
|
* and delete (confirmation modal) — menu-item visibility (never on the
|
|
* workspace root row), the commit/cancel flows, the API calls with the row
|
|
* path, the tab-reconciliation callbacks, and the failure strip.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { beforeAll, afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement } from 'react'
|
|
import { createRoot, type Root } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
import { FileTree } from '../src/client/FileTree.tsx'
|
|
|
|
// The act() environment flag (React 18.2 reads it before flushing effects).
|
|
import { setupReactAct } from './test-utils.ts'
|
|
setupReactAct()
|
|
|
|
// vitest 4.1.11+ follows the OS locale; pin en-US so menu copy is English.
|
|
beforeAll(() => {
|
|
Object.defineProperty(window.navigator, 'language', { value: 'en-US', configurable: true })
|
|
})
|
|
|
|
// vi.mock factories are hoisted above every declaration, so the shared
|
|
// mocks ride vi.hoisted (mockClear in afterEach keeps the implementations).
|
|
const { fsRename, fsRemove } = vi.hoisted(() => ({
|
|
fsRename: vi.fn(async () => ({ path: '/tmp/renamed.ts' })),
|
|
fsRemove: vi.fn(async () => ({ path: '/tmp/a.ts' })),
|
|
}))
|
|
|
|
vi.mock('../src/client/api.ts', () => ({
|
|
api: {
|
|
fsTrees: async (_scope: unknown, paths: readonly string[]) => ({
|
|
levels: paths.map(path => ({ path, entries: [
|
|
{ name: 'a.ts', path: '/tmp/a.ts', isDir: false },
|
|
{ name: 'sub', path: '/tmp/sub', isDir: true },
|
|
], truncated: false })),
|
|
}),
|
|
fsRename,
|
|
fsRemove,
|
|
// The tree reads the shared git-status store; a non-repo answer keeps
|
|
// every row plain (this spec is about rename/delete).
|
|
gitStatus: async () => ({ isRepo: false, entries: [] }),
|
|
},
|
|
downloadUrl: () => '/sidebar/file',
|
|
isOutsideWorkspaceMessage: () => false,
|
|
}))
|
|
|
|
interface Harness {
|
|
container: HTMLDivElement
|
|
onPathRenamed: ReturnType<typeof vi.fn>
|
|
onPathDeleted: ReturnType<typeof vi.fn>
|
|
unmount: () => void
|
|
}
|
|
|
|
async function mountTree(): Promise<Harness> {
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root: Root = createRoot(container)
|
|
const onPathRenamed = vi.fn()
|
|
const onPathDeleted = vi.fn()
|
|
await act(async () => {
|
|
root.render(createElement(FileTree, {
|
|
sessionId: 's1',
|
|
cwd: '/tmp',
|
|
expanded: [],
|
|
revealed: [],
|
|
onToggle: () => {},
|
|
onOpenFile: () => {},
|
|
onOpenFileNewTab: () => {},
|
|
onOpenFileSide: () => {},
|
|
onReferenceFile: () => {},
|
|
onPathRenamed,
|
|
onPathDeleted,
|
|
refreshTick: 0,
|
|
onUploadRequest: () => {},
|
|
busy: false,
|
|
}))
|
|
})
|
|
return {
|
|
container,
|
|
onPathRenamed,
|
|
onPathDeleted,
|
|
unmount: () => { act(() => { root.unmount() }) },
|
|
}
|
|
}
|
|
|
|
/** One tree row by its displayed name (the root row included; it carries no
|
|
* role="button", so the query rides the row class). */
|
|
function rowByName(container: HTMLDivElement, name: string): HTMLElement {
|
|
const row = [...container.querySelectorAll<HTMLElement>('[class*="explorerRow"]')]
|
|
.find(el => el.querySelector('[class*="explorerName"]')?.textContent === name)
|
|
if (row === undefined) throw new Error(`row "${name}" not found`)
|
|
return row
|
|
}
|
|
|
|
function openMenu(container: HTMLDivElement, name: string): void {
|
|
const event = new MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 20, clientY: 30 })
|
|
act(() => { rowByName(container, name).dispatchEvent(event) })
|
|
}
|
|
|
|
function menuLabels(): string[] {
|
|
return [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')].map(item => item.textContent ?? '')
|
|
}
|
|
|
|
function clickMenuitem(label: string): void {
|
|
const item = [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')].find(el => el.textContent === label)
|
|
if (item === undefined) throw new Error(`menuitem "${label}" not found`)
|
|
act(() => { item.click() })
|
|
}
|
|
|
|
/** Set a controlled input's value the React way (native setter + input). */
|
|
function setNativeValue(el: HTMLInputElement, value: string): void {
|
|
const setter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value')?.set
|
|
if (setter === undefined) throw new Error('no native value setter')
|
|
setter.call(el, value)
|
|
el.dispatchEvent(new Event('input', { bubbles: true }))
|
|
}
|
|
|
|
function pressKey(el: HTMLElement, key: string): void {
|
|
el.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true, cancelable: true }))
|
|
}
|
|
|
|
let harness: Harness
|
|
afterEach(() => {
|
|
harness.unmount()
|
|
document.body.innerHTML = ''
|
|
fsRename.mockClear()
|
|
fsRemove.mockClear()
|
|
})
|
|
|
|
describe('FileTree rename/delete menu items', () => {
|
|
it('offers rename and delete on file and directory rows, never on the root', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
expect(menuLabels()).toContain('Rename')
|
|
expect(menuLabels()).toContain('Delete')
|
|
openMenu(harness.container, 'sub')
|
|
expect(menuLabels()).toContain('Rename')
|
|
// The workspace root row (cwd itself) is the session — no mutations.
|
|
openMenu(harness.container, 'tmp')
|
|
expect(menuLabels()).not.toContain('Rename')
|
|
expect(menuLabels()).not.toContain('Delete')
|
|
})
|
|
})
|
|
|
|
describe('FileTree inline rename', () => {
|
|
it('replaces the row with a prefilled editor; Enter commits via fsRename + onPathRenamed', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
clickMenuitem('Rename')
|
|
const input = harness.container.querySelector<HTMLInputElement>('input[class*="explorerRenameInput"]')
|
|
expect(input).not.toBeNull()
|
|
expect(input!.value).toBe('a.ts')
|
|
setNativeValue(input!, 'b.ts')
|
|
await act(async () => { pressKey(input!, 'Enter') })
|
|
expect(fsRename).toHaveBeenCalledWith({ sessionId: 's1', cwd: '/tmp' }, '/tmp/a.ts', 'b.ts')
|
|
expect(harness.onPathRenamed).toHaveBeenCalledWith('/tmp/a.ts', '/tmp/renamed.ts')
|
|
// The editor row is gone (the commit closed it).
|
|
expect(harness.container.querySelector('input[class*="explorerRenameInput"]')).toBeNull()
|
|
})
|
|
|
|
it('Escape cancels without touching the API', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
clickMenuitem('Rename')
|
|
const input = harness.container.querySelector<HTMLInputElement>('input[class*="explorerRenameInput"]')!
|
|
setNativeValue(input, 'b.ts')
|
|
await act(async () => { pressKey(input, 'Escape') })
|
|
expect(fsRename).not.toHaveBeenCalled()
|
|
expect(harness.onPathRenamed).not.toHaveBeenCalled()
|
|
expect(harness.container.querySelector('input[class*="explorerRenameInput"]')).toBeNull()
|
|
})
|
|
|
|
it('rejects separator names client-side with the error strip, no API call', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
clickMenuitem('Rename')
|
|
const input = harness.container.querySelector<HTMLInputElement>('input[class*="explorerRenameInput"]')!
|
|
setNativeValue(input, 'a/b.ts')
|
|
await act(async () => { pressKey(input, 'Enter') })
|
|
expect(fsRename).not.toHaveBeenCalled()
|
|
const alert = harness.container.querySelector('[role="alert"]')
|
|
expect(alert?.textContent).toContain('path separators')
|
|
})
|
|
})
|
|
|
|
describe('FileTree delete confirmation', () => {
|
|
it('confirms through the modal, then calls fsRemove + onPathDeleted', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
clickMenuitem('Delete')
|
|
const dialog = document.querySelector('[role="dialog"]')
|
|
expect(dialog?.textContent).toContain('Delete "a.ts"?')
|
|
expect(dialog?.textContent).toContain('permanently deletes the file')
|
|
const confirm = [...document.querySelectorAll<HTMLElement>('button')].find(el => el.textContent === 'Delete' && el.closest('[role="dialog"]') !== null)!
|
|
await act(async () => { confirm.click() })
|
|
expect(fsRemove).toHaveBeenCalledWith({ sessionId: 's1', cwd: '/tmp' }, '/tmp/a.ts')
|
|
expect(harness.onPathDeleted).toHaveBeenCalledWith('/tmp/a.ts', false)
|
|
expect(document.querySelector('[role="dialog"]')).toBeNull()
|
|
})
|
|
|
|
it('the directory copy names the recursive wipe', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'sub')
|
|
clickMenuitem('Delete')
|
|
const dialog = document.querySelector('[role="dialog"]')
|
|
expect(dialog?.textContent).toContain('everything inside it')
|
|
})
|
|
|
|
it('cancel closes the modal without calling anything', async () => {
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
clickMenuitem('Delete')
|
|
const cancel = [...document.querySelectorAll<HTMLElement>('button')].find(el => el.textContent === 'Cancel')!
|
|
act(() => { cancel.click() })
|
|
expect(fsRemove).not.toHaveBeenCalled()
|
|
expect(document.querySelector('[role="dialog"]')).toBeNull()
|
|
})
|
|
|
|
it('a server failure lands in the dismissable strip', async () => {
|
|
fsRemove.mockRejectedValueOnce(new Error('boom: refused'))
|
|
harness = await mountTree()
|
|
openMenu(harness.container, 'a.ts')
|
|
clickMenuitem('Delete')
|
|
const confirm = [...document.querySelectorAll<HTMLElement>('button')].find(el => el.textContent === 'Delete' && el.closest('[role="dialog"]') !== null)!
|
|
await act(async () => { confirm.click() })
|
|
const alert = harness.container.querySelector('[role="alert"]')
|
|
expect(alert?.textContent).toContain('boom: refused')
|
|
expect(harness.onPathDeleted).not.toHaveBeenCalled()
|
|
})
|
|
})
|