dsh-vscode-mode 0.15.3 → 0.15.5

package/src/client/ui/FloatingWindow.ts

@@ -0,0 +1,168 @@
+/** Shared in-page window chrome, without a mask or focus trap. @author ddj 2026年10月14号 */
+import React from 'react'
+import { createPortal } from 'react-dom'
+import { clampFloat } from '../state/editorLayout.js'
+import type { FloatRect } from '../state/editorLayout.js'
+import { dropFloat, floatLayer, floatVersion, initialFloat, moveFloat, raiseFloat, watchFloats } from '../state/floatingWindow.js'
+
+export interface WindowProps {
+  title: string
+  dialogClass?: string
+  width?: number
+  height?: number
+  rect?: FloatRect
+  owner?: string
+  group?: string
+  closeOnEsc?: boolean
+  onClose?: () => void
+  onBounds?: (rect: FloatRect) => void
+  onFocus?: () => void
+  onKeyDown?: (event: React.KeyboardEvent) => void
+  actions?: React.ReactNode
+  children?: React.ReactNode
+}
+
+/** @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
+  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, then commit the settled geometry exactly once. */
+  function stop(): void {
+    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. */
+  function end(event: PointerEvent): void { if (event.pointerId === start.pointerId) stop() }
+  window.addEventListener('pointermove', move, true)
+  window.addEventListener('pointerup', end, true)
+  window.addEventListener('pointercancel', end, true)
+  window.addEventListener('blur', stop)
+  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()
+  const root = React.useRef<HTMLDivElement>(null)
+  const latest = React.useRef(props)
+  latest.current = props
+  const [bounds, setBounds] = React.useState(() => initialFloat(props.width ?? 760, props.height ?? 600, window.innerWidth, window.innerHeight))
+  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, preferring the gesture that just settled. */
+  function resize(): void { cancel(); apply(clampFloat(gesture.current ?? current.current, window.innerWidth, window.innerHeight)) }
+  React.useEffect(() => {
+    raiseFloat(id)
+    const off = subscribeResize(resize)
+    resize()
+    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?.() }
+  /** @private @author ddj 2026年10月14号 @param event Window press. Give noninteractive content a keyboard owner. */
+  function activate(event: React.PointerEvent): void {
+    focus()
+    if (!(event.target as Element).closest('button, input, select, textarea, a, [contenteditable], .monaco-editor')) root.current?.focus({ preventScroll: true })
+  }
+  /** @private @author ddj 2026年10月14号 @param event Handle press. @param sizing Resize instead of move. */
+  function start(event: React.PointerEvent, sizing: boolean): void {
+    if (event.button !== 0 || !event.isPrimary) return
+    cancel()
+    event.preventDefault()
+    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号 @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. */
+  function sizeStart(event: React.PointerEvent): void { start(event, true) }
+  /** @private @author ddj 2026年10月14号 @param event Local key. Exclude React-bubbling child portals. */
+  function keyDown(event: React.KeyboardEvent): void {
+    if ((event.target as Element).closest('[data-edrv-window]') !== root.current || event.defaultPrevented) return
+    if (event.key === 'Escape' && props.closeOnEsc !== false && props.onClose) {
+      event.preventDefault(); event.stopPropagation(); props.onClose(); return
+    }
+    props.onKeyDown?.(event)
+  }
+  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,
+    'data-edrv-float': props.group, 'data-edrv-owner': props.owner,
+    style: { ...rect, zIndex: floatLayer(id) }, onPointerDownCapture: activate, onFocusCapture: focus, onKeyDown: keyDown,
+  },
+  React.createElement('div', { className: 'edrv-floating-title', onPointerDown: moveStart },
+    React.createElement('span', null, props.title), props.actions),
+  React.createElement('div', { className: 'edrv-floating-content' + (props.dialogClass ? ' ' + props.dialogClass : '') }, props.children),
+  React.createElement('div', { className: 'edrv-floating-grip', title: '拖动调整窗口大小', onPointerDown: sizeStart })), document.body)
+}

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/SvnAiPlanDialog.ts

