dsh-vscode-mode 0.15.4 → 0.15.5

package/package.json

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

@@ -0,0 +1,77 @@
+import type { CompatAdapter } from '../shared/compat.js'
+import { SIDEBAR_PLUGIN } from './compat.js'
+
+/** Runtime installation facts, separate from the DSH version and user intent. */
+export interface ClientCompatState {
+  settingsService: string
+  settingsReady: boolean
+  openPathReady: boolean
+  remoteReady: boolean
+  sidebarOpener: boolean
+  legacySidebar: boolean
+  officialSidebar: boolean
+  fileClaim: boolean
+  claimWanted: boolean
+  selected: string
+}
+
+/**
+ * Classify the API generation without importing the host's node-only version probe.
+ * @private @author ddj 2026年10月13号
+ * @param input Running DSH version from the compat RPC.
+ * @param patch First supported 0.1.x patch (alpha.1).
+ * @returns Whether that API generation is expected; undefined for unknown versions.
+ */
+function apiExpected(input: string, patch: number): boolean | undefined {
+  const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z]+(?:\.[0-9A-Za-z]+)*))?(?:\+[0-9A-Za-z]+(?:\.[0-9A-Za-z]+)*)?$/.exec(input.trim())
+  if (!match) return undefined
+  const major = Number(match[1])
+  const minor = Number(match[2])
+  const current = Number(match[3])
+  if (major !== 0) return major > 0
+  if (minor !== 1) return minor > 1
+  if (current !== patch) return current > patch
+  const pre = match[4]
+  if (!pre) return true
+  const parts = pre.split('.')
+  if (/^\d+$/.test(parts[0])) return false
+  if (parts[0] !== 'alpha') return parts[0] > 'alpha'
+  return parts.length > 1 && (/^\d+$/.test(parts[1]) ? Number(parts[1]) >= 1 : true)
+}
+
+/**
+ * Build only applicable diagnostics; explicit legacy choices still expose missing capabilities.
+ * @public @author ddj 2026年10月13号
+ * @param state Actual client installation facts and user selection.
+ * @param version Running DSH version; unknown versions retain conservative diagnostics.
+ * @returns Visible adapters, without changing routing or installation.
+ */
+export function clientSummary(state: ClientCompatState, version = ''): CompatAdapter[] {
+  const remoteExpected = apiExpected(version, 3)
+  const officialExpected = apiExpected(version, 5)
+  const official = state.officialSidebar
+  const legacyChosen = state.selected === SIDEBAR_PLUGIN
+  const items: CompatAdapter[] = [{
+    name: '设置桥', active: state.settingsReady,
+    note: state.settingsReady ? '使用 ' + state.settingsService + ' 桥' : '未绑定设置服务（持久化不可用，晚到重试窗口内自愈）',
+  }]
+  if (remoteExpected !== true && !state.remoteReady && !official) {
+    items.push({ name: '文件打开路由（workspaces.openPath）', active: state.openPathReady, note: '旧版对话文件链接路由，失败回退系统打开' })
+  }
+  if (remoteExpected !== false || state.remoteReady) {
+    items.push({ name: '会话文件链接路由（remote.session.openWorkspacePath）', active: state.remoteReady, note: state.remoteReady ? '会话文件链接走插件打开器，失败回退系统打开' : '适用路由未安装（服务缺失或补丁失败）' })
+  }
+  if (legacyChosen || state.sidebarOpener || (!official && officialExpected !== true)) {
+    items.push({ name: '侧边栏打开器（' + SIDEBAR_PLUGIN + '）', active: state.sidebarOpener, note: state.sidebarOpener ? '已注册（优先级 80）' : '未检测到侧边栏打开能力' })
+  }
+  if (official || officialExpected !== false) {
+    items.push({ name: '侧边栏编辑区（官方 Sidebar）', active: official, note: official ? '编辑区=官方右侧 Sidebar Tab（对话+编辑同屏）' : '官方侧边栏服务未探测到' })
+  }
+  if (!official && (state.legacySidebar || officialExpected !== true)) {
+    items.push({ name: '侧边栏编辑区（' + SIDEBAR_PLUGIN + '，归档）', active: state.legacySidebar, note: state.legacySidebar ? '编辑区=旧版侧边栏 Tab' : '旧版侧边栏回退能力未检测到' })
+  }
+  if (state.fileClaim || (state.claimWanted && (official || officialExpected !== false))) {
+    items.push({ name: '文件链接官方认领（dsh-resource://file）', active: state.fileClaim, note: state.fileClaim ? '聊天文件链接转发进单一编辑器页签' : '官方文件链接认领未安装' })
+  }
+  return items
+}

package/src/client/externalOpen.ts

@@ -15,6 +15,12 @@ import { log } from './log.js'
 const TOAST_MS = 5000
 /** 深链移交轮询周期（兼活跃心跳）。 */
 const HANDOFF_POLL_MS = 3000
