fix(sidebar): 二轮独立验证的 9 项缺陷 + 目录级暂存

verifier 二轮报告（F1–F9）全部修复，每条都有「临时回退即变红」的判别性验证： - F1【高】中文等非 latin1 下载名 → 真实宿主 500：content-disposition 改用 RFC 5987（ASCII 回退 + filename*=UTF-8''）；补真 node:http 用例与根因对照断言 - F2【中】多选同名文件归档重名（解压互相覆盖）：冲突项逐级上溯父目录消歧 - F3【中低】maxBytes 在读完之后才判定；budget<=0 的 0 字节 FIFO 会永久阻塞：改为先 stat、读取前拒绝（FIFO 探针验证） - F4【中低】SSH 模式 + 宿主不可用时 reveal 整条消失：保留 kind==='reveal' 目标 - F5【低】图钉嵌套交互语义非法且键盘不可达：改为诚实的鼠标热区，键盘入口归设置面板 - F6【低】变更树空闲 tick 全量重渲染：行 memo + 恒定 props + 内容键派生 + 共享 store 的 sameStatus 保住快照身份 - F7【低】排序随运行时 locale 漂移：显式 'en' collation + 码点兜底 - F8【低】POSIX 文件名的反斜杠被当成层级：不再替换 - F9【低】打包中重复点击静默、无反馈：busy 行（role=status）+ in-flight 守卫 - 新增：目录行「暂存/取消暂存该目录」（git pathspec 语义，不触发折叠）验证：typecheck / lint / test（134 文件 1441 通过）/ build 全绿； DSH_CMD='npx -y --package @deepseek-ai/dsh@0.1.7-rc.1 dsh' pnpm test:mount 7/7 通过
2026-09-28 18:20:08 +08:00
parent b011be1e98
commit 13d4bae321
17 changed files with 846 additions and 127 deletions
@@ -17,7 +17,9 @@ import { act } from 'react-dom/test-utils'
 import { GitLens } from '../src/client/changes/GitLens.tsx'
 import { createSidebarStore } from '../src/client/state.ts'
 import { api, type GitLogEntry, type GitStatusResult, type GitWorktree } from '../src/client/api.ts'
+import type { BetterSidebarService } from '../src/client/service.ts'
 import { t } from '../src/client/locales.ts'
+import type { Context } from '../src/context-types.ts'

 import { setupReactAct } from './test-utils.ts'
 setupReactAct()
