用户实测反馈:
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)
211 lines
8.1 KiB
TypeScript
211 lines
8.1 KiB
TypeScript
/**
|
|
* FileTree drag-drop surface: an OS file drag over the tree shows the
|
|
* portaled drop zone (document.body, above DSH's z-1000 page mask) with the
|
|
* hint pill docked at the bottom; row hovers retarget the drop directory.
|
|
* The enter/leave DEPTH COUNTER is the regression guard for the mask
|
|
* flicker: child-element transitions must never hide the zone mid-drag —
|
|
* only the drag actually leaving the tree does. Drops report through
|
|
* onUploadRequest (file rows target their parent directory) and reset all
|
|
* drag state.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { beforeAll, beforeEach, 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'
|
|
import { TAB_DRAG_TYPE } from '../src/client/TabBar.tsx'
|
|
import type { UploadItem } from '../src/client/upload.ts'
|
|
|
|
// 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 hint assertions are
|
|
// deterministic regardless of the developer machine.
|
|
beforeAll(() => {
|
|
Object.defineProperty(window.navigator, 'language', { value: 'en-US', configurable: true })
|
|
})
|
|
|
|
vi.mock('../src/client/api.ts', () => ({
|
|
api: {
|
|
fsTrees: async (_scope: unknown, paths: readonly string[]) => ({
|
|
levels: paths.map(path => ({ path, entries: [
|
|
{ name: 'src', path: '/tmp/src', isDir: true },
|
|
{ name: 'a.ts', path: '/tmp/a.ts', isDir: false },
|
|
], truncated: false })),
|
|
}),
|
|
// The tree reads the shared git-status store; a non-repo answer keeps
|
|
// every row plain (this spec is about the drop surface).
|
|
gitStatus: async () => ({ isRepo: false, entries: [] }),
|
|
},
|
|
downloadUrl: () => '/sidebar/file',
|
|
}))
|
|
|
|
interface Harness {
|
|
container: HTMLDivElement
|
|
body: HTMLElement
|
|
uploads: { dir: string; items: UploadItem[] }[]
|
|
unmount: () => void
|
|
}
|
|
|
|
/** Mount the tree rooted at /tmp (one level loaded: dir 'src', file 'a.ts'). */
|
|
async function mountTree(busy = false): Promise<Harness> {
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root: Root = createRoot(container)
|
|
const uploads: { dir: string; items: UploadItem[] }[] = []
|
|
await act(async () => {
|
|
root.render(createElement(FileTree, {
|
|
sessionId: 's1',
|
|
cwd: '/tmp',
|
|
expanded: [],
|
|
revealed: [],
|
|
onToggle: () => {},
|
|
onOpenFile: () => {},
|
|
onReferenceFile: () => {},
|
|
refreshTick: 0,
|
|
onUploadRequest: (dir, items) => { uploads.push({ dir, items }) },
|
|
busy,
|
|
}))
|
|
})
|
|
return {
|
|
container,
|
|
body: container.firstElementChild as HTMLElement,
|
|
uploads,
|
|
unmount: () => { act(() => { root.unmount() }) },
|
|
}
|
|
}
|
|
|
|
/** A bubbling drag event carrying a stub dataTransfer (jsdom has no DragEvent). */
|
|
function dragEvent(type: string, dataTypes: string[] = ['Files']): Event {
|
|
const event = new Event(type, { bubbles: true, cancelable: true })
|
|
Object.defineProperty(event, 'dataTransfer', {
|
|
// No entry API on the items, so drops fall back to the flat file list.
|
|
value: {
|
|
types: dataTypes,
|
|
items: [],
|
|
files: [new File(['x'], 'dropped.txt')],
|
|
dropEffect: '',
|
|
},
|
|
})
|
|
return event
|
|
}
|
|
|
|
/** Dispatch inside act() so React flushes the state update. */
|
|
function fire(target: Element, type: string, dataTypes?: string[]): Event {
|
|
const event = dragEvent(type, dataTypes)
|
|
act(() => { target.dispatchEvent(event) })
|
|
return event
|
|
}
|
|
|
|
const dropZone = (): HTMLElement | null => document.body.querySelector<HTMLElement>('[class*="uploadDropZone"]')
|
|
|
|
/** The row whose label text matches (rows are role="button" divs). */
|
|
function rowByName(container: HTMLElement, name: string): HTMLElement {
|
|
const row = [...container.querySelectorAll<HTMLElement>('[role="button"]')]
|
|
.find(el => el.querySelector('[class*="explorerName"]')?.textContent === name)
|
|
if (row === undefined) throw new Error(`row not found: ${name}`)
|
|
return row
|
|
}
|
|
|
|
describe('FileTree drag-drop surface', () => {
|
|
let harness: Harness
|
|
beforeEach(async () => {
|
|
harness = await mountTree()
|
|
})
|
|
afterEach(() => {
|
|
harness.unmount()
|
|
document.body.innerHTML = ''
|
|
})
|
|
|
|
it('shows the portaled drop zone with the generic hint while a file drag hovers the tree', () => {
|
|
expect(dropZone()).toBeNull()
|
|
fire(harness.body, 'dragenter')
|
|
const zone = dropZone()
|
|
expect(zone).not.toBeNull()
|
|
expect(zone!.parentElement).toBe(document.body)
|
|
expect(zone!.textContent).toContain('Drop files/folders here to upload')
|
|
// jsdom's rects are all-zero, so the left space is 0px wide and the
|
|
// chat-area hint is skipped (its floor is 200px).
|
|
expect(document.body.querySelector('[class*="uploadDropChatHint"]')).toBeNull()
|
|
})
|
|
|
|
it('keeps the zone through child-element transitions and hides it only when the drag leaves the tree', () => {
|
|
const file = rowByName(harness.container, 'a.ts')
|
|
fire(harness.body, 'dragenter') // depth 1
|
|
fire(file, 'dragenter') // bubbles: depth 2 (entered the row)
|
|
fire(file, 'dragleave') // bubbles: depth 1 — a child transition must not hide the zone
|
|
expect(dropZone()).not.toBeNull()
|
|
fire(harness.body, 'dragleave') // depth 0: the drag left the tree
|
|
expect(dropZone()).toBeNull()
|
|
})
|
|
|
|
it('retargets the pill to the hovered directory row and back to the root over gaps', () => {
|
|
const dir = rowByName(harness.container, 'src')
|
|
fire(harness.body, 'dragenter')
|
|
fire(dir, 'dragover')
|
|
expect(dropZone()!.textContent).toContain('Upload into /tmp/src')
|
|
expect(dir.className).toContain('explorerRowDropTarget')
|
|
fire(harness.body, 'dragover') // a non-row region: back to the workspace root
|
|
expect(dropZone()!.textContent).toContain('Drop files/folders here to upload')
|
|
expect(dir.className).not.toContain('explorerRowDropTarget')
|
|
})
|
|
|
|
it('drops onto a file row upload into its parent directory and reset the drag state', async () => {
|
|
const file = rowByName(harness.container, 'a.ts')
|
|
fire(harness.body, 'dragenter')
|
|
const drop = fire(file, 'drop')
|
|
// The payload collection is async (entry traversal); flush the then.
|
|
await act(async () => {})
|
|
expect(drop.defaultPrevented).toBe(true)
|
|
expect(harness.uploads).toHaveLength(1)
|
|
expect(harness.uploads[0]!.dir).toBe('/tmp')
|
|
expect(harness.uploads[0]!.items.map(item => item.relativePath)).toEqual(['dropped.txt'])
|
|
expect(dropZone()).toBeNull()
|
|
})
|
|
|
|
it('drops onto the tree body upload into the workspace root', async () => {
|
|
fire(harness.body, 'dragenter')
|
|
fire(harness.body, 'drop')
|
|
await act(async () => {})
|
|
expect(harness.uploads).toHaveLength(1)
|
|
expect(harness.uploads[0]!.dir).toBe('/tmp')
|
|
})
|
|
|
|
it('suppresses the affordance while an upload is in flight', async () => {
|
|
harness.unmount()
|
|
document.body.innerHTML = ''
|
|
const busyHarness = await mountTree(true)
|
|
fire(busyHarness.body, 'dragenter')
|
|
fire(busyHarness.body, 'dragover')
|
|
expect(dropZone()).toBeNull()
|
|
fire(busyHarness.body, 'drop')
|
|
await act(async () => {})
|
|
expect(busyHarness.uploads).toHaveLength(0)
|
|
busyHarness.unmount()
|
|
})
|
|
|
|
it('ignores an in-app tab drag: no upload drop zone and events pass through', () => {
|
|
const enter = fire(harness.body, 'dragenter', [TAB_DRAG_TYPE])
|
|
expect(enter.defaultPrevented).toBe(false)
|
|
expect(dropZone()).toBeNull()
|
|
const over = fire(harness.body, 'dragover', [TAB_DRAG_TYPE])
|
|
expect(over.defaultPrevented).toBe(false)
|
|
expect(dropZone()).toBeNull()
|
|
// A row hover must not retarget the drop directory either.
|
|
const dir = rowByName(harness.container, 'src')
|
|
const rowOver = fire(dir, 'dragover', [TAB_DRAG_TYPE])
|
|
expect(rowOver.defaultPrevented).toBe(false)
|
|
expect(dir.className).not.toContain('explorerRowDropTarget')
|
|
})
|
|
|
|
it('passes an in-app tab drop through without reporting an upload', async () => {
|
|
const drop = fire(harness.body, 'drop', [TAB_DRAG_TYPE])
|
|
await act(async () => {})
|
|
expect(drop.defaultPrevented).toBe(false)
|
|
expect(harness.uploads).toHaveLength(0)
|
|
expect(dropZone()).toBeNull()
|
|
})
|
|
})
|