@@ -14,7 +14,7 @@
  * 作者 ddj 2026年09月23号
  */
 import React from 'react'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 
 /**
  * 预览勾选初值：分组默认全勾（changelist 可逆），还原/忽略默认不勾（有副作用）。
@@ -282,11 +282,11 @@ export function SvnAiPlanDialog(props) {
             }, '取消剩余'))))
   }
 
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 智能整理', height: 600,
     key: 'edrv-svn-plan',
     dialogClass: 'edrv-svnplan-dialog',
-    width: 'min(680px, calc(100vw - 48px))',
-    closeOnMask: !running,
+    width: 680,
     closeOnEsc: !running,
     onClose,
   }, header, metaEl, body, footer)

package/src/client/ui/SvnLogDialog.ts

@@ -26,6 +26,8 @@ import { SVN_LOG_ACTION_LABEL } from '../../shared/svn.js'
 import { orderLogEntries } from '../../svnLog.js'
 import { SVN_LOG_SHOW_ALL_LIMIT } from '../svnLog.js'
 import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
+import { inputOwnsKey } from '../state/floatingWindow.js'
 import { ContextMenu } from './ContextMenu.js'
 import type { ContextMenuEntry } from './ContextMenu.js'
 import { SvnLogStats } from './SvnLogStats.js'
@@ -569,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 是否可能还有更多
@@ -586,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' },
@@ -886,9 +911,6 @@ export function SvnLogDialog(props) {
   const [sortKey, setSortKey] = React.useState(null)
   const [sortDir, setSortDir] = React.useState('desc')
   const [menu, setMenu] = React.useState(null)
-  const [dlgW, setDlgW] = React.useState(() => Math.min(DIALOG_W_DEFAULT, (typeof window !== 'undefined' ? window.innerWidth : 1280) - 24)) // P0-14：外框宽（拖拽受控）
-  const [dlgH, setDlgH] = React.useState(() => Math.min(DIALOG_H_DEFAULT, (typeof window !== 'undefined' ? window.innerHeight : 800) - 24)) // P0-14：外框高（拖拽受控）
-  const [anchor, setAnchor] = React.useState(null) // 八向拖拽锚点（null=flex 居中；非 null=absolute 定位于该视口坐标） @author ddj 2026年09月24号
   const [listH, setListH] = React.useState(LIST_H_DEFAULT) // P0-14：上段修订列表高（拖拽受控）
   const [msgH, setMsgH] = React.useState(MSG_H_DEFAULT) // P0-14：中段提交信息高（拖拽受控）
   const [statsOpen, setStatsOpen] = React.useState(false) // P1-10：统计窗开关
@@ -922,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)
@@ -998,65 +1024,6 @@ export function SvnLogDialog(props) {
     window.addEventListener('pointerup', up)
   }
 
-  // 八向（13-log-ui-polish 增量3）：pointerdown 取卡片视口 rect 起点并立即 absolute 锚定，
-  // 实现「拖哪边哪边动、对边固定」（flex 居中模型无法表达该语义）；clamp = 尺寸下限 680/480
-  // 与视口 12px 边距；每把手柄都以实际 rect 重锚 → CSS 截断/取整漂移自校正。
-  const startResize = (event, mode) => {
-    event.preventDefault()
-    event.stopPropagation()
-    const card = event.currentTarget.parentElement
-    const rect = card ? card.getBoundingClientRect() : null
-    if (!rect) return
-    const r0 = { left: rect.left, top: rect.top, width: rect.width, height: rect.height }
-    const startX = event.clientX
-    const startY = event.clientY
-    const moveL = mode === 'w' || mode === 'nw' || mode === 'sw'
-    const moveR = mode === 'e' || mode === 'ne' || mode === 'se'
-    const moveT = mode === 'n' || mode === 'nw' || mode === 'ne'
-    const moveB = mode === 's' || mode === 'sw' || mode === 'se'
-    const EDGE = 12 // 视口边距
-    const right0 = r0.left + r0.width
-    const bottom0 = r0.top + r0.height
-    // 起手锚定：切 absolute 到当前 rect（视觉零跳变）并同步 state=实际渲染尺寸
-    setAnchor({ left: r0.left, top: r0.top })
-    setDlgW(Math.round(r0.width))
-    setDlgH(Math.round(r0.height))
-    const move = (e) => {
-      const dx = e.clientX - startX
-      const dy = e.clientY - startY
-      let left = r0.left
-      let top = r0.top
-      let width = r0.width
-      let height = r0.height
-      if (moveR) width = Math.min(Math.max(DIALOG_W_MIN, r0.width + dx), window.innerWidth - EDGE - r0.left)
-      if (moveL) { left = Math.min(Math.max(EDGE, r0.left + dx), right0 - DIALOG_W_MIN); width = right0 - left }
-      if (moveB) height = Math.min(Math.max(DIALOG_H_MIN, r0.height + dy), window.innerHeight - EDGE - r0.top)
-      if (moveT) { top = Math.min(Math.max(EDGE, r0.top + dy), bottom0 - DIALOG_H_MIN); height = bottom0 - top }
-      const nextLeft = left
-      const nextTop = top
-      setAnchor((prev) => (prev && prev.left === nextLeft && prev.top === nextTop) ? prev : { left: nextLeft, top: nextTop })
-      setDlgW(Math.round(width))
-      setDlgH(Math.round(height))
-    }
-    const up = () => {
-      window.removeEventListener('pointermove', move)
-      window.removeEventListener('pointerup', up)
-      swallowNextClick()
-    }
-    window.addEventListener('pointermove', move)
-    window.addEventListener('pointerup', up)
-  }
-
-  /**
-   * 双击复位：清锚回 flex 居中 + 默认尺寸（视口 clamp 同初始，防小屏溢出）。
-   * @author ddj 2026年09月24号
-   */
-  const resetDlgSize = () => {
-    setAnchor(null)
-    setDlgW(Math.min(DIALOG_W_DEFAULT, window.innerWidth - 24))
-    setDlgH(Math.min(DIALOG_H_DEFAULT, window.innerHeight - 24))
-  }
-
   /** 上段修订列表高度拖拽（clamp：下限 200，上限 = body 高 - 信息区/路径区/分隔条保留空间）。 */
   const onListHDrag = (event) => startDrag(event, 'y', listH, (next) => {
     const total = bodyRef.current?.clientHeight ?? 0
@@ -1082,33 +1049,45 @@ 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(() => {
-    fitHeights(listH, msgH)
-  }, [dlgH])
+    const observer = new ResizeObserver(() => fitRef.current?.())
+    if (bodyRef.current) observer.observe(bodyRef.current)
+    fitRef.current?.()
+    return () => observer.disconnect()
+  }, [])
 
   // 勘误2（2026-09-24）：挂载 fit 量到的是数据到达前布局（终态差 ~4px → 保底 166）。
   // 初次数据到达以终态布局补 fit 一次收敛至 ≥170；单次门闩，之后刷新/加载更多/拖拽不介入。
