dsh-vscode-mode 0.19.0 → 0.19.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.19.0",
+  "version": "0.19.2",
   "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/externalOpen.ts

@@ -10,6 +10,7 @@ import { openDeepLink } from './openFlow.js'
 import { disposeOpenWait } from './openReceipt.js'
 import { rpc } from './rpc.js'
 import { log } from './log.js'
+import { createRequestId } from './requestId.js'
 
 /** toast 自隐时长。 */
 const TOAST_MS = 5000
@@ -68,7 +69,12 @@ function startPresencePoll(ctx: unknown): () => void {
   if (typeof window === 'undefined') return () => {}
   const marker = window as unknown as { __edrvExtPoll?: () => void }
   if (typeof marker.__edrvExtPoll === 'function') marker.__edrvExtPoll()
-  const clientId = crypto.randomUUID()
+  const generatedId = createRequestId()
+  if (!generatedId) {
+    log.warn('安全随机源不可用，已停用外部打开心跳')
+    return () => {}
+  }
+  const clientId: string = generatedId
   let disposed = false
   let polling = false
   let executing = false

package/src/client/monaco/loader.ts

@@ -65,6 +65,8 @@ export const LANG_BY_EXT = {
   // 工程/配置文件（拿到正确语法分色，而非 plaintext）
   csproj: 'xml', props: 'xml', targets: 'xml', plist: 'xml',
   lua51: 'lua', luac: 'lua',
+  v: 'verilog', vh: 'verilog', sv: 'systemverilog', svh: 'systemverilog',
+  tcl: 'tcl', xdc: 'tcl', sdc: 'tcl', ucf: 'tcl',
   gitattributes: 'ini', editorconfig: 'ini', env: 'ini', properties: 'ini',
   json5: 'jsonc', log: 'plaintext', txt: 'plaintext',
   // 代码片段文件按 JSON 高亮（VS Code 同款：.code-snippets 是带注释的 JSON）

package/src/client/monaco/theme.ts

@@ -291,6 +291,17 @@ const COLOR_TOKEN_MAP = [
 /** 已应用的官方主题序号（模块级计数，保证主题 id 每次唯一）。 */
 let officialSeq = 0
 
+/** @public @author ddj 2026年10月23号
+ * Read the host content font on editor creation, preserving the original line density.
+ * @returns Monaco font options; invalid or unavailable CSS falls back to 16px.
+ */
+export function editorFont(): { fontSize: number; lineHeight: number } {
+  const raw = readCssVar('--dsh-content-font-size') ?? ''
+  const parsed = /^\d+(?:\.\d+)?px$/i.test(raw) ? Number(raw.slice(0, -2)) : NaN
+  const fontSize = Number.isFinite(parsed) && parsed > 0 ? parsed : 16
+  return { fontSize, lineHeight: Math.round(fontSize * 21 / 16) }
+}
+
 /**
  * 读官方 CSS 变量（先 body 后文档根；未定义/空值/未解析 var() 返回 undefined）。
  * 依据运行态实测：DSH 的 --dsw-alias-* 定义在 body 上，仅 --shiki-token-* 在根。

package/src/client/openReceipt.ts

@@ -1,4 +1,5 @@
 import { openEditorView } from './events.js'
+import { createRequestId } from './requestId.js'
 
 import type { PlanDocument } from './planState.js'
 
@@ -41,7 +42,9 @@ export function finishOpen(requestId: string, success: boolean, error?: string):
  */
 export function requestOpen(path: string | null, line?: number, column?: number, sessionId = '', options: OpenOptions = {}): Promise<boolean> {
   if (typeof window === 'undefined' || !sessionId || options.signal?.aborted) return Promise.resolve(false)
-  const request: EditorRequest = { requestId: crypto.randomUUID(), sessionId, path, line, column }
+  const requestId = createRequestId()
+  if (!requestId) return Promise.resolve(false)
+  const request: EditorRequest = { requestId, sessionId, path, line, column }
   if (options.preview !== undefined) request.preview = options.preview
   if (options.plan) request.plan = options.plan
   return new Promise((resolve) => {

package/src/client/requestId.ts

@@ -0,0 +1,20 @@
+/** @public @author ddj 2026年10月23号
+ * Generate an unpredictable UUID, including on insecure LAN HTTP origins.
+ * @returns UUID v4, or undefined when secure randomness is unavailable.
+ */
+export function createRequestId(): string | undefined {
+  try {
+    if (typeof globalThis.crypto?.randomUUID === 'function') return globalThis.crypto.randomUUID()
+  } catch { /* Fall through to the cryptographic API available on HTTP origins. */ }
+
+  try {
+    const bytes = new Uint8Array(16)
+    globalThis.crypto.getRandomValues(bytes)
+    bytes[6] = (bytes[6] & 0x0f) | 0x40
+    bytes[8] = (bytes[8] & 0x3f) | 0x80
+    const hex = Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('')
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
+  } catch {
+    return undefined
+  }
+}

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

@@ -35,6 +35,8 @@ const PREFETCH_MAX = 4
 const PREFETCH_EXCLUDED = new Set(['node_modules', '.git', '.hg', '.svn', '.pnpm', '.pnpm-store'])
 /** 外部文件变化重列去抖：一轮外部批量写入（如 agent 连写多文件）合并为一次重列。 */
 const FILE_CHANGE_DEBOUNCE_MS = 400
+/** 兼容 host 返回裸文案或附带路径的缺失目录错误。 */
+const MISSING_DIR_PREFIX = '目录不存在'
 
 // --region 行图标（官方原语：目录文件夹图标 + 文件类型图标；缺失时回落纯文本）
 
@@ -135,6 +137,24 @@ export function FileExplorer(props) {
   /** 渲染取数：内存态 → 本地条目缓存 → null（显示加载态）。 */
   const entriesOf = (rel) => dirsRef.current[rel] ?? entriesCacheGet(scope, rel) ?? null
 
+  /**
+   * @private
+   * @author ddj 2026年10月23号
+   * @description 移除已删除目录的展开记录，经现有防抖持久化自愈；不改请求 token，保留 finally 的加载态清理。
+   * @param rel 已确认缺失的非根相对目录
+   */
+  function dropDeadDir(rel) {
+    setExpanded(removeExpansion)
+
+    /** @private @author ddj 2026年10月23号 @param prev 当前展开映射。 @returns 移除失效目录后的展开映射。 */
+    function removeExpansion(prev) {
+      if (prev[rel] !== true) return prev
+      const next = Object.assign({}, prev)
+      delete next[rel]
+      return next
+    }
+  }
+
   /** 预取子目录：≤4 个、排除重型目录、缓存新鲜跳过、已加载跳过、不级联。 */
   const prefetchDirs = (rel, entries) => {
     const want = []
@@ -176,11 +196,14 @@ export function FileExplorer(props) {
         if (res.root) setRoot((prev) => prev || res.root)
         entriesCachePut(scope, rel, res.entries)
         if (doPrefetch) prefetchDirs(rel, res.entries)
-      } else {
-        // 有可渲染数据时静默（旧数据可能过期但可用）；全无数据才报错
-        if (!entriesOf(rel)) {
-          setErrors((prev) => Object.assign({}, prev, { [rel]: res?.error ? String(res.error) : '读取目录失败' }))
+      } else if (!entriesOf(rel)) {
+        // 保留有缓存时的 SWR 降级；仅缺失的子目录自愈，根目录错误必须继续展示。
+        const message = res?.error ? String(res.error) : '读取目录失败'
+        if (rel && message.startsWith(MISSING_DIR_PREFIX)) {
+          dropDeadDir(rel)
+          return
         }
+        setErrors((prev) => Object.assign({}, prev, { [rel]: message }))
       }
     }).catch((e) => {
       if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
@@ -475,7 +498,13 @@ export function FileExplorer(props) {
 
   const errorList = Object.entries(errors)
   // 跨端会话缺失：裸错误替换为友好标题 + 详情（重试仍保留，会话在本端可用后即恢复）
-  const rawErrorText = errorList.length ? errorList[0][1] : null
+  let rawErrorText = null
+  if (errorList.length) {
+    const [errorRel, message] = errorList[0]
+    rawErrorText = message
+    // 路径只在展示层追加，RPC 业务错误与异常均可定位；兼容已带路径的 host。
+    if (errorRel && !message.endsWith('：' + errorRel)) rawErrorText += '：' + errorRel
+  }
   const sessionMissing = isSessionMissingError(rawErrorText)
   const errorText = rawErrorText === null
     ? null

package/src/client/state/uiStatePersist.ts

@@ -97,6 +97,8 @@ export interface UiStateMirrorDeps {
 export interface UiStateMirror {
   /** 包装 localStorage 写口（写口不可用时返回 false）。 */
   install(): boolean
+  /** Release storage hooks and pending hydration work. */
+  dispose(): void
   /** 取回 host 镜像并回填本地缺失键，返回回填条数。 */
   hydrate(): Promise<number>
   /** 立即上送待推送批次，返回最终丢弃的键数（0 = 全部落盘；供卸载与测试驱动）。 */
@@ -194,6 +196,8 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
   let suppressed = 0
   let done = false
   let installed = false
+  let disposed = false
+  let restoreStorage: (() => void) | undefined
   let lastError = ''
   /** 水合尝试次数（失败重试；超过 `HYDRATE_RETRY_MAX` 放弃并解禁）。 */
   let attempts = 0
@@ -203,14 +207,19 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
 
   /** 记入待推送批次并安排去抖上送（水合期间或非镜像键 → 跳过）。 */
   function queue(key: string, value: string | null): void {
-    if (suppressed > 0 || !isMirroredKey(key)) return
+    if (disposed || suppressed > 0 || !isMirroredKey(key)) return
     const bucket = isGlobalKey(key) ? pending.globals : pending.keys
     bucket[key] = value
     if (timer !== null) cancel(timer)
-    timer = schedule(() => {
+    try {
+      timer = schedule(() => {
+        timer = null
+        if (!disposed) void flush()
+      }, FLUSH_DEBOUNCE_MS)
+    } catch (error) {
       timer = null
-      void flush()
-    }, FLUSH_DEBOUNCE_MS)
+      log('界面状态调度失败: ' + String(error))
+    }
   }
 
   /** 上送一批补丁（失败重试一次）。 */
@@ -273,7 +282,7 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
 
   /** @private @author ddj 2026年10月12号 @returns Durable refresh snapshot. @throws When state is unreadable, unsettled or rejected by Host. @sideEffects Resends current local state after waiting for inflight writes. */
   async function flushStrict(): Promise<void> {
-    if (!settleDone || !installed) throw new Error('界面状态镜像尚未就绪')
+    if (disposed || !settleDone || !installed) throw new Error('界面状态镜像尚未就绪')
     if (inflight) await inflight
     // Read directly: the lenient key scanner intentionally hides storage errors.
     for (let index = 0; index < storage.length; index++) {
@@ -338,7 +347,7 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
    * 未结束前界面不得写存档，否则空初值会覆盖 host 上的真实状态。
    */
   function settle(): void {
-    if (settleDone) return
+    if (disposed || settleDone) return
     settleDone = true
     emitReady()
     report('水合阶段结束（就绪；' + (done ? '已回填' : '未回填，退回纯 localStorage') + '）')
@@ -349,9 +358,11 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
    * @returns 本次回填键数（失败/重试中为 0）
    */
   async function hydrate(): Promise<number> {
+    if (disposed) return 0
     try {
       report('水合开始（origin=' + originOf() + '，第 ' + (attempts + 1) + ' 次）')
       const snapshot = await deps.fetch(deps.sessionIdOf?.())
+      if (disposed) return 0
       // 先搬运本 origin 既有状态（只含换 origin 前就存在的键），再回填缺失键：
       // 顺序反过来会把刚回填的键再回送一遍（值与 host 完全相同，纯属多余流量）。
       const seeded = seedLocal()
@@ -362,19 +373,24 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
       if (seeded > 0) {
         const lost = await flush()
         report('首次搬运输送完成：丢弃 ' + lost + ' 键')
-        if (lost === 0) markSeeded()
+        if (!disposed && lost === 0) markSeeded()
       }
       settle()
       return filled
     } catch (error) {
+      if (disposed) return 0
       attempts++
       if (attempts < HYDRATE_RETRY_MAX) {
         report('水合失败（第 ' + attempts + ' 次，' + HYDRATE_RETRY_MS + 'ms 后重试）: ' + String(error), 'warn')
-        retryTimer = schedule(() => {
-          retryTimer = null
-          void hydrate()
-        }, HYDRATE_RETRY_MS)
-        return 0
+        try {
+          retryTimer = schedule(() => {
+            retryTimer = null
+            void hydrate()
+          }, HYDRATE_RETRY_MS)
+          return 0
+        } catch (scheduleError) {
+          report('水合重试调度失败: ' + String(scheduleError), 'warn')
+        }
       }
       report('水合放弃（重试 ' + attempts + ' 次仍失败）: ' + String(error), 'warn')
       settle()
@@ -382,26 +398,58 @@ export function createUiStateMirror(deps: UiStateMirrorDeps): UiStateMirror {
     }
   }
 
+  /** @private @author ddj 2026年10月23号 Release timers and only this instance's storage hooks. */
+  function dispose(): void {
+    if (disposed) return
+    disposed = true
+    if (timer !== null) cancel(timer)
+    if (retryTimer !== null) cancel(retryTimer)
+    timer = null
+    retryTimer = null
+    restoreStorage?.()
+    installed = false
+  }
+
   return {
+    dispose,
     install(): boolean {
+      if (disposed) return false
       if (installed) return true
       try {
         const proto = Object.getPrototypeOf(storage) as Partial<UiStorage> | null
-        const rawSet = proto?.setItem
-        const rawRemove = proto?.removeItem
+        const rawSet = storage.setItem ?? proto?.setItem
+        const rawRemove = storage.removeItem ?? proto?.removeItem
         if (typeof rawSet !== 'function' || typeof rawRemove !== 'function') return false
-        storage.setItem = function (key: string, value: string): void {
+        const setDescriptor = Object.getOwnPropertyDescriptor(storage, 'setItem')
+        const removeDescriptor = Object.getOwnPropertyDescriptor(storage, 'removeItem')
+        /** @private @author ddj 2026年10月23号 @param key Storage key. @param value Stored text. @sideEffects Queues a mirror update. */
+        function wrappedSet(key: string, value: string): void {
           rawSet.call(storage, key, value)
           queue(String(key), String(value))
         }
-        storage.removeItem = function (key: string): void {
+        /** @private @author ddj 2026年10月23号 @param key Storage key. @sideEffects Queues a mirror deletion. */
+        function wrappedRemove(key: string): void {
           rawRemove.call(storage, key)
           queue(String(key), null)
         }
+        restoreStorage = () => {
+          if (storage.setItem === wrappedSet) {
+            if (setDescriptor) Object.defineProperty(storage, 'setItem', setDescriptor)
+            else delete (storage as Partial<UiStorage>).setItem
+          }
+          if (storage.removeItem === wrappedRemove) {
+            if (removeDescriptor) Object.defineProperty(storage, 'removeItem', removeDescriptor)
+            else delete (storage as Partial<UiStorage>).removeItem
+          }
+        }
+        storage.setItem = wrappedSet
+        storage.removeItem = wrappedRemove
         installed = true
         report('镜像已包装 localStorage 写口')
         return true
       } catch (error) {
+        restoreStorage?.()
+        installed = false
         report('界面状态镜像包装失败（退回纯 localStorage）: ' + String(error), 'warn')
         return false
       }
@@ -500,7 +548,7 @@ async function fetchViaRpc(sessionId?: string): Promise<UiStateSnapshot> {
  * @returns 是否安装成功（存储不可用 → false，功能退回纯 localStorage）
  */
 export function installUiStatePersist(
-  ctx: { get: (name: string) => unknown },
+  ctx: { get: (name: string) => unknown; effect: (setup: () => () => void, label?: string) => unknown },
   schedule: (fn: () => void, ms: number) => unknown,
   report?: (text: string, level?: string) => void,
 ): boolean {
@@ -518,6 +566,9 @@ export function installUiStatePersist(
     fetch: fetchViaRpc,
     sessionIdOf,
     schedule,
+    cancel: (handle) => {
+      if (typeof handle === 'function') handle()
+    },
     report: (text: string, level?: string) => reportUiStateEvent(text, level),
     log: (text: string) => {
       try { dbg(sessionIdOf(), 'ui-state: ' + text, 'warn') } catch (error) { /* 日志失败忽略 */ }
@@ -528,18 +579,28 @@ export function installUiStatePersist(
     return false
   }
   singleton = mirror
-  try {
-    if (typeof window !== 'undefined') {
-      window.addEventListener('pagehide', () => { void mirror.flush() })
+  const pageHost = typeof window === 'undefined' ? undefined : window
+  /** @private @author ddj 2026年10月23号 Persist pending changes when the page is hidden. */
+  function onPageHide(): void { void mirror.flush() }
+  ctx.effect(() => {
+    pageHost?.addEventListener('pagehide', onPageHide)
+    return () => {
+      pageHost?.removeEventListener('pagehide', onPageHide)
+      mirror.dispose()
+      if (singleton !== mirror) return
+      singleton = null
+      hydrating = null
+      uiReady = false
+      reporter = null
     }
-  } catch (error) { /* 无 window 环境忽略 */ }
+  }, 'vscode-mode: ui state lifecycle')
   hydrating = mirror.hydrate().then((filled) => {
-    if (filled > 0 || mirror.settled()) uiReady = true
+    if (singleton === mirror && (filled > 0 || mirror.settled())) uiReady = true
     return filled
   })
   void hydrating.finally(() => {
     // 首轮结束后：已结束水合阶段才允许后续 hydrateUiState() 重新发起（重试由镜像内部承担）
-    if (mirror.settled()) {
+    if (singleton === mirror && mirror.settled()) {
       uiReady = true
       hydrating = null
     }

package/src/client/ui/EditorView.ts

@@ -49,7 +49,7 @@ import {
 import { useFileWatch } from './useFileWatch.js'
 import { createPdfPanel } from '../pdf/pdfPanel.js'
 import { SvnDiffPanel } from './SvnDiffPanel.js'
-import { applyOfficial, registerThemes, themeNameOf } from '../monaco/theme.js'
+import { applyOfficial, editorFont, registerThemes, themeNameOf } from '../monaco/theme.js'
 import { createDiffRenderer } from '../monaco/diffRender.js'
 import { ST, callIdAttr, noopHunk, summarize } from '../state/records.js'
 import { diffRegions } from '../state/regions.js'
@@ -2392,9 +2392,7 @@ export function EditorView(props) {
       language: 'plaintext',
       theme: themeNameOf(),
       fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)',
-      // 16px/21px：与 md 预览渲染态同字号，切分页/切组时观感不再跳变（ddj 2026-10-16）
-      fontSize: 16,
-      lineHeight: 21,
+      ...editorFont(),
       minimap: { enabled: !side, scale: 1 },
       glyphMargin: true,
       lineDecorationsWidth: 16,
@@ -3990,7 +3988,7 @@ export function EditorView(props) {
       if (result.version) { revRef.current[path] = result.version; recordBaseline(scope, path, result.version) }
       const editor = window.monaco.editor.create(host, { model, automaticLayout: true, minimap: { enabled: false }, scrollBeyondLastLine: false, glyphMargin: true,
         // 与焦点编辑器（ensureEditor）同观感参数：字号/行高/顶部留白（side 形态 6，tab 形态 8）/装饰宽度，切分页行号位置不跳变（ddj 2026-10-16）
-        fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)', fontSize: 16, lineHeight: 21,
+        fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)', ...editorFont(),
         lineDecorationsWidth: 16, padding: { top: layoutRef.current === 'side' ? 6 : 8 } })
       const unbindGutter = bindBpGutter(editor, host, path)
       keeper = createViewKeeper(editor)

package/src/shared/snippets.ts

@@ -128,7 +128,7 @@ export const SNIPPET_LANGUAGES: readonly string[] = [
   'c', 'cpp', 'csharp', 'css', 'dart', 'dockerfile', 'go', 'html', 'ini', 'java',
   'javascript', 'json', 'jsonc', 'kotlin', 'less', 'lua', 'markdown', 'mdx', 'php',
   'plaintext', 'powershell', 'python', 'ruby', 'rust', 'scss', 'shell', 'sql',
-  'swift', 'typescript', 'xml', 'yaml',
+  'swift', 'systemverilog', 'tcl', 'typescript', 'verilog', 'xml', 'yaml',
 ]
 
 /** 语言 id → 展示名（仅收录写法与 id 明显不同的；未收录的原样返回）。 */