+/**
+ * 页面隐藏时的降频倍数（3s × 5 = 15s）。
+ * 必须仍短于 host 租约（src/externalHandoff.ts 的 LEASE_MS = 30s）：心跳一旦超期，
+ * host 判定该页面已死，launcher 会重复开新页——比多几次 RPC 更糟。
+ */
+const HIDDEN_POLL_EVERY = 5
 
 /** 深链装配选项（全部可注入便于测试；缺省读浏览器全局）。 */
 export interface ExtOpenOptions {
@@ -52,9 +58,10 @@ export function setupExtOpen(ctx: unknown, options: ExtOpenOptions = {}): () =>
 }
 
 /**
- * 深链移交轮询：每 3s 向 host 领取待打开请求（兼活跃心跳，launcher 据此决定是否开新页）。
+ * 深链移交轮询：可见时每 3s 向 host 领取待打开请求（兼活跃心跳，launcher 据此决定是否开新页）；
+ * 页面隐藏时降到 15s 一次——无人看页面时移交不必保持 3s 精度，但心跳不能停（超期会让 host 判页面已死）。
  * 页面级单例（window 标记防 HMR 重复）；领取到即执行打开规则。
- * @author ddj 2026年09月08号
+ * @author ddj 2026年09月08号 / 2026年10月15号
  * @param ctx 客户端根上下文
  */
 function startPresencePoll(ctx: unknown): () => void {
@@ -65,6 +72,17 @@ function startPresencePoll(ctx: unknown): () => void {
   let disposed = false
   let polling = false
   let executing = false
+  let ticks = 0
+  /**
+   * 页面隐藏时按倍数跳轮；可见时每次都跑并清零计数。
+   * @author ddj 2026年10月15号
+   * @returns 是否跳过本轮
+   */
+  function hiddenSkip(): boolean {
+    if (typeof document === 'undefined' || document.visibilityState !== 'hidden') { ticks = 0; return false }
+    ticks += 1
+    return ticks % HIDDEN_POLL_EVERY !== 0
+  }
   /** @private @author ddj 2026年09月28号 Open all requested paths before acknowledging this exact lease. */
   async function execute(open: { paths: string[]; line?: number; column?: number; token: string; leaseId: string }): Promise<void> {
     executing = true
@@ -82,7 +100,7 @@ function startPresencePoll(ctx: unknown): () => void {
       if (!disposed && result.ok && result.open && !executing) void execute(result.open).catch(() => {})
     } finally { polling = false }
   }
-  const timer = window.setInterval(() => { void tick().catch(() => {}) }, HANDOFF_POLL_MS)
+  const timer = window.setInterval(() => { if (hiddenSkip()) return; void tick().catch(() => {}) }, HANDOFF_POLL_MS)
   /** @private @author ddj 2026年09月28号 Stop heartbeats and fail outstanding editor waits on plugin disposal. */
   function dispose(): void {
     disposed = true

package/src/client/index.ts

@@ -32,6 +32,7 @@ import { openEditorView } from './events.js'
 import { setupExtOpen } from './externalOpen.js'
 import { SettingsContext } from './settingsContext.js'
 import { SIDEBAR_PLUGIN, registerSlotSafely, settingsBridge } from './compat.js'
+import { clientSummary } from './compatSummary.js'
 import { detectSidebarService, hasSideRoute, installSideEditor, routeSideEditor, setEnsureSideEditor, SIDEBAR_INSTALL_CMD } from './sidebarBridge.js'
 import { detectOfficial, installOfficial, registerOfficialFileClaim, OFFICIAL_TAB_KIND, OFFICIAL_TAB_TITLE, isEditorTabActive, markEditorActive, restoreEditorTab, buildFileAddress, readSavedTab, setEditorTabScope } from './officialSidebar.js'
 import { setNativeCsv, setNativeOpenHandler, resetNativeOpen } from './nativeOpenStore.js'
@@ -264,16 +265,19 @@ export async function apply(ctx: any): Promise<void> {
   /** 「添加到对话」动作集：编辑区/Tab 右键菜单注入文件引用与代码块（conversation 服务缺失时各动作安全降级）。 */
   const addToConversation = createAddToConversation(ctx)
 
-  /** 客户端侧兼容摘要（与 host 报告合并展示；惰性求值保证 HMR 后仍新鲜）。 */
-  const compatSummary = (): CompatAdapter[] => [
-    { name: '设置桥', active: bridge.scope() !== undefined, note: bridge.scope() !== undefined ? '使用 ' + bridge.service() + ' 桥' : '未绑定设置服务（fileOpenTool 持久化不可用，晚到重试窗口内自愈）' },
-    { name: '文件打开路由（workspaces.openPath）', active: Boolean(workspaces?.openPath), note: 'vscode 打开器优先，失败回退系统打开（0.1.2 及更早 DSH 的对话文件链接主路径）' },
-    { name: '会话文件链接路由（remote.session.openWorkspacePath）', active: remoteOpenInstalled, note: '0.1.3+ 对话文件引用/产物打开优先走插件打开器，失败回退系统打开' },
-    { name: '侧边栏打开器（' + SIDEBAR_PLUGIN + '）', active: registry.get(SIDEBAR_PLUGIN) !== undefined, note: registry.get(SIDEBAR_PLUGIN) !== undefined ? '已注册（优先级 80）' : '未检测到侧边栏打开能力' },
-    { name: '侧边栏编辑区（官方 Sidebar）', active: officialService !== undefined, note: officialService !== undefined ? '编辑区=官方右侧 Sidebar Tab（对话+编辑同屏，DSH 0.1.5+）' : '官方侧边栏服务未探测到（DSH < 0.1.5-alpha.1 时属预期）' },
-    { name: '侧边栏编辑区（' + SIDEBAR_PLUGIN + '，归档）', active: sideService !== undefined, note: sideService !== undefined ? '编辑区=侧边栏 Tab（旧版 DSH 回退形态）' : '未检测到；DSH ≥ 0.1.5 优先官方侧边栏，旧版可安装（' + SIDEBAR_INSTALL_CMD + '）' },
-    { name: '文件链接官方认领（dsh-resource://file）', active: claimDisposer !== null, note: claimDisposer !== null ? '聊天文件链接转发进单一编辑器页签（文件分页归编辑器自带页签栏）' : '链接走官方查看器或旧版路由（未认领）' },
-  ]
+  /**
+   * Build applicable client diagnostics from live installation state.
+   * @private @author ddj 2026年10月13号
+   * @param version Running DSH version supplied by the compat RPC.
+   * @returns Applicable adapters; routing behavior is unchanged.
+   */
+  const compatSummary = (version = ''): CompatAdapter[] => clientSummary({
+    settingsService: bridge.service(), settingsReady: bridge.scope() !== undefined,
+    openPathReady: Boolean(workspaces?.openPath), remoteReady: remoteOpenInstalled,
+    sidebarOpener: registry.get(SIDEBAR_PLUGIN) !== undefined,
+    legacySidebar: sideService !== undefined, officialSidebar: officialService !== undefined,
+    fileClaim: claimDisposer !== null, claimWanted: shouldClaimFiles(selected), selected,
+  }, version)
 
   ctx.provide('fileOpeners', registry)
   ctx.effect(() => registry.register(vscodeOpener()), 'vscode-mode: file opener')

package/src/client/monaco/lsp/lspClient.ts

@@ -108,25 +108,46 @@ function nextDocVer(path) {
 /**
  * 立即同步某文档到 host（首次打开/查询前保证服务器已认识该文档）。
  * sessionId 缺失时仍发起请求：host 对唯一活跃会话有兜底解析，弃发会白白丢失文档归属。
- * @author ddj 2026年08月27号 / 2026年09月11号
+ * @author ddj 2026年08月27号 / 2026年09月11号 / 2026年10月15号
  * @param path 工作区相对路径
- * @param text 文档全文
+ * @param text 文档全文；传函数表示**发送前才求值**（击键路径用它，避免为被去抖丢弃的中间态取全文）
  * @param immediate true 立即发送，false 去抖
  */
 export async function syncDoc(path, text, immediate = false) {
-  if (!path || typeof text !== 'string') return
+  if (!path || (typeof text !== 'string' && typeof text !== 'function')) return
   if (immediate) {
     clearPending(path)
-    await rpc('edrv.lsp.sync', { sessionId, path, text, version: nextDocVer(path) }).catch(() => {})
+    const value = resolveText(text)
+    if (value === null) return
+    await rpc('edrv.lsp.sync', { sessionId, path, text: value, version: nextDocVer(path) }).catch(() => {})
     return
   }
   clearPending(path)
   syncTimers.set(path, setTimeout(() => {
     syncTimers.delete(path)
-    rpc('edrv.lsp.sync', { sessionId, path, text, version: nextDocVer(path) }).catch(() => {})
+    const value = resolveText(text)
+    if (value === null) return
+    rpc('edrv.lsp.sync', { sessionId, path, text: value, version: nextDocVer(path) }).catch(() => {})
   }, SYNC_DEBOUNCE_MS))
 }
 
+/**
+ * 取本次要同步的文本：字符串原样返回，函数形态在发送前求值。
+ * 取值抛错（model 已销毁）时返回 null 表示**放弃本次同步**——不能退回空串，
+ * 那会把 host 侧文档内容清掉，比漏一次同步严重得多（关闭路径由 closeDoc 负责）。
+ * @author ddj 2026年10月15号
+ * @param text 字符串或惰性取值函数
+ * @returns 待发送文本；无法取值时为 null
+ */
+function resolveText(text) {
+  if (typeof text === 'string') return text
+  try {
+    return String(text())
+  } catch (error) {
+    return null
+  }
+}
+
 function clearPending(path) {
   const timer = syncTimers.get(path)
   if (timer) { clearTimeout(timer); syncTimers.delete(path) }

package/src/client/monaco/lsp/providers.ts

@@ -95,7 +95,9 @@ export function registerLspProviders(monaco) {
     if (!model || model.uri.scheme !== 'edrv') return
     const path = pathOfModel(model)
     if (!path) return
-    const contentDisposer = model.onDidChangeContent(() => syncDoc(path, model.getValue()))
+    // 击键路径传惰性取值：去抖窗口内的中间态会被覆盖丢弃，事先取全文纯属白付（大文件尤甚）。
+    // model 已销毁时 resolveText 返回 null 放弃本次同步，不会拿空内容覆盖 host 侧文档。
+    const contentDisposer = model.onDidChangeContent(() => syncDoc(path, () => model.getValue()))
     const disposeDisposer = model.onWillDispose(() => {
       closeDoc(path)
       contentDisposer.dispose()

package/src/client/ui/EditorView.ts

@@ -4344,12 +4344,12 @@ export function EditorView(props) {
         React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '复制安装命令', onClick: copyInstallCmd }, '复制命令'),
         React.createElement('button', { className: 'edrv-side-hint-close', title: '关闭提示', 'aria-label': '关闭提示', onClick: dismissHint }, '×'))
     : null
-  const fullView = createPortal(React.createElement('div', { 'data-edrv-view': '1', style: { display: 'flex', flexDirection: 'column', flex: 1, minWidth: 0, minHeight: 0, overflow: 'hidden' } }, pathBar, sideHintEl, diskBanner(), editorArea, statusBar), fullHost, 'edrv-full-editor')
+  const fullView = createPortal(React.createElement(React.Fragment, null, pathBar, sideHintEl, diskBanner(), editorArea, statusBar), fullHost, 'edrv-full-editor')
   const mainCol = React.createElement('div', { className: 'edrv-main-col edrv-workbench', style: { flex: 1, minWidth: 0, minHeight: 0, display: 'flex', flexDirection: 'column', overflow: 'hidden' } },
     React.createElement('div', { className: 'edrv-workbench-tools' }, tabRow),
     renderTree(workbench.tree), fullView,
     workbench.floats.map((item, layer) => React.createElement(FloatingEditor, { key: item.group, owner: String(scope), group: item.group, rect: item, layer, focused: item.group === workbench.focused, onBounds: floatBounds, onFocus: selectGroup, onReturn: returnPane }, renderGroup(item.group))),
-    dragPreview ? createPortal(React.createElement('div', { 'data-edrv-view': '1', style: { display: 'contents', pointerEvents: 'none' } },
+    dragPreview ? createPortal(React.createElement(React.Fragment, null,
       dragPreview.rect ? React.createElement('div', { className: 'edrv-drag-overlay', style: dragPreview.rect }, React.createElement('span', { className: 'edrv-drop-label' }, dragPreview.label)) : null,
       React.createElement('div', { className: 'edrv-drag-ghost', style: { left: dragPreview.point.x + 12, top: dragPreview.point.y + 12 } }, baseNameOf(dragPreview.path) + ' · ' + dragPreview.label)), document.body) : null)
   // 编辑器根节点按 composer 顶部边界动态限高，底部对话区域继续由 DSH 原生渲染。

package/src/client/ui/FloatingWindow.ts

@@ -22,26 +22,29 @@ export interface WindowProps {
   children?: React.ReactNode
 }
 
-/** @private @author ddj 2026年10月14号 @param start Originating press. @param rect Initial bounds. @param sizing Resize mode. @param apply Commit bounds. @param done Gesture cleanup notification. @returns Gesture cancellation. */
-function beginGesture(start: React.PointerEvent, rect: FloatRect, sizing: boolean, apply: (rect: FloatRect) => void, done: () => void): () => void {
+/** @private @author ddj 2026年10月14号 @param start Originating press. @param rect Initial bounds. @param sizing Resize mode. @param draw Paint live bounds without a render. @param apply Commit bounds once. @param done Gesture cleanup notification. @returns Gesture cancellation. */
+function beginGesture(start: React.PointerEvent, rect: FloatRect, sizing: boolean, draw: (rect: FloatRect) => void, apply: (rect: FloatRect) => void, done: () => void): () => void {
   let frame: number | null = null
   let next = rect
-  /** @private @author ddj 2026年10月14号 Apply no more than once per frame. */
-  function paint(): void { frame = null; apply(next) }
+  let moved = false
+  /** @private @author ddj 2026年10月14号 Paint no more than once per frame. */
+  function paint(): void { frame = null; draw(next) }
   /** @private @author ddj 2026年10月14号 @param event Pointer motion. Ignore unrelated pointers. */
   function move(event: PointerEvent): void {
     if (event.pointerId !== start.pointerId) return
     event.preventDefault()
+    moved = true
     next = moveFloat(rect, event.clientX - start.clientX, event.clientY - start.clientY, sizing, window.innerWidth, window.innerHeight)
     if (frame === null) frame = requestAnimationFrame(paint)
   }
-  /** @private @author ddj 2026年10月14号 Remove listeners and commit pending geometry. */
+  /** @private @author ddj 2026年10月14号 Remove listeners, then commit the settled geometry exactly once. */
   function stop(): void {
-    if (frame !== null) { cancelAnimationFrame(frame); paint() }
+    if (frame !== null) { cancelAnimationFrame(frame); frame = null }
     window.removeEventListener('pointermove', move, true)
     window.removeEventListener('pointerup', end, true)
     window.removeEventListener('pointercancel', end, true)
     window.removeEventListener('blur', stop)
+    if (moved) { draw(next); apply(next) }
     done()
   }
   /** @private @author ddj 2026年10月14号 @param event Pointer release. Only end originating gesture. */
@@ -53,6 +56,31 @@ function beginGesture(start: React.PointerEvent, rect: FloatRect, sizing: boolea
   return stop
 }
 
+const resizeSinks = new Set<() => void>()
+let resizeFrame: number | null = null
+
+/** @private @author ddj 2026年10月14号 Re-clamp every window at most once per frame. */
+function onViewportResize(): void {
+  if (resizeFrame !== null) return
+  resizeFrame = requestAnimationFrame(() => {
+    resizeFrame = null
+    for (const sink of [...resizeSinks]) sink()
+  })
+}
+
+/** @private @author ddj 2026年10月14号 @param sink Per-window re-clamp callback. @returns Unsubscribe. */
+function subscribeResize(sink: () => void): () => void {
+  if (resizeSinks.size === 0) window.addEventListener('resize', onViewportResize)
+  resizeSinks.add(sink)
+  return () => {
+    resizeSinks.delete(sink)
+    if (resizeSinks.size === 0) {
+      window.removeEventListener('resize', onViewportResize)
+      if (resizeFrame !== null) { cancelAnimationFrame(resizeFrame); resizeFrame = null }
+    }
+  }
+}
+
 /** @public @author ddj 2026年10月14号 @param props Window contents and lifecycle callbacks. @returns Movable, resizable nonmodal portal. */
 export function FloatingWindow(props: WindowProps): React.ReactPortal {
   const id = React.useId()
@@ -63,21 +91,32 @@ export function FloatingWindow(props: WindowProps): React.ReactPortal {
   const current = React.useRef(props.rect ?? bounds)
   current.current = props.rect ?? bounds
   const cleanup = React.useRef<(() => void) | null>(null)
+  const gesture = React.useRef<FloatRect | null>(null)
   React.useSyncExternalStore(watchFloats, floatVersion, floatVersion)
   /** @private @author ddj 2026年10月14号 @param rect Next geometry. Notify controlled owner or retain local geometry. */
   function apply(rect: FloatRect): void {
     if (latest.current.rect) latest.current.onBounds?.(rect)
     else setBounds(rect)
   }
+  /** @private @author ddj 2026年10月14号 @param rect Live gesture geometry. Write the DOM and hold it until the commit render lands. */
+  function draw(rect: FloatRect): void {
+    gesture.current = rect
+    const node = root.current
+    if (!node) return
+    node.style.left = rect.left + 'px'
+    node.style.top = rect.top + 'px'
+    node.style.width = rect.width + 'px'
+    node.style.height = rect.height + 'px'
+  }
   /** @private @author ddj 2026年10月14号 End any active gesture. */
   function cancel(): void { cleanup.current?.(); cleanup.current = null }
-  /** @private @author ddj 2026年10月14号 Re-clamp after viewport resize. */
-  function resize(): void { cancel(); apply(clampFloat(current.current, window.innerWidth, window.innerHeight)) }
+  /** @private @author ddj 2026年10月14号 Re-clamp after viewport resize, preferring the gesture that just settled. */
+  function resize(): void { cancel(); apply(clampFloat(gesture.current ?? current.current, window.innerWidth, window.innerHeight)) }
   React.useEffect(() => {
     raiseFloat(id)
-    window.addEventListener('resize', resize)
+    const off = subscribeResize(resize)
     resize()
-    return () => { cancel(); window.removeEventListener('resize', resize); dropFloat(id) }
+    return () => { off(); cancel(); dropFloat(id) }
   }, [id])
   /** @private @author ddj 2026年10月14号 Activate without stealing text input focus. */
   function focus(): void { raiseFloat(id); latest.current.onFocus?.() }
@@ -91,10 +130,17 @@ export function FloatingWindow(props: WindowProps): React.ReactPortal {
     if (event.button !== 0 || !event.isPrimary) return
     cancel()
     event.preventDefault()
-    cleanup.current = beginGesture(event, current.current, sizing, apply, clear)
+    cleanup.current = beginGesture(event, gesture.current ?? current.current, sizing, draw, apply, clear)
+  }
+  // 手势几何的持有范围只到「提交渲染落地」为止：apply() 走的是 pointerup 等离散事件，
+  // React 18 会在事件末尾同步 flush，下一次渲染 base 已是新几何，故此处可同步释放。
+  // 勘误 2026-10-14（测试约定）：原先额外挂一帧再释放，会在手势结束后残留一个待执行帧
+  // （tests/floatingWindow.test.ts 断言 frames.size === 0），且无必要。
+  /** @private @author ddj 2026年10月14号 Release the settled geometry once React has committed it. */
+  function clear(): void {
+    cleanup.current = null
+    gesture.current = null
   }
-  /** @private @author ddj 2026年10月14号 Clear completed gesture reference. */
-  function clear(): void { cleanup.current = null }
   /** @private @author ddj 2026年10月14号 @param event Title press. Preserve title action buttons. */
   function moveStart(event: React.PointerEvent): void { if (!(event.target as Element).closest('button')) start(event, false) }
   /** @private @author ddj 2026年10月14号 @param event Resize press. */
@@ -107,7 +153,8 @@ export function FloatingWindow(props: WindowProps): React.ReactPortal {
     }
     props.onKeyDown?.(event)
   }
-  const rect = clampFloat(props.rect ?? bounds, window.innerWidth, window.innerHeight)
+  const base = clampFloat(props.rect ?? bounds, window.innerWidth, window.innerHeight)
+  const rect = gesture.current ?? base
   return createPortal(React.createElement('div', {
     ref: root, tabIndex: -1, role: 'dialog', 'aria-label': props.title, 'aria-modal': false,
     className: 'edrv-floating', 'data-edrv-view': '1', 'data-edrv-window': id,

package/src/client/ui/McpSettings.ts

@@ -414,7 +414,7 @@ function CompatSection({ getSummary }) {
     devForm?.enabled && group('开发形态', React.createElement('div', { className: 'vsm-compat-item ok' }, React.createElement('span', { className: 'vsm-compat-name' }, '开发形态开启（工作区链接安装）'), React.createElement('span', { className: 'vsm-compat-note' }, devForm.path))),
     group('版本适配', renderItems(report?.adapters)),
     group('外部插件与服务', renderItems(report?.external)),
-    group('客户端适配', renderItems(getSummary?.() ?? [])),
+    group('客户端适配', renderItems(getSummary?.(report?.dshVersion ?? '') ?? [])),
     group('护栏', renderItems(report?.guards)),
     group('警告', warnings.length ? warnings.map((w, index) => React.createElement('div', { key: index, className: 'vsm-mcp-error vsm-mcp-banner' }, w)) : React.createElement('div', { className: 'vsm-compat-item ok' }, React.createElement('span', { className: 'vsm-compat-name' }, '未检测到兼容性问题'), React.createElement('span', { className: 'vsm-compat-note' }, ''))),
   )

package/src/client/ui/SvnLogDialog.ts

@@ -571,11 +571,42 @@ function PathRow(props) {
     buttons)
 }
 
+/**
+ * 单个数据行：浅比较包装（回调身份由父级 ref 转发保持稳定，故 memo 才可能命中）。
+ * @author ddj 2026年10月14号
+ */
+const LogItemRow = React.memo(LogItem)
+
+/**
+ * 数据行容器（P0-14 上段）。独立 memo：只在条目列表/选中集/工作副本版号变化时重建行元素；
+ * 上段高度拖拽与弹窗缩放只改 LogList 的 height，不再逐帧重建整表（原先每帧 logRowsOf + N 个元素）。
+ * @author ddj 2026年10月14号
+ * @param props.list 过滤排序后的条目（非空）
+ * @param props.selectedRevs 可见选中的 revision 集合
+ * @param props.wcRev 工作副本版号（null = 不加粗）
+ * @param props.onPick 选中回调（event, item）
+ * @param props.onMenu 右键回调（event, item）
+ * @returns 行元素
+ */
+const LogRows = React.memo(function LogRows(props) {
+  const { list, selectedRevs, wcRev, onPick, onMenu } = props
+  return React.createElement(React.Fragment, null,
+    logRowsOf(list).map((row) => React.createElement(LogItemRow, {
+      key: row.item.revision + ':' + row.level,
+      item: row.item,
+      on: selectedRevs.has(row.item.revision),
+      wc: wcRev != null && row.item.revision === wcRev,
+      level: row.level,
+      onPick,
+      onMenu,
+    })))
+})
+
 /**
  * 上窗格列表（列头行 + 数据行 + 「加载更多」；P0-13 宽度受拖拽控制）。
  * @author ddj 2026年09月16号 / 2026年09月17号
  * @param props.list 过滤排序后的条目（null = 未加载）
- * @param props.selected 选中条目数组（P1-3 多选；至少一条，由父级保证）
+ * @param props.selectedRevs 可见选中的 revision 集合（P1-3 多选；由父级按 revision 维护）
  * @param props.keyword 过滤词（决定空态文案）
  * @param props.busy 加载中
  * @param props.truncated 是否可能还有更多
@@ -588,22 +619,14 @@ function PathRow(props) {
  * @returns 列表元素
  */
 function LogList(props) {
-  const { list, selected, keyword, busy, truncated, sortKey, sortDir, onSort, onSortReset, onPick, onLoadMore, onItemMenu, height, wcRev } = props
+  const { list, selectedRevs, keyword, busy, truncated, sortKey, sortDir, onSort, onSortReset, onPick, onLoadMore, onItemMenu, height, wcRev } = props
   let inner
   if (list === null) {
     inner = React.createElement('div', { className: 'edrv-tree-loading' }, busy ? '读取日志中…' : '尚未加载')
   } else if (!list.length) {
     inner = React.createElement('div', { className: 'edrv-tree-loading' }, keyword ? '无匹配条目' : '无提交历史')
   } else {
-    inner = logRowsOf(list).map((row) => React.createElement(LogItem, {
-      key: row.item.revision + ':' + row.level,
-      item: row.item,
-      on: selected.some((s) => s.revision === row.item.revision),
-      wc: wcRev != null && row.item.revision === wcRev,
-      level: row.level,
-      onPick,
-      onMenu: onItemMenu,
-    }))
+    inner = React.createElement(LogRows, { list, selectedRevs, wcRev, onPick, onMenu: onItemMenu })
   }
   const more = truncated
     ? React.createElement('div', { className: 'edrv-svnlog-more' },
@@ -921,10 +944,14 @@ export function SvnLogDialog(props) {
     () => (filtered === null ? null : orderLogEntries(filtered, sortKey ?? 'revision', sortKey ? sortDir : 'desc')),
     [filtered, sortKey, sortDir],
   )
-  // P1-3：可见选中 = 选中数组 ∩ 当前显示列表；current = 可见选中首条（详情/菜单主语），空则回落首条
-  const visibleSelected = sorted
-    ? selected.filter((item) => sorted.some((x) => x.revision === item.revision))
-    : selected
+  // P1-3：可见选中 = 选中数组 ∩ 当前显示列表；current = 可见选中首条（详情/菜单主语），空则回落首条。
+  // 交集改用 revision 集合：原实现对每条选中再扫一遍显示列表（O(n×m)）且每次渲染重算（缩放弹窗时每帧都会走到）。
+  const sortedRevs = React.useMemo(() => (sorted ? new Set(sorted.map((x) => x.revision)) : null), [sorted])
+  const visibleSelected = React.useMemo(
+    () => (sortedRevs ? selected.filter((item) => sortedRevs.has(item.revision)) : selected),
+    [sortedRevs, selected],
+  )
+  const selectedRevs = React.useMemo(() => new Set(visibleSelected.map((item) => item.revision)), [visibleSelected])
   const current = visibleSelected.length
     ? visibleSelected[0]
     : (sorted && sorted.length ? sorted[0] : null)
@@ -1022,30 +1049,37 @@ export function SvnLogDialog(props) {
    * @param wantList 目标上段（修订列表）高度
    * @param wantMsg 目标中段（提交信息）高度
    */
+  /** @private @author ddj 2026年10月14号 @param nextList 目标上段高度 @param nextMsg 目标中段高度 只在值真正变化时提交。 */
+  const applyFit = (nextList, nextMsg) => {
+    if (nextList !== listH) setListH(nextList)
+    if (nextMsg !== msgH) setMsgH(nextMsg)
+  }
+
   const fitHeights = (wantList, wantMsg) => {
     const total = bodyRef.current?.clientHeight ?? 0
-    if (!total) { setListH(wantList); setMsgH(wantMsg); return }
+    if (!total) { applyFit(wantList, wantMsg); return }
     const paneOcc = paneRef.current?.offsetHeight ?? -1
     // 实测导出非本段占用（勘误 2026-09-24：手算公式漏 gap/margin/padding 曾致保底仅114）；测不到回落分隔条
     const chrome = paneOcc >= 0 ? Math.max(0, total - listH - msgH - paneOcc) : HSPLIT_TOTAL_PX
     const budget = total - PANE_KEEP_MIN - chrome
     if (budget < LIST_H_MIN + MSG_H_MIN) {
-      setListH(Math.min(wantList, LIST_H_MIN))
-      setMsgH(Math.min(wantMsg, MSG_H_MIN))
+      applyFit(Math.min(wantList, LIST_H_MIN), Math.min(wantMsg, MSG_H_MIN))
       return
     }
-    if (wantList + wantMsg <= budget) { setListH(wantList); setMsgH(wantMsg); return }
+    if (wantList + wantMsg <= budget) { applyFit(wantList, wantMsg); return }
     const scale = budget / (wantList + wantMsg)
     let nextList = Math.floor(wantList * scale)
     let nextMsg = Math.floor(wantMsg * scale)
     if (nextList < LIST_H_MIN) { nextList = LIST_H_MIN; nextMsg = Math.min(nextMsg, budget - nextList) }
     else if (nextMsg < MSG_H_MIN) { nextMsg = MSG_H_MIN; nextList = Math.min(nextList, budget - nextMsg) }
-    setListH(nextList)
-    setMsgH(nextMsg)
+    applyFit(nextList, nextMsg)
   }
 
   // 初始/弹窗尺寸变化 fit（2026-09-24 用户反馈：固定高中段把下段变更文件区挤到 0）：
-  // 挂载与 dlgH 变化时收敛一次；拖拽期间不介入（拖拽自带 clamp），双击复位经 fitHeights 显式收敛。
+  // 观察的是 body（其高度由弹窗尺寸决定、不含 listH/msgH），故收敛是单步不动点、不会与自身互相激发；
+  // 拖拽期间不介入（拖拽自带 clamp），双击复位经 fitHeights 显式收敛。
+  // 勘误 2026-10-14：ResizeObserver 回调本身已按帧派发，无需再包 rAF —— 推迟到下一帧反而会多出
+  // 一帧「尺寸已变小、height 还是旧值」的中间态，正是要避免的下段被挤扁。改由 applyFit 抑制同值提交。
   const fitRef = React.useRef(null)
   fitRef.current = () => fitHeights(listH, msgH)
   React.useEffect(() => {
@@ -1127,6 +1161,15 @@ export function SvnLogDialog(props) {
     })
   }
 
+  // React.memo 生效的前提是行回调身份稳定：pickWithMods/onItemMenu 的闭包依赖 anchorRev/sorted/visibleSelected，
+  // 每次渲染都是新函数，会把 LogRows/LogItemRow 的 memo 全部打穿。用 ref 存最新闭包、useCallback 空依赖转发。
+  /** @author ddj 2026年10月14号 */
+  const rowCbs = React.useRef<{ pick: ((event: unknown, item: unknown) => void) | null; menu: ((event: unknown, item: unknown) => void) | null }>({ pick: null, menu: null })
+  rowCbs.current.pick = pickWithMods
+  rowCbs.current.menu = onItemMenu
+  const pickStable = React.useCallback((event: unknown, item: unknown) => rowCbs.current.pick?.(event, item), [])
+  const menuStable = React.useCallback((event: unknown, item: unknown) => rowCbs.current.menu?.(event, item), [])
+
   /** 下窗格路径行右键菜单（P0-8；G8 目录不可开差异，G9 仓库外不可打开）。 */
   const onPathMenu = (event, item, revision) => {
     event.preventDefault()
@@ -1149,9 +1192,9 @@ export function SvnLogDialog(props) {
   // P0-14 上中下三段全宽：上=修订列表（高可拖）/ 中=提交信息（高可拖）/ 下=变更路径（占余）
   const body = React.createElement('div', { className: 'edrv-svnlog-body', ref: bodyRef },
     React.createElement(LogList, {
-      list: sorted, selected: visibleSelected, keyword: query.trim(), busy, truncated,
+      list: sorted, selectedRevs, keyword: query.trim(), busy, truncated,
       sortKey, sortDir, onSort, onSortReset,
-      onPick: pickWithMods, onLoadMore, onItemMenu,
+      onPick: pickStable, onLoadMore, onItemMenu: menuStable,
       height: listH, wcRev,
     }),
     React.createElement(Splitter, {

package/src/svn.ts

@@ -1119,8 +1119,15 @@ export function createSvnRpc(deps: SvnRpcDeps): { handlers: Record<string, unkno
       const paths = [...new Set(args.paths.map(safeRel))]
       if (paths.some((path) => !path)) return { ok: false as const, error: '路径不合法' }
       try {
+        // 分批并发（批 4，计划批准值）：冲突面板一次请求上限 64 条，旧串行版在 64 冲突时要排队 64 次 svn 进程
+        // （每次冷启动约 10~40ms，最坏累计 1~2s 阻塞面板）。readConflict 只跑 `svn status --xml`（只读，无写入竞争）。
+        // 与 svn.fileSizes 的分批并发同型（见下方 BATCH = 16）；分批 push 保持结果顺序不变。
+        // @author ddj 2026年10月14号
         const states = []
-        for (const path of paths) states.push(await readConflict(scope.cwd, scope.root, path!))
+        const BATCH = 4
+        for (let start = 0; start < paths.length; start += BATCH) {
+          states.push(...await Promise.all(paths.slice(start, start + BATCH).map((path) => readConflict(scope.cwd, scope.root, path!))))
+        }
         return { ok: true as const, states }
       } catch (error) { return { ok: false as const, error: String(error) } }
     },