@@ -1118,24 +1097,20 @@ export function SvnLogDialog(props) {
     fitHeights(listH, msgH)
   }, [list])
 
-  // 键盘：F5 刷新（防浏览器整页刷新）；↑↓ 在显示列表内移动选中（输入框内不劫持）
-  React.useEffect(() => {
-    const onKey = (event) => {
-      if (event.key === 'F5') { event.preventDefault(); onRefresh(); return }
-      if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') return
-      const tag = String(event.target?.tagName ?? '').toLowerCase()
-      if (tag === 'input' || tag === 'select' || tag === 'textarea') return
-      if (!sorted || !sorted.length) return
-      event.preventDefault()
-      const at = sorted.findIndex((item) => item.revision === selected[0]?.revision)
-      const next = at < 0 ? 0 : Math.min(sorted.length - 1, Math.max(0, at + (event.key === 'ArrowDown' ? 1 : -1)))
-      const hit = sorted[next]
-      setSelected([hit]) // ↑↓ 折叠为单选（官方同款），并重置 Shift 基准
-      setAnchorRev(hit.revision)
-    }
-    window.addEventListener('keydown', onKey, true)
-    return () => window.removeEventListener('keydown', onKey, true)
-  }, [sorted, onRefresh, selected])
+  /** @private @author ddj 2026年10月14号 @param event 日志浮窗内按键。其他窗口及输入控件保留自己的键盘行为。 */
+  function onLogKey(event) {
+    if (rangeOpen || menu || inputOwnsKey(event.target)) return
+    if (event.key === 'F5') { event.preventDefault(); event.stopPropagation(); onRefresh(); return }
+    if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') return
+    if (!sorted || !sorted.length) return
+    event.preventDefault()
+    event.stopPropagation()
+    const at = sorted.findIndex((item) => item.revision === selected[0]?.revision)
+    const next = at < 0 ? 0 : Math.min(sorted.length - 1, Math.max(0, at + (event.key === 'ArrowDown' ? 1 : -1)))
+    const hit = sorted[next]
+    setSelected([hit])
+    setAnchorRev(hit.revision)
+  }
 
   /** 复制当前选中修订（P0-9；剪贴板不可用静默忽略）。 */
   const copyRevision = (entry) => {
@@ -1186,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()
@@ -1208,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, {
@@ -1224,16 +1208,10 @@ export function SvnLogDialog(props) {
     React.createElement('div', { className: 'edrv-svnlog-pane edrv-svnlog-pathspane', ref: paneRef },
       React.createElement(LogPathsInner, { selected: visibleSelected, target, onlyAffected, onOpenFile, onOpenDiff, onPathMenu })))
 
-  return React.createElement(ModalShell, {
-    dialogClass: 'edrv-svnlog-dialog',
-    width: Math.round(dlgW) + 'px',
-    // 八向锚定（增量3）：anchor 非空时 absolute 定位于视口坐标（脱离 flex 居中，视觉零跳变）；
-    // border-box 令 rect==state（clamp/拖拽零换算）；maxHeight:none 消除 88vh 造成 state≠视觉的漂移。
-    cardStyle: Object.assign(
-      { height: Math.round(dlgH) + 'px', boxSizing: 'border-box', maxHeight: 'none' },
-      anchor ? { position: 'absolute', left: Math.round(anchor.left) + 'px', top: Math.round(anchor.top) + 'px' } : null,
-    ),
-    onClose,
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 日志', dialogClass: 'edrv-svnlog-dialog',
+    width: DIALOG_W_DEFAULT, height: DIALOG_H_DEFAULT,
+    onKeyDown: onLogKey, onClose,
   },
     React.createElement(LogHead, { target, onClose }),
     React.createElement(LogFilterBar, {
@@ -1249,15 +1227,6 @@ export function SvnLogDialog(props) {
       onExportCsv: () => onExport('csv'), onExportHtml: () => onExport('html'),
       rangeActive: rangeActive === true, onOpenRange: () => setRangeOpen(true), onRangeReset: () => onRangeReset?.(),
     }),
-    // 八向手柄（增量3）：四边先渲染、四角后渲染（角盖过相邻边 2px overlap）；双击复位统一走 resetDlgSize
-    React.createElement(Grip, { mode: 'n', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 's', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'w', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'e', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'nw', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'ne', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'sw', onDragStart: startResize, onReset: resetDlgSize }),
-    React.createElement(Grip, { mode: 'se', onDragStart: startResize, onReset: resetDlgSize }),
     (menu ? React.createElement(ContextMenu, { x: menu.x, y: menu.y, entries: menu.entries, onClose: () => setMenu(null) }) : null),
     (statsOpen ? React.createElement(SvnLogStats, { key: 'edrv-svnlog-stats', entries: sorted, onClose: () => setStatsOpen(false) }) : null),
     (rangeOpen ? React.createElement(ModalShell, {

package/src/client/ui/SvnLogStats.ts

@@ -10,7 +10,7 @@
  * 作者 ddj 2026年09月17号
  */
 import React from 'react'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 
 /** stacked 时间线展开的作者上限（其余并入「其他」）。 */
 const STACK_TOP = 5
@@ -205,11 +205,10 @@ export function SvnLogStats(props) {
   const [othersPct, setOthersPct] = React.useState(0)
   const [stacked, setStacked] = React.useState(false)
   const stats = React.useMemo(() => svnLogStatsOf(entries, { caseInsensitive: ci }), [entries, ci])
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 日志统计', height: 600,
     dialogClass: 'edrv-svnlog-stats',
-    width: 'min(680px, calc(100vw - 40px))',
-    zIndex: 192,
-    closeOnEsc: false,
+    width: 680,
     onClose,
   },
     React.createElement('div', { className: 'edrv-svnlog-stats-head' },

package/src/client/ui/SvnPatchDialog.ts

@@ -9,7 +9,7 @@
  * 作者 ddj 2026年09月20号
  */
 import React from 'react'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { downloadText } from './svnExport.js'
 
 /**
@@ -40,10 +40,11 @@ export function SvnPatchDialog(props) {
     onNote?.(done ? '已保存 ' + fileName : '保存失败：浏览器下载能力不可用')
   }
 
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 补丁预览', height: 560,
     key: 'edrv-svn-patch',
     dialogClass: 'edrv-svn-patch-dialog',
-    width: 'min(760px, calc(100vw - 48px))',
+    width: 760,
     onClose,
   },
     React.createElement('div', { className: 'edrv-svn-patch-head' },

package/src/client/ui/SvnSumDialog.ts

@@ -9,7 +9,7 @@
  */
 import React from 'react'
 import { SVN_SUM_LETTER } from '../../shared/svn.js'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { svnDiffSum } from '../svnStatus.js'
 
 /**
@@ -53,10 +53,11 @@ export function SvnSumDialog(props) {
       (entry.kind === 'dir' ? React.createElement('span', { className: 'edrv-svnlog-path-kind' }, '目录') : null)))
   }
 
-  return React.createElement(ModalShell, {
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 目录对比', height: 560,
     key: 'edrv-svn-sum',
     dialogClass: 'edrv-svn-sum-dialog',
-    width: 'min(680px, calc(100vw - 48px))',
+    width: 680,
     onClose,
   },
     React.createElement('div', { className: 'edrv-svn-patch-head' },

package/src/client/ui/SvnUpdateDialog.ts

@@ -9,7 +9,7 @@ import { rpc } from '../rpc.js'
 import { absoluteOf } from '../tabActions.js'
 import { ContextMenu } from './ContextMenu.js'
 import type { ContextMenuEntry } from './ContextMenu.js'
-import { ModalShell } from './ModalShell.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { nextConflict, nextUpdateSort, rowConflict, sortUpdateRows, updateActs, updateCloseMode, updateDone, updateLocked, updateParent, updateRange, updateReady, updateType } from './svnUpdateModel.js'
 import type { UpdateColumn, UpdateSort } from './svnUpdateModel.js'
 
@@ -564,10 +564,9 @@ export function SvnUpdateDialog(props: UpdateProps): React.ReactElement {
   const phase = pendingRows && processFinished ? '正在加载更新明细…'
     : state?.phase === 'completed' ? '更新完成' : state?.phase === 'failed' ? '更新失败'
     : state?.phase === 'cancelled' ? '更新已停止' : state?.phase === 'cancelling' ? '正在停止…' : '正在更新…'
-  return React.createElement(ModalShell, {
-    dialogClass: 'edrv-update-dialog', width: 'min(1320px, calc(100vw - 48px))',
-    cardStyle: { height: 'min(680px, calc(100vh - 48px))', boxSizing: 'border-box', maxHeight: 'none' },
-    closeOnEsc: closeMode.passive, closeOnMask: closeMode.passive, onClose: dismiss,
+  return React.createElement(FloatingWindow, {
+    title: 'SVN 更新', dialogClass: 'edrv-update-dialog', width: 1320, height: 680,
+    closeOnEsc: closeMode.passive, onClose: dismiss,
   },
     updateHead(props, state, phase, closable, dismiss),
     updateTable(props, displayRows, view, selection, finished, sort, onSort, evidence.states),

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) } }
     },