dsh-vscode-mode 0.14.12 → 0.14.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.14.12",
+  "version": "0.14.13",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 DSH 0.1.5+ 官方右侧 Sidebar 与对话同屏）+ 命令栏（Ctrl+Shift+P）与可扩展指令系统 + VS Code 兼容代码片段（.code-snippets 全局/项目，IntelliSense 展开）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ SVN 集成（侧栏变更面板/日志弹窗/并排差异）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车，界面状态（页签/光标/侧栏/编辑 Tab/导航历史）镜像到 DSH home 跨重启恢复",
   "icon": "assets/icon.svg",
   "keywords": [

package/src/client/sidebar/panels/FileExplorer.ts

@@ -24,6 +24,7 @@ import { Button } from '@deepseek-ai/dsh-client-ui-primitives'
 import { emitRefresh } from '../../events.js'
 import { svnOverlayEl, viewOverlayOf } from '../../ui/SvnOverlay.js'
 import { useExplorerSvn } from './useExplorerSvn.js'
+import { useExplorerReveal, treeRevealPath } from './useExplorerReveal.js'
 import type { SidebarCtx } from '../types.js'
 
 const DIR_CAP = 4000
@@ -31,10 +32,6 @@ const SAVE_DEBOUNCE_MS = 300
 const FOLLOW_INTERVAL_MS = 10_000
 const PREFETCH_MAX = 4
 const PREFETCH_EXCLUDED = new Set(['node_modules', '.git', '.hg', '.svn', '.pnpm', '.pnpm-store'])
-/** 「在资源管理器视图中显示」高亮时长与定位重试上限（目录懒加载需等待行渲染）。 */
-const REVEAL_HIGHLIGHT_MS = 2000
-const REVEAL_RETRY_MAX = 6
-const REVEAL_RETRY_MS = 120
 /** 外部文件变化重列去抖：一轮外部批量写入（如 agent 连写多文件）合并为一次重列。 */
 const FILE_CHANGE_DEBOUNCE_MS = 400
 
@@ -97,16 +94,6 @@ function rowView(props) {
 }
 const ExplorerRow = React.memo(rowView)
 
-/**
- * 转义 CSS 属性选择器的值（路径含引号/反斜杠时避免选择器语法错误）。
- * @author ddj 2026年09月11号
- * @param value 原始值
- * @returns 可安全嵌入 `[attr="…"]` 的字符串
- */
-function cssEscape(value) {
-  return String(value ?? '').replace(/\\/g, '\\\\').replace(/"/g, '\\"')
-}
-
 /**
  * 目录树面板主体（SWR：有缓存先渲染，无缓存才显示加载态；加载总在后台）。
  * @param props.ctx 面板共享上下文（sessionId/openFile/activePath/pendingByPath/fileMenuItems/notify）
@@ -127,7 +114,6 @@ export function FileExplorer(props) {
   const [loading, setLoading] = React.useState({})
   const [errors, setErrors] = React.useState({}) // rel → 错误文案（仅无任何数据时展示）
   const [menu, setMenu] = React.useState(null) // 右键菜单 { x, y, target }
-  const [revealPath, setRevealPath] = React.useState(null) // 高亮的相对路径（「在资源管理器视图中显示」）
   // 各状态 ref 镜像：定时器/监听用最新闭包
   const tokensRef = React.useRef({})
   const expandedRef = React.useRef({})
@@ -139,9 +125,6 @@ export function FileExplorer(props) {
   const saveTimerRef = React.useRef(null)
   const loadDirRef = React.useRef(null)
   const refreshRef = React.useRef(null)
-  const revealTimerRef = React.useRef(null) // 高亮清除计时器
-  const revealTryRef = React.useRef(0) // 当前定位的重试计数（行渲染需等目录加载）
-  const revealInTreeRef = React.useRef(null) // 定位动作最新闭包（窗口监听读取）
   const treeRef = React.useRef(null) // 目录树容器（定位时按 data-edrv-path 查行）
   const reloadDirRef = React.useRef(null) // loadDir 最新闭包（文件变化监听读取，防陈旧闭包）
   const changedTimerRef = React.useRef(null) // 文件变化合并去抖计时器
@@ -172,8 +155,10 @@ export function FileExplorer(props) {
     const force = opts?.force === true
     const doPrefetch = opts?.prefetch === true
     if (!force && loadingRef.current[rel]) return
-    const token = (tokensRef.current[rel] || 0) + 1
-    tokensRef.current[rel] = token
+    const tokens = tokensRef.current
+    const token = (tokens[rel] || 0) + 1
+    tokens[rel] = token
+    loadingRef.current = Object.assign({}, loadingRef.current, { [rel]: true })
     setLoading((prev) => Object.assign({}, prev, { [rel]: true }))
     setErrors((prev) => {
       const next = Object.assign({}, prev)
@@ -183,7 +168,7 @@ export function FileExplorer(props) {
     const args = { sessionId, path: rel }
     if (force) args.force = true
     rpc('edrv.listDir', args).then((res) => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       if (res && res.ok && Array.isArray(res.entries)) {
         setDirs((prev) => Object.assign({}, prev, { [rel]: res.entries }))
         if (res.root) setRoot((prev) => prev || res.root)
@@ -196,12 +181,12 @@ export function FileExplorer(props) {
         }
       }
     }).catch((e) => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       if (!entriesOf(rel)) {
         setErrors((prev) => Object.assign({}, prev, { [rel]: '读取目录异常:' + String(e) }))
       }
     }).finally(() => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       setLoading((prev) => {
         const next = Object.assign({}, prev)
         delete next[rel]
@@ -220,55 +205,28 @@ export function FileExplorer(props) {
     void loadDir(rel, { prefetch: true })
   }
 
-  /**
-   * 尝试把目标行滚入可见并高亮；行尚未渲染（祖先目录仍在加载）时按上限重试。
-   * @author ddj 2026年09月11号
-   * @param path 目标相对路径
-   */
-  const tryReveal = (path) => {
-    const host = treeRef.current
-    const row = host?.querySelector?.('[data-edrv-path="' + cssEscape(path) + '"]')
-    if (!row) {
-      revealTryRef.current += 1
-      if (revealTryRef.current < REVEAL_RETRY_MAX) {
-        window.setTimeout(() => tryReveal(path), REVEAL_RETRY_MS)
-      }
-      return
-    }
-    row.scrollIntoView?.({ block: 'center' })
-    setRevealPath(path)
-    if (revealTimerRef.current) clearTimeout(revealTimerRef.current)
-    revealTimerRef.current = window.setTimeout(() => {
-      revealTimerRef.current = null
-      setRevealPath(null)
-    }, REVEAL_HIGHLIGHT_MS)
-  }
-
-  /**
-   * 在资源管理器视图中显示：展开全部祖先目录并定位高亮目标文件。
-   * 目录条目懒加载，故先展开祖先并触发加载，再由 tryReveal 轮询等行渲染。
-   * @author ddj 2026年09月11号
-   * @param path 目标相对路径
-   */
-  const revealInTree = (path) => {
-    if (!path) return
+  /** @private @author ddj 2026年10月14号 @param path Safe relative file path. Expands only the ancestor chain and reuses available directory entries. */
+  function prepareReveal(path) {
     const ancestors = ancestorDirsOf(path)
-    revealTryRef.current = 0
-    setExpanded((prev) => {
+    setExpanded(expandParents)
+    for (const dir of ['', ...ancestors]) {
+      if (entriesOf(dir)) continue
+      void loadDir(dir, { prefetch: false })
+    }
+    /** @private @author ddj 2026年10月14号 @param prev Current expansion map. @returns Expanded ancestor map. */
+    function expandParents(prev) {
       const next = Object.assign({}, prev)
       for (const dir of ancestors) next[dir] = true
       return next
-    })
-    for (const dir of ancestors) void loadDir(dir, { prefetch: false })
-    tryReveal(path)
+    }
   }
-  revealInTreeRef.current = revealInTree
 
   const refresh = (event) => {
     if (event?.detail?.scope && event.detail.scope !== scope) return
     if (event?.detail?.paths?.length) { for (const path of event.detail.paths) onFileChanged(path); return }
     const keep = Object.keys(expandedRef.current).filter((k) => expandedRef.current[k] === true)
     tokensRef.current = {}
+    loadingRef.current = {}
     setMenu(null)
     setErrors({})
     // SWR：保留旧条目不清空，后台强制重列（force 跳过索引）
@@ -334,13 +292,13 @@ export function FileExplorer(props) {
 
   React.useEffect(() => {
     tokensRef.current = {}
+    loadingRef.current = {}
     setDirs({})
     setExpanded({})
     setLoading({})
     setErrors({})
     setMenu(null)
     setRoot(null)
-    setRevealPath(null)
     // 恢复上次展开状态（对齐 VSCode：持久化展开路径，条目缓存即时渲染、后台刷新）
     const cached = scope ? explorerLoad(scope) : null
     const restored = cached?.expanded ?? []
@@ -379,19 +337,9 @@ export function FileExplorer(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  // 在资源管理器视图中显示（页签右键菜单）：展开祖先目录并定位高亮
-  React.useEffect(() => {
-    const onReveal = (event) => {
-      const path = event?.detail?.path
-      if (typeof path === 'string' && path) revealInTreeRef.current?.(path)
-    }
-    window.addEventListener('edrv:reveal-path', onReveal)
-    return () => {
-      window.removeEventListener('edrv:reveal-path', onReveal)
-      if (revealTimerRef.current) { clearTimeout(revealTimerRef.current); revealTimerRef.current = null }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  // 在恢复工作区展开状态之后跟随活动文件；隐藏期间目标由编辑器保留，重新挂载时兑现。
+  const { revealPath } = useExplorerReveal({ scope, activePath, treeRef, prepare: prepareReveal })
+  const activeTreePath = treeRevealPath(activePath)
 
   // 10s 轻量跟随：已展开目录后台刷新（命中 host 索引，近零成本），树跟随 agent 写入
   React.useEffect(() => {
@@ -446,7 +394,7 @@ export function FileExplorer(props) {
     if (!row.e) return React.createElement('div', { key: row.key, className: 'edrv-tree-loading', style: { paddingLeft: 6 + row.depth * 14 } }, row.text)
     const { e, depth, isDir, isOpen } = row
     return React.createElement(ExplorerRow, { key: e.path, path: e.path, name: e.name, type: e.type, depth, isDir, isOpen,
-      pending: isDir ? 0 : pendingByPath[e.path] ?? 0, active: !isDir && e.path === activePath,
+      pending: isDir ? 0 : pendingByPath[e.path] ?? 0, active: !isDir && e.path === activeTreePath,
       context: Boolean(menu && menuEntries.length && menu.target.path === e.path), reveal: revealPath === e.path,
       mark: svn.local?.get(e.path), remote: svn.remote?.get(e.path) ?? 0, onSelect, onContext })
   }

package/src/client/sidebar/panels/useExplorerReveal.ts

@@ -0,0 +1,109 @@
+import React from 'react'
+import { isTreeRevealable } from '../../tabActions.js'
+
+/** @private @author ddj 2026年10月14号 @param path Editor path. @returns Safe normalized tree path, or null. */
+export function treeRevealPath(path: string | null): string | null {
+  if (!path || !isTreeRevealable(path)) return null
+  return path.replace(/\\/g, '/').replace(/^\.\//, '')
+}
+
+/** @private @author ddj 2026年10月14号 @param host Tree scroll container. @param path Exact row path. @returns Whether a visible row was located. Only scrolls the tree. */
+export function revealTreeRow(host: HTMLElement | null, path: string): boolean {
+  if (!host || host.clientHeight <= 0) return false
+  const escaped = path.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+  const row = host.querySelector<HTMLElement>('[data-edrv-path="' + escaped + '"]')
+  if (!row) return false
+  const viewport = host.getBoundingClientRect()
+  const bounds = row.getBoundingClientRect()
+  const top = viewport.top + host.clientTop
+  if (bounds.top < top || bounds.bottom > top + host.clientHeight) {
+    host.scrollTop += bounds.top - top - (host.clientHeight - bounds.height) / 2
+  }
+  return true
+}
+
+interface RevealOptions {
+  scope: string
+  activePath: string | null
+  treeRef: React.RefObject<HTMLElement>
+  prepare: (path: string) => void
+}
+interface RevealTarget {
+  scope: string
+  path: string
+  active: string | null
+}
+
+/** @private @author ddj 2026年10月14号 @param options Current workspace, active editor and tree preparation. @returns Highlight and manual request callback. Waits for committed rows without polling; unmount cancels highlight cleanup. */
+export function useExplorerReveal(options: RevealOptions) {
+  const { scope, activePath, treeRef } = options
+  const [target, setTarget] = React.useState<RevealTarget | null>(null)
+  const [revealPath, setRevealPath] = React.useState<string | null>(null)
+  const pending = React.useRef<RevealTarget | null>(null)
+  const timer = React.useRef<ReturnType<typeof setTimeout> | null>(null)
+  const latest = React.useRef(options)
+  latest.current = options
+
+  /** @private @author ddj 2026年10月14号 Clears only this hook's highlight timer. */
+  function clearHighlight(): void {
+    if (timer.current !== null) clearTimeout(timer.current)
+    timer.current = null
+  }
+  /** @private @author ddj 2026年10月14号 @param path Requested tree path. Expands ancestors and replaces any previous pending target. */
+  function requestReveal(path: string | null): void {
+    clearHighlight()
+    setRevealPath(null)
+    const normalized = treeRevealPath(path)
+    const current = latest.current
+    const next = normalized ? { scope: current.scope, path: normalized, active: current.activePath } : null
+    pending.current = next
+    setTarget(next)
+    if (next) current.prepare(next.path)
+  }
+  /** @private @author ddj 2026年10月14号 Attempts the latest target after row commit or container resize. Consumes only a successful, current request. */
+  function tryReveal(): void {
+    const next = pending.current
+    const current = latest.current
+    if (!next || next.scope !== current.scope || next.active !== current.activePath) return
+    if (!revealTreeRow(current.treeRef.current, next.path)) return
+    pending.current = null
+    setRevealPath(next.path)
+    clearHighlight()
+    timer.current = setTimeout(endHighlight, 2000)
+  }
+  /** @private @author ddj 2026年10月14号 Ends transient reveal styling without changing the active editor row. */
+  function endHighlight(): void {
+    timer.current = null
+    setRevealPath(null)
+  }
+
+  /** @private @author ddj 2026年10月14号 Establishes the latest editor target after workspace tree restoration. */
+  function followActive(): void { requestReveal(activePath) }
+  React.useEffect(followActive, [scope, activePath])
+  React.useLayoutEffect(tryReveal)
+
+  /** @private @author ddj 2026年10月14号 @returns Cleanup for manual events, resize observation and highlight timer. */
+  function listenReveal(): () => void {
+    /** @private @author ddj 2026年10月14号 @param event Existing explicit reveal request. */
+    function onReveal(event: Event): void {
+      const detail = (event as CustomEvent<{ path?: string; scope?: string }>).detail
+      if (detail?.scope && detail.scope !== latest.current.scope) return
+      if (typeof detail?.path === 'string') requestReveal(detail.path)
+    }
+    const observer = typeof ResizeObserver === 'function' ? new ResizeObserver(tryReveal) : null
+    if (treeRef.current) observer?.observe(treeRef.current)
+    window.addEventListener('edrv:reveal-path', onReveal)
+    /** @private @author ddj 2026年10月14号 Cancels callbacks owned by this mounted tree. */
+    function cleanup(): void {
+      observer?.disconnect()
+      window.removeEventListener('edrv:reveal-path', onReveal)
+      pending.current = null
+      clearHighlight()
+    }
+    return cleanup
+  }
+  React.useEffect(listenReveal, [treeRef])
+  // Keep the request state as a render trigger when an already-open tree is revealed manually.
+  void target
+  return { revealPath, requestReveal }
+}