@@ -70,7 +72,12 @@ async function flushEffects(): Promise<void> {
 *  — the shared status store only polls/loads while a consumer is on screen. */
 function mountGit(
  root: Root,
-  options: { scope?: { sessionId: string; cwd?: string }; refreshTick?: number; visible?: boolean } = {},
+  options: {
+    scope?: { sessionId: string; cwd?: string }
+    refreshTick?: number
+    visible?: boolean
+    ctx?: Context
+  } = {},
 ): void {
  act(() => {
    root.render(createElement(GitLens, {
@@ -81,6 +88,7 @@ function mountGit(
      selectedRef: null,
      visible: options.visible ?? true,
      refreshTick: options.refreshTick ?? 0,
+      ...(options.ctx === undefined ? {} : { ctx: options.ctx }),
    }))
  })
 }
@@ -538,10 +546,14 @@ describe('GitLens (changes tab, git lens) change tree', () => {
      expect(unstaged.querySelector('[data-count]')?.textContent).toBe('2')
      expect(staged.querySelector('[data-count]')?.textContent).toBe('1')

-      const stageAll = unstaged.querySelector<HTMLButtonElement>(`button[aria-label="${t('stageAll')}"]`)
-      const unstageAll = staged.querySelector<HTMLButtonElement>(`button[aria-label="${t('unstageAll')}"]`)
-      expect(stageAll).not.toBeNull()
-      expect(unstageAll).not.toBeNull()
+      // The band's own action is the one that is NOT inside a row (directory
+      // rows carry the same "Stage all" label for their own subtree).
+      const stageAll = [...unstaged.querySelectorAll<HTMLButtonElement>(`button[aria-label="${t('stageAll')}"]`)]
+        .find(button => button.closest('[data-row]') === null)
+      const unstageAll = [...staged.querySelectorAll<HTMLButtonElement>(`button[aria-label="${t('unstageAll')}"]`)]
+        .find(button => button.closest('[data-row]') === null)
+      expect(stageAll).not.toBeUndefined()
+      expect(unstageAll).not.toBeUndefined()

      const stage = vi.spyOn(api, 'gitStage').mockResolvedValue({ ok: true })
      await act(async () => { stageAll!.click() })
@@ -553,4 +565,110 @@ describe('GitLens (changes tab, git lens) change tree', () => {
      container.remove()
    }
  })
+
+  it('stages and unstages a whole directory from its row action', async () => {
+    const { container, root } = makeRoot()
+    try {
+      await mountTree(container, root, [
+        { path: 'src/deep/a.ts', xy: ' M' }, // unstaged → the 'src/deep' row
+        { path: 'docs/b.md', xy: 'M ' }, // staged → the 'docs' row
+      ])
+      const stage = vi.spyOn(api, 'gitStage').mockResolvedValue({ ok: true })
+      const unstage = vi.spyOn(api, 'gitUnstage').mockResolvedValue({ ok: true })
+
+      const dirAction = (path: string, label: string): HTMLButtonElement => {
+        const row = container.querySelector<HTMLElement>(`[data-row="${path}"]`)
+        expect(row).not.toBeNull()
+        const button = row!.querySelector<HTMLButtonElement>(`button[aria-label="${label}"]`)
+        expect(button).not.toBeNull()
+        return button!
+      }
+
+      const unstagedDir = dirAction('src/deep', t('stageAll'))
+      await act(async () => { unstagedDir.click() })
+      await flushEffects()
+      // The directory path stages the whole subtree (`git add -A -- <dir>`).
+      expect(stage).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 'session' }), 'src/deep', MAIN)
+
+      const stagedDir = dirAction('docs', t('unstageAll'))
+      await act(async () => { stagedDir.click() })
+      await flushEffects()
+      expect(unstage).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 'session' }), 'docs', MAIN)
+
+      // Neither click folded its row: the action is a sibling of the
+      // disclosure button (and stops propagation anyway).
+      expect(container.querySelector('button[data-dir="src/deep"]')!.getAttribute('aria-expanded')).toBe('true')
+      expect(container.querySelector('button[data-path="src/deep/a.ts"]')).not.toBeNull()
+      expect(container.querySelector('button[data-dir="docs"]')!.getAttribute('aria-expanded')).toBe('true')
+    } finally {
+      act(() => { root.unmount() })
+      container.remove()
+    }
+  })
+
+  it('resolves no icon for a status poll whose change list did not change', async () => {
+    vi.useFakeTimers()
+    const fileIcons: string[] = []
+    const folderIcons: string[] = []
+    /** The icon resolvers are the re-render probe: they run inside the rows,
+     *  so one entry per call means one row actually re-rendered. */
+    const service = {
+      subscribe: () => () => {},
+      fileIcon: (path: string) => { fileIcons.push(path); return null },
+      folderIcon: (path: string, open: boolean) => { folderIcons.push(`${path}:${String(open)}`); return null },
+    } as unknown as BetterSidebarService
+    const ctx = { get: (name: string) => (name === 'betterSidebar' ? service : undefined) } as unknown as Context
+
+    const { container, root } = makeRoot()
+    try {
+      vi.spyOn(api, 'gitWorktrees').mockResolvedValue([{ path: MAIN, branch: 'main', current: true, changes: 2 }])
+      // Every poll answers with a fresh object and a fresh entries array (the
+      // store's real shape). The FIRST answer carries no repository list and
+      // the later ones do — a field OUTSIDE the change list moves, so the store
+      // cannot preserve the snapshot identity and hands the lens a new array
+      // whose content is equal. Only the CONTENT key plus the memoized rows
+      // hold there; identity alone would rebuild the tree and re-render rows.
+      let poll = 0
+      vi.spyOn(api, 'gitStatus').mockImplementation(async () => {
+        poll += 1
+        return {
+          isRepo: true,
+          branch: 'main',
+          ...(poll === 1 ? {} : { repositories: [MAIN] }),
+          // One compressed directory row (folder icon) + its two file rows.
+          entries: [{ path: 'src/deep/a.ts', xy: ' M' }, { path: 'src/deep/b.ts', xy: ' M' }],
+        }
+      })
+      vi.spyOn(api, 'gitBranch').mockResolvedValue({ current: 'main', names: ['main'] })
+      vi.spyOn(api, 'gitLog').mockResolvedValue([])
+
+      mountGit(root, { ctx })
+      await flushEffects()
+      expect(fileIcons).toEqual(['src/deep/a.ts', 'src/deep/b.ts'])
+      expect(folderIcons).toEqual(['src/deep:true'])
+
+      fileIcons.length = 0
+      folderIcons.length = 0
+      // Tick 1: a NEW snapshot object with an equal-content change list.
+      await act(async () => { await vi.advanceTimersByTimeAsync(2_600) })
+      await flushEffects()
+      expect(fileIcons).toEqual([])
+      expect(folderIcons).toEqual([])
+
+      fileIcons.length = 0
+      folderIcons.length = 0
+      // Tick 2: a byte-identical answer (the store reuses the snapshot object).
+      await act(async () => { await vi.advanceTimersByTimeAsync(2_600) })
+      await flushEffects()
+      expect(fileIcons).toEqual([])
+      expect(folderIcons).toEqual([])
+      // The probe measured stability, not loss: every row is still there.
+      expect(container.querySelectorAll('[data-path]')).toHaveLength(2)
+      expect(container.querySelectorAll('button[data-dir="src/deep"]')).toHaveLength(1)
+    } finally {
+      act(() => { root.unmount() })
+      container.remove()
+      vi.useRealTimers()
+    }
+  })
 })