dsh-vscode-mode 0.1.23 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 dsh-better-sidebar 侧边栏与对话同屏）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚），状态持久化到工作区旁车",
   "keywords": [
     "dsh",
@@ -51,13 +51,16 @@
     "@deepseek-ai/dsh-tools": ">=0.0.1-rc.1 <0.1.0 || >=0.1.0-rc.1 <0.2.0-0",
     "cordis": ">=4.0.0-rc <5",
     "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "schemastery": "^3.18.0"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
     "@types/node": "^24.13.3",
     "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.5",
     "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "schemastery": "3.18.0",
     "tsdown": "^0.22.14",
     "typescript": "^5.9.0",

package/src/client/monaco/diffRender.ts

@@ -21,6 +21,9 @@ export function createDiffRenderer(log) {
    * @param sessionId 会话 id
    */
   const render = (monaco, editor, pendingRegions, sessionId) => {
+    // 空渲染且无残留（5s 轮询 setRecords 常触发）：无需清理时直接跳过，
+    // 不打 begin 日志、不做无谓 DOM 操作；有 zone/decoration 残留时仍需走清理。
+    if (!pendingRegions.length && viewZoneIds.length === 0 && decorations.length === 0) return
     const renderT0 = Date.now()
     const callIdAttr = (callId, idx) => String(callId) + ':' + String(idx)
     log(sessionId, '[diff-render] begin regs=' + pendingRegions.length + ' ' + pendingRegions.map((r) => callIdAttr(r.callId, r.idx) + '@' + (r.start ?? '?') + '-' + (r.end ?? '?') + '(-' + (r.oldLines ? r.oldLines.length : 0) + '/+' + (r.newLines ? r.newLines.length : 0) + ')').join('|'))

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

@@ -10,6 +10,7 @@
 import React from 'react'
 import { rpc } from '../../rpc.js'
 import { ContextMenu } from '../../ui/ContextMenu.js'
+import { rowMenuPosition } from '../../ui/menuPosition.js'
 import { buildTreeMenu } from '../contextMenu.js'
 import type { SidebarCtx } from '../types.js'
 
@@ -74,6 +75,7 @@ export function FileExplorer(props) {
   const refresh = () => {
     const keep = Object.keys(expandedRef.current).filter((k) => expandedRef.current[k] === true)
     tokensRef.current = {}
+    setMenu(null)
     setDirs({})
     setLoading({})
     setError(null)
@@ -94,6 +96,7 @@ export function FileExplorer(props) {
     setExpanded({})
     setLoading({})
     setError(null)
+    setMenu(null)
     setRoot(null)
     void loadDir('')
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -111,17 +114,22 @@ export function FileExplorer(props) {
   const rowEl = (e, depth, isDir, isOpen) => {
     const pending = isDir ? 0 : (pendingByPath[e.path] ?? 0)
     const active = !isDir && e.path === activePath
+    const contextTarget = Boolean(menu && menuEntries.length && menu.target.path === e.path)
     const dim = e.type === 'other'
     return React.createElement('div', {
       key: e.path,
-      className: 'edrv-tree-row' + (active ? ' edrv-tree-active' : ''),
+      className: 'edrv-tree-row'
+        + (active ? ' edrv-tree-active' : '')
+        + (contextTarget ? ' edrv-tree-context' : ''),
       title: e.path,
       style: { paddingLeft: 6 + depth * 14 },
       onClick: () => { if (isDir) toggle(e.path); else openFile(e.path) },
       onContextMenu: (ev) => {
         ev.preventDefault()
         ev.stopPropagation()
-        setMenu({ x: ev.clientX, y: ev.clientY, target: { path: e.path, type: e.type } })
+        const rect = ev.currentTarget?.getBoundingClientRect?.()
+        const position = rowMenuPosition(rect, ev.clientX, ev.clientY)
+        setMenu({ x: position.left, y: position.top, target: { path: e.path, type: e.type } })
       },
     },
       React.createElement('span', { className: 'edrv-tree-chev' },
@@ -158,6 +166,8 @@ export function FileExplorer(props) {
   // 面板区右键（空白处）→ 工作区根目录菜单；行内右键已在 rowEl 阻止冒泡。
   const onPanelContext = (ev) => {
     ev.preventDefault()
+    ev.stopPropagation()
+    if (!ev.currentTarget.contains(ev.target)) return
     setMenu({ x: ev.clientX, y: ev.clientY, target: { path: '', type: 'directory' } })
   }
   // 当前右键目标的可视菜单项（构建时过滤/排序，registry 变化下次打开生效）。

package/src/client/styles/editor.css

@@ -213,6 +213,7 @@
 [data-edrv-view] .edrv-tree-row { display: flex; align-items: center; gap: 4px; height: 22px; padding-right: 6px; border-radius: 5px; color: var(--dsw-alias-label-primary, #1f2933); cursor: pointer; white-space: nowrap; }
 [data-edrv-view] .edrv-tree-row:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
 [data-edrv-view] .edrv-tree-row.edrv-tree-active { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.14)); }
+[data-edrv-view] .edrv-tree-row.edrv-tree-context { box-shadow: inset 0 0 0 1px var(--dsw-alias-brand-primary, #0f9d58); background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.12)); }
 [data-edrv-view] .edrv-tree-chev { width: 12px; flex-shrink: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 10px; text-align: center; }
 [data-edrv-view] .edrv-tree-name { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; }
 [data-edrv-view] .edrv-tree-name.edrv-tree-dim { color: var(--dsw-alias-label-tertiary, #9aa5b1); }

package/src/client/ui/ContextMenu.ts

@@ -1,10 +1,13 @@
 /**
  * dsh-vscode-mode client — 通用浮动右键菜单（createElement 风格、类型化）。
- * 全屏 backdrop（点击/右键/Esc 关闭）+ 固定定位（viewport clamp 防越界），
+ * 非阻塞式关闭：window capture 监听（点击菜单外/右键菜单外/Esc 关闭），
+ * 不拦截菜单外事件，允许同一事件内由发起方切换/重开菜单。
  * 条目支持 danger/disabled/separator，复用既有 edrv-ctxmenu* 样式类。
  * 作者 ddj 2026-08-27
  */
 import React from 'react'
+import { createPortal } from 'react-dom'
+import { clampMenuPosition } from './menuPosition.js'
 
 /** 单条菜单项（展示层形状；业务侧由 buildTreeMenu 映射而来）。 */
 export interface ContextMenuEntry {
@@ -37,17 +40,43 @@ const MENU_H = 176
  */
 export function ContextMenu(props: ContextMenuProps): React.ReactElement {
   const { x, y, entries, onClose } = props
+  const menuRef = React.useRef<HTMLDivElement | null>(null)
 
   React.useEffect(() => {
     const onKey = (e: KeyboardEvent): void => {
       if (e.key === 'Escape') onClose()
     }
+    const onPointerDown = (e: PointerEvent): void => {
+      if (e.button !== 0) return
+      if (menuRef.current && menuRef.current.contains(e.target as Node)) return
+      onClose()
+    }
+    const onContextMenu = (e: MouseEvent): void => {
+      if (menuRef.current && menuRef.current.contains(e.target as Node)) {
+        e.preventDefault()
+      }
+      onClose()
+    }
     window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
+    window.addEventListener('pointerdown', onPointerDown, true)
+    window.addEventListener('contextmenu', onContextMenu, true)
+    return () => {
+      window.removeEventListener('keydown', onKey, true)
+      window.removeEventListener('pointerdown', onPointerDown, true)
+      window.removeEventListener('contextmenu', onContextMenu, true)
+    }
   }, [onClose])
 
-  const left = Math.max(4, Math.min(x, (window.innerWidth || 800) - MENU_W))
-  const top = Math.max(4, Math.min(y, (window.innerHeight || 600) - MENU_H))
+  const safeX = Number.isFinite(x) ? x : 4
+  const safeY = Number.isFinite(y) ? y : 4
+  const position = clampMenuPosition(
+    safeX,
+    safeY,
+    window.innerWidth || 800,
+    window.innerHeight || 600,
+    MENU_W,
+    MENU_H,
+  )
 
   const children: React.ReactNode[] = []
   for (const entry of entries) {
@@ -71,12 +100,8 @@ export function ContextMenu(props: ContextMenuProps): React.ReactElement {
     }, entry.label))
   }
 
-  return React.createElement(React.Fragment, null,
-    React.createElement('div', {
-      className: 'edrv-ctxmenu-backdrop',
-      style: { position: 'fixed', inset: 0, zIndex: 70 },
-      onClick: onClose,
-      onContextMenu: (e: React.MouseEvent) => { e.preventDefault(); onClose() },
-    }),
-    React.createElement('div', { className: 'edrv-ctxmenu', style: { left, top } }, ...children))
+  const overlay = React.createElement('div', { 'data-edrv-view': '1' },
+    React.createElement('div', { className: 'edrv-ctxmenu', ref: menuRef, style: position }, ...children))
+
+  return typeof document === 'undefined' ? overlay : createPortal(overlay, document.body)
 }

package/src/client/ui/EditorView.ts

@@ -131,6 +131,25 @@ export function EditorView(props) {
     })
   }
 
+  /**
+   * 轮询去重：前后记录内容一致时返回原引用，React 跳过重渲染，
+   * 阻断 5s 轮询 → memo 链 → diff 重渲染/日志 的空转。
+   * @author ddj 2026年08月26号
+   * @param prev 当前 records
+   * @param next 轮询新结果
+   * @returns 内容一致返回 true
+   */
+  const sameRecords = (prev, next) => {
+    const pk = Object.keys(prev)
+    const nk = Object.keys(next)
+    if (pk.length !== nk.length) return false
+    for (const k of pk) {
+      if (!(k in next)) return false
+      if (JSON.stringify(prev[k]) !== JSON.stringify(next[k])) return false
+    }
+    return true
+  }
+
   const refreshRecords = (skipStale) => {
     if (!sessionId) return
     rpc('edrv.list', { sessionId, ...(skipStale ? { skipStale: true } : {}) }).then((res) => {
@@ -140,7 +159,7 @@ export function EditorView(props) {
         if (r.archived === true) continue
         map[r.callId] = r
       }
-      setRecords(map)
+      setRecords((prev) => (sameRecords(prev, map) ? prev : map))
     }).catch((e) => setError('list异常:' + String(e)))
   }
 

package/src/client/ui/menuPosition.ts

@@ -0,0 +1,63 @@
+/**
+ * dsh-vscode-mode client — 右键菜单 viewport 定位纯函数。
+ * 将目标行锚点与视口边界计算从 React 渲染层拆出，便于复用和单测。
+ * 作者 ddj 2026-08-28
+ */
+
+export interface MenuPosition {
+  left: number
+  top: number
+}
+
+export interface MenuAnchorRect {
+  top: number
+  right: number
+  width: number
+  height: number
+}
+
+/**
+ * 将菜单坐标限制在 viewport 内。
+ * @author ddj 2026年08月28号
+ * @param x 期望的 viewport x 坐标
+ * @param y 期望的 viewport y 坐标
+ * @param viewportWidth viewport 宽度
+ * @param viewportHeight viewport 高度
+ * @param menuWidth 菜单估算宽度
+ * @param menuHeight 菜单估算高度
+ * @returns 限制后的菜单位置
+ */
+export function clampMenuPosition(
+  x: number,
+  y: number,
+  viewportWidth: number,
+  viewportHeight: number,
+  menuWidth: number,
+  menuHeight: number,
+): MenuPosition {
+  const maxLeft = Math.max(4, viewportWidth - menuWidth)
+  const maxTop = Math.max(4, viewportHeight - menuHeight)
+  return {
+    left: Math.max(4, Math.min(x, maxLeft)),
+    top: Math.max(4, Math.min(y, maxTop)),
+  }
+}
+
+/**
+ * 将文件树行右键菜单锚定到目标行右侧；无法测量时回退到鼠标坐标。
+ * @author ddj 2026年08月28号
+ * @param rect 目标行的布局矩形
+ * @param fallbackX 鼠标 viewport x 坐标
+ * @param fallbackY 鼠标 viewport y 坐标
+ * @returns 菜单初始位置
+ */
+export function rowMenuPosition(
+  rect: MenuAnchorRect | null | undefined,
+  fallbackX: number,
+  fallbackY: number,
+): MenuPosition {
+  if (!rect || rect.width <= 0 || rect.height <= 0) {
+    return { left: fallbackX, top: fallbackY }
+  }
+  return { left: rect.right + 4, top: rect.top }
+}

package/src/rpc.ts

@@ -34,6 +34,8 @@ import { revealInExplorer } from './reveal.js'
 
 /** cwd → Promise 链：串行化 debug 日志追加（fs read+write 非原子，避免并发丢行）。 */
 const debugWriteQueues = new Map<string, Promise<void>>()
+/** debug 日志单文件上限：超限截断保留尾部，防文件无限增长拖慢每次追加。 */
+const DEBUG_LOG_CAP = 512 * 1024
 
 /** 记录 → 客户端视图（不含 before 全文，仅长度）。 */
 function recView(record: DiffRecord): RecordView {
@@ -300,7 +302,11 @@ export function buildHandlers(ctx: Ctx, registry: Registry, searcher = newSearch
           const target = await fs.resolve('.dsh-edit-review-debug.log', { cwd: sc.cwd })
           const old = await fs.readText(target).catch(() => '')
           const line = new Date().toISOString() + ' ' + text + '\n'
-          await fs.writeText(target, (old || '') + line, void 0, void 0, policyOf(ctx, sc.session))
+          // 超上限时截断保留尾部：单文件体积有界，每次追加的读改写成本不随会话时长增长
+          const next = old.length + line.length > DEBUG_LOG_CAP
+            ? old.slice(-Math.floor(DEBUG_LOG_CAP / 2)) + line
+            : old + line
+          await fs.writeText(target, next, void 0, void 0, policyOf(ctx, sc.session))
         } catch (e) { /* 写日志失败忽略 */ }
       })
       debugWriteQueues.set(sc.cwd, task)