dsh-vscode-mode 0.15.2 → 0.15.4

package/package.json

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

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

@@ -15,6 +15,8 @@ import { workspaceScopeOf } from '../../state/scopeStore.js'
 import { takeSearchSeed, takeSearchScope } from '../../searchSeed.js'
 
 const DEBOUNCE_MS = 250
+/** 文件变更后的重搜去抖：合并一次写盘的 refresh+file-changed 双事件与批量保存。 */
+const REFRESH_DEBOUNCE_MS = 300
 const INCLUDE_PLACEHOLDER = '例如 *.ts, src/**/include'
 
 /**
@@ -56,6 +58,30 @@ export function savedSearchOf(key: string) {
   }
 }
 
+/**
+ * 判断文件变化通知是否属于本面板作用域。
+ * @author ddj 2026年10月14号
+ * @param detail 事件 detail（scope 可缺省）
+ * @param scope 本面板作用域
+ * @returns 是否触发重搜
+ */
+export function noticeInScope(detail: any, scope: string): boolean {
+  const changed = detail?.scope
+  return !changed || changed === scope
+}
+
+/**
+ * 判断文件变化通知是否可能改变内容搜索命中。
+ * 文件增删改名（structure）会增删命中，一并重搜；SVN 状态刷新（svn）不代表内容变化，跳过以免无谓全库扫描。
+ * @author ddj 2026年10月14号
+ * @param detail 事件 detail（kind 可缺省）
+ * @returns 是否触发重搜
+ */
+export function noticeTouchesContent(detail: any): boolean {
+  const kind = detail?.kind
+  return !kind || kind === 'text' || kind === 'structure'
+}
+
 /**
  * 命中行文本三段切分（before/命中/after，列为 1-based UTF-16）。
  * @param text 行文本
@@ -103,6 +129,8 @@ export function SearchPanel(props) {
   queryRef.current = query
   const activePathRef = React.useRef(activePath)
   activePathRef.current = activePath
+  // 文件变化后的重搜定时器（与输入防抖分开：两者互不取消对方）
+  const refreshTimerRef = React.useRef(null)
   // 请求参数 ref：防抖/立即重搜闭包统一读最新值，避免陈旧选项
   const requestRef = React.useRef({ matchCase, wholeWord, regex, include: [], exclude: [] })
   requestRef.current = {
@@ -152,9 +180,11 @@ export function SearchPanel(props) {
 
   /**
    * 执行内容搜索（请求参数从 ref 读最新值）。
+   * @author ddj 2026年10月14号
    * @param text 搜索词
+   * @param force 是否强制绕过 host 短期缓存（文件变更后的重搜必须读最新磁盘内容）
    */
-  const runSearch = (text) => {
+  const runSearch = (text, force) => {
     const s = ++seqRef.current
     const clean = String(text ?? '').trim()
     if (clean.length < 2) { setMatches(null); setStatus('idle'); return }
@@ -174,6 +204,8 @@ export function SearchPanel(props) {
       sessionId, query: clean,
       matchCase: req.matchCase, wholeWord: req.wholeWord, regex: req.regex,
       include: req.include, exclude: req.exclude,
+      // 仅重搜路径带上 force：普通搜索的请求载荷与修复前保持完全一致。
+      ...(force === true ? { force: true } : {}),
     }).then((res) => {
       if (s !== seqRef.current) return
       if (res && res.ok) {
@@ -194,6 +226,10 @@ export function SearchPanel(props) {
     })
   }
 
+  // 事件监听闭包经 ref 取最新搜索实现与最新查询词（事件注册只做一次）
+  const runSearchRef = React.useRef(runSearch)
+  runSearchRef.current = runSearch
+
   /**
    * 输入变化：防抖触发搜索。
    * @param value 新输入
@@ -303,6 +339,27 @@ export function SearchPanel(props) {
     return () => window.removeEventListener('edrv:search-focus', onFocus)
   }, [])
 
+  // 文件内容变化（保存/外部写盘/文件增删改名）→ 去抖强制重搜，避免面板残留已失效的旧命中。
+  // 两种事件都监听：编辑器内保存只发 edrv:refresh，外部写盘只发 edrv:file-changed。
+  React.useEffect(() => {
+    /** @private @author ddj 2026年10月14号 @description 合并同一次写盘的多条通知后强制重搜 */
+    const onChanged = (event) => {
+      const detail = event?.detail ?? {}
+      if (!noticeInScope(detail, scope)) return
+      if (!noticeTouchesContent(detail)) return
+      if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current)
+      refreshTimerRef.current = setTimeout(() => runSearchRef.current(queryRef.current, true), REFRESH_DEBOUNCE_MS)
+    }
+    window.addEventListener('edrv:file-changed', onChanged)
+    window.addEventListener('edrv:refresh', onChanged)
+    return () => {
+      window.removeEventListener('edrv:file-changed', onChanged)
+      window.removeEventListener('edrv:refresh', onChanged)
+      if (refreshTimerRef.current) { clearTimeout(refreshTimerRef.current); refreshTimerRef.current = null }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
   // 一次意图对应一次提交后选区；无需定时回调，卸载后不会抢焦点。
   React.useLayoutEffect(() => {
     if (!focusTick) return

package/src/client/state/floatingWindow.ts

@@ -0,0 +1,50 @@
+/** Shared nonmodal geometry and bounded stacking. @author ddj 2026年10月14号 */
+import { clampFloat } from './editorLayout.js'
+import type { FloatRect } from './editorLayout.js'
+
+const windows: string[] = []
+const listeners = new Set<() => void>()
+let version = 0
+
+/** @private @author ddj 2026年10月14号 Notify every mounted window after an order change. */
+function notify(): void { version += 1; for (const listener of listeners) listener() }
+/** @public @author ddj 2026年10月14号 @param listener Order observer. @returns Unsubscribe callback. */
+export function watchFloats(listener: () => void): () => void {
+  listeners.add(listener)
+  return () => { listeners.delete(listener) }
+}
+/** @public @author ddj 2026年10月14号 @returns Stable external-store revision. */
+export function floatVersion(): number { return version }
+/** @public @author ddj 2026年10月14号 @param id Window identity. Bring forward without exceeding modal layers. */
+export function raiseFloat(id: string): void {
+  const index = windows.indexOf(id)
+  if (index === windows.length - 1 && index >= 0) return
+  if (index >= 0) windows.splice(index, 1)
+  windows.push(id)
+  notify()
+}
+/** @public @author ddj 2026年10月14号 @param id Unmounted window identity. */
+export function dropFloat(id: string): void {
+  const index = windows.indexOf(id)
+  if (index < 0) return
+  windows.splice(index, 1)
+  notify()
+}
+/** @public @author ddj 2026年10月14号 @param id Window identity. @returns Layer below menus/modals (190+). */
+export function floatLayer(id: string): number {
+  return 60 + Math.floor(120 * Math.max(0, windows.indexOf(id)) / Math.max(1, windows.length))
+}
+/** @public @author ddj 2026年10月14号 @param width Preferred width. @param height Preferred height. @param vw Viewport width. @param vh Viewport height. @returns Centered, reachable bounds. */
+export function initialFloat(width: number, height: number, vw: number, vh: number): FloatRect {
+  return clampFloat({ width, height, left: (vw - width) / 2, top: (vh - height) / 2 }, vw, vh)
+}
+/** @public @author ddj 2026年10月14号 @param rect Gesture origin. @param dx Horizontal delta. @param dy Vertical delta. @param sizing Resize instead of move. @param vw Viewport width. @param vh Viewport height. @returns Clamped next bounds. */
+export function moveFloat(rect: FloatRect, dx: number, dy: number, sizing: boolean, vw: number, vh: number): FloatRect {
+  const next = sizing ? { ...rect, width: rect.width + dx, height: rect.height + dy }
+    : { ...rect, left: rect.left + dx, top: rect.top + dy }
+  return clampFloat(next, vw, vh)
+}
+/** @public @author ddj 2026年10月14号 @param target Key target. @returns Whether native text/control navigation owns the key. */
+export function inputOwnsKey(target: EventTarget | null): boolean {
+  return target instanceof Element && !!target.closest('input, textarea, select, [contenteditable="true"], .monaco-editor')
+}

package/src/client/styles/editor.css

@@ -994,7 +994,20 @@
 [data-edrv-view] .edrv-split-handle:hover, [data-edrv-view] .edrv-split-handle:focus-visible { background: var(--dsw-alias-state-info-primary, #4d6bfe); }
 [data-edrv-view].edrv-floating { position: fixed; display: flex; flex-direction: column; overflow: hidden; box-sizing: border-box; border: 1px solid var(--dsw-alias-border-l2, #cdd6da); background: var(--dsw-alias-bg-base, #fff); color: var(--dsw-alias-label-primary, #1f2933); box-shadow: 0 8px 28px rgba(0,0,0,.22); }
 [data-edrv-view] .edrv-floating-title { display: flex; align-items: center; gap: 8px; flex: 0 0 32px; padding: 0 8px; background: var(--dsw-alias-bg-layer-1, #f7f9fa); cursor: move; touch-action: none; user-select: none; }
-[data-edrv-view] .edrv-floating-title > span { flex: 1; }
+[data-edrv-view] .edrv-floating-title > span { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+[data-edrv-view] .edrv-floating-content { display: flex; flex-direction: column; flex: 1; min-width: 0; min-height: 0; overflow: auto; box-sizing: border-box; }
+[data-edrv-view] .edrv-floating-content.edrv-svnlog-dialog { padding: 12px; overflow: auto; }
+[data-edrv-view] .edrv-floating-content.edrv-svn-patch-dialog,
+[data-edrv-view] .edrv-floating-content.edrv-svn-sum-dialog,
+[data-edrv-view] .edrv-floating-content.edrv-svnplan-dialog { padding: 12px; max-width: none; gap: 8px; }
+[data-edrv-view] .edrv-floating-content.edrv-svnlog-stats { max-height: none; }
+[data-edrv-view] .edrv-floating-content .edrv-svn-patch-pre,
+[data-edrv-view] .edrv-floating-content .edrv-svn-sum-list { flex: 1; min-height: 0; max-height: none; }
+[data-edrv-view] .edrv-floating-content .edrv-svnlog-filter,
+[data-edrv-view] .edrv-floating-content .edrv-svn-sum-form { flex-wrap: wrap; }
+[data-edrv-view] .edrv-floating-content > .edrv-svnlog-head,
+[data-edrv-view] .edrv-floating-content > .edrv-svnlog-filter,
+[data-edrv-view] .edrv-floating-content > .edrv-svnlog-foot { flex-shrink: 0; }
 [data-edrv-view] .edrv-floating-title > button { border: 0; background: transparent; color: inherit; cursor: pointer; }
 [data-edrv-view] .edrv-floating-grip { position: absolute; width: 16px; height: 16px; bottom: 0; right: 0; cursor: nwse-resize; touch-action: none; border-right: 3px solid var(--dsw-alias-border-l2, #cdd6da); border-bottom: 3px solid var(--dsw-alias-border-l2, #cdd6da); }
 .edrv-drag-overlay { position: fixed; z-index: 150; pointer-events: none; box-sizing: border-box; border: 0; background: color-mix(in srgb, var(--dsw-alias-state-info-primary, #4d6bfe) 25%, transparent); }

package/src/client/ui/EditorView.ts

@@ -11,6 +11,7 @@ import React from 'react'
 import { createPortal } from 'react-dom'
 import { EditorPane, EditorSplit, PassiveEditor } from './EditorPane.js'
 import { FloatingEditor } from './FloatingEditor.js'
+import { FloatingWindow } from './FloatingWindow.js'
 import { createLayout, parseLayout, syncTabs, ownerOf, focusGroup, moveTab, returnGroup, GROUP_LIMIT, MAIN_GROUP } from '../state/editorLayout.js'
 import { createTabDrag, hitTarget } from '../tabDrag.js'
 import { createDocStore } from '../state/documentStore.js'
@@ -3505,8 +3506,7 @@ export function EditorView(props) {
     //（focusDiff=true 跳过：差异审查对象必为本插件编辑的文本文件，审查优先）；
     // handler 缺失/失败（旧版无 openResource / seat 未挂）→ 回退现状页签打开，不阻断
     if (!focusDiff && inNativePath(path) && tryNativeOpen(path)) return
-    // 打开文件即离开基线差异审阅态（差异视图是「当前文件」的临时视图）
-    setSvnDiff(null)
+    // 对比浮窗独立保留，允许同时打开并编辑其他文件。
     recordNav()
     // G9：统一归一为页签规范形态（差异栏/启动器/树/命令栏等入口一致）
     const normalized = addTabNorm(path, true)
@@ -3555,7 +3555,6 @@ export function EditorView(props) {
     if (!document) return
     flushSave()
     saveViewState(active)
-    setSvnDiff(null)
     setDiskActive(null)
     setPlanTabs((prev) => [...prev.filter((item) => item.address !== document.address), document].slice(-32))
     setPlanActive(document.address)
@@ -3578,7 +3577,6 @@ export function EditorView(props) {
     flushSave()
     saveViewState(active)
     recordNav()
-    setSvnDiff(null)
     const positioned = request.line != null || request.column != null
     if (positioned && mdPreviewRef.current.has(path)) toggleMdPreview(path)
     setError(null)
@@ -3611,7 +3609,7 @@ export function EditorView(props) {
     const image = imgElRef.current
     return {
       sessionId, cwd, active, sequence: loadSeqRef.current, load: receiptLoad,
-      mounted: Boolean(viewRootRef.current), blocked: Boolean(svnDiff),
+      mounted: Boolean(viewRootRef.current), blocked: false,
       kind: isImageActive ? 'image' : isPdfActive ? 'pdf' : mdPreviewing ? 'markdown' : 'text',
       contentPath, contentReady, modelMatches, positionMatches,
       imageLoaded: Boolean(imageSrc && !imgBroken && image?.getAttribute('src') === imageSrc && image.complete && image.naturalWidth > 0),
@@ -3624,7 +3622,7 @@ export function EditorView(props) {
   function receiptReady(request) {
     if (request.plan) return request.sessionId === sessionId && planActive === request.plan.address
       && planTabs.some((item) => item.address === request.plan.address && item.markdown === request.plan.markdown)
-      && planHostRef.current?.getAttribute('data-plan-address') === request.plan.address && !svnDiff
+      && planHostRef.current?.getAttribute('data-plan-address') === request.plan.address
     return receiptReadyFor(request, receiptView(request))
   }
   /** @private @author ddj 2026年09月28号 @param request Claimed target. @returns Only its current load/render error. */
@@ -4013,27 +4011,6 @@ export function EditorView(props) {
       : React.createElement('pre', { className: 'edrv-mdview-pre' }, text)
     body = React.createElement('div', { className: 'edrv-mdview', ref: planHostRef, 'data-plan-address': activePlan.address },
       React.createElement('div', { className: 'edrv-mdview-stage' }, React.createElement('div', { className: 'edrv-mdview-doc' }, render)))
-  } else if (svnDiff) {
-    // 差异视图优先占位（覆盖编辑器主体）：只读审阅态，关闭后回到原编辑器
-    body = React.createElement(SvnDiffPanel, {
-      key: 'edrv-svndiff:' + svnDiff.scheme + ':' + svnDiff.path,
-      monaco,
-      path: svnDiff.path,
-      base: svnDiff.base,
-      working: svnDiff.working,
-      reason: svnDiff.reason,
-      message: svnDiff.message,
-      leftLabel: svnDiff.leftLabel,
-      rightLabel: svnDiff.rightLabel,
-      onBack: svnDiff.logTarget !== undefined ? backToSvnLog : undefined,
-      onClose: () => {
-        setSvnDiff(null)
-        if (svnUpdateReturn?.from === 'diff') {
-          setSvnUpdateDialog(svnUpdateReturn.dialog)
-          setSvnUpdateReturn(null)
-        }
-      },
-    })
   } else if (!monaco && !monacoErr) {
     body = loadingBody(loadStage.message, loadStage.progress)
   } else if (monacoErr) {
@@ -4329,7 +4306,7 @@ export function EditorView(props) {
   }
 
   // 「添加配置」按钮（VSCode 同款形态，编辑区右下角）：仅插件专属 launch.json 打开且非差异审阅态显示
-  const addCfgBtn = (active && !svnDiff && LAUNCH_JSON_RE.test(String(active).replace(/\\/g, '/')))
+  const addCfgBtn = (active && LAUNCH_JSON_RE.test(String(active).replace(/\\/g, '/')))
     ? React.createElement('button', {
         className: 'edrv-addcfg',
         title: '添加调试配置（插入到 configurations 数组开头）',
@@ -4517,6 +4494,23 @@ export function EditorView(props) {
         },
       })
     : null
+  /** @private @author ddj 2026年10月14号 关闭对比浮窗，按原 job 恢复来源更新窗口。 */
+  function closeSvnDiff() {
+    setSvnDiff(null)
+    if (svnUpdateReturn?.from === 'diff') {
+      setSvnUpdateDialog(svnUpdateReturn.dialog)
+      setSvnUpdateReturn(null)
+    }
+  }
+  const svnDiffEl = svnDiff ? React.createElement(FloatingWindow, {
+    key: 'edrv-svndiff-window:' + scope,
+    title: '文件对比 · ' + baseNameOf(svnDiff.path), width: 1100, height: 680,
+    owner: String(scope), onClose: closeSvnDiff,
+  }, React.createElement(SvnDiffPanel, {
+    ...svnDiff, key: 'edrv-svndiff:' + svnDiff.scheme + ':' + svnDiff.path, monaco,
+    onBack: svnDiff.logTarget !== undefined ? backToSvnLog : undefined,
+    onClose: closeSvnDiff,
+  })) : null
   // W2-1 补丁对话框 / W2-2 目录对比对话框：portal 到 body，与日志弹窗同一挂载方式
   const patchDialogEl = patchDialog
     ? React.createElement(SvnPatchDialog, {
@@ -4613,6 +4607,7 @@ export function EditorView(props) {
         paletteEl,
         svnLogEl,
         svnUpdateEl,
+        svnDiffEl,
         patchDialogEl,
         sumDialogEl,
         dlogEl,
@@ -4625,6 +4620,7 @@ export function EditorView(props) {
         paletteEl,
         svnLogEl,
         svnUpdateEl,
+        svnDiffEl,
         patchDialogEl,
         sumDialogEl,
         dlogEl,

package/src/client/ui/FloatingEditor.ts

@@ -1,7 +1,7 @@
-/** In-page window chrome; closing returns tabs, never closes documents. @author ddj 2026年10月14号 */
+/** In-page editor window; closing returns tabs, never closes documents. @author ddj 2026年10月14号 */
 import React from 'react'
-import { createPortal } from 'react-dom'
-import { clampFloat, type FloatRect } from '../state/editorLayout.js'
+import type { FloatRect } from '../state/editorLayout.js'
+import { FloatingWindow } from './FloatingWindow.js'
 
 export interface FloatingProps {
   group: string
@@ -15,73 +15,19 @@ export interface FloatingProps {
   children?: React.ReactNode
 }
 
-/** @public @author ddj 2026年10月14号 @param props Window geometry and group callbacks. @returns Theme-aware portal with move/resize handles. */
-export function FloatingEditor(props: FloatingProps): React.ReactPortal {
-  const latest = React.useRef(props)
-  latest.current = props
-  const cleanup = React.useRef<(() => void) | null>(null)
-  /** @private @author ddj 2026年10月14号 Cancel a gesture on unmount without altering tabs. */
-  function cancel(): void { cleanup.current?.(); cleanup.current = null }
-  React.useEffect(() => cancel, [])
-  React.useEffect(() => {
-    /** @private @author ddj 2026年10月14号 Keep title/chrome visible after viewport changes. */
-    function resize(): void {
-      const current = latest.current
-      current.onBounds(current.group, clampFloat(current.rect, window.innerWidth, window.innerHeight))
-    }
-    window.addEventListener('resize', resize)
-    resize()
-    return () => window.removeEventListener('resize', resize)
-  }, [])
-
-  /** @private @author ddj 2026年10月14号 @param event Handle press. @param sizing Resize rather than move. */
-  function start(event: React.PointerEvent, sizing: boolean): void {
-    if (event.button !== 0 || !event.isPrimary) return
-    cancel()
-    event.preventDefault()
-    const initial = latest.current.rect
-    const x = event.clientX, y = event.clientY, pointer = event.pointerId
-    let frame: number | null = null
-    let next = initial
-    latest.current.onFocus(props.group)
-    /** @private @author ddj 2026年10月14号 Apply at most one geometry change per animation frame. */
-    function paint(): void { frame = null; latest.current.onBounds(props.group, next) }
-    /** @private @author ddj 2026年10月14号 @param moveEvent Pointer movement for the originating pointer. */
-    function move(moveEvent: PointerEvent): void {
-      if (moveEvent.pointerId !== pointer) return
-      moveEvent.preventDefault()
-      const dx = moveEvent.clientX - x, dy = moveEvent.clientY - y
-      next = clampFloat(sizing ? { ...initial, width: initial.width + dx, height: initial.height + dy } : { ...initial, left: initial.left + dx, top: initial.top + dy }, window.innerWidth, window.innerHeight)
-      if (frame === null) frame = requestAnimationFrame(paint)
-    }
-    /** @private @author ddj 2026年10月14号 Remove gesture listeners and pending frames. */
-    function stop(): void {
-      if (frame !== null) { cancelAnimationFrame(frame); paint() }
-      window.removeEventListener('pointermove', move, true)
-      window.removeEventListener('pointerup', stop, true)
-      window.removeEventListener('pointercancel', stop, true)
-      window.removeEventListener('blur', stop)
-      cleanup.current = null
-    }
-    cleanup.current = stop
-    window.addEventListener('pointermove', move, true)
-    window.addEventListener('pointerup', stop, true)
-    window.addEventListener('pointercancel', stop, true)
-    window.addEventListener('blur', stop)
-  }
-  /** @private @author ddj 2026年10月14号 @param event Title press. Move window without stealing button presses. */
-  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 grip press. */
-  function sizeStart(event: React.PointerEvent): void { start(event, true) }
+/** @public @author ddj 2026年10月14号 @param props Window geometry and group callbacks. @returns Shared window chrome preserving tab ownership. */
+export function FloatingEditor(props: FloatingProps): React.ReactElement {
+  /** @private @author ddj 2026年10月14号 @param rect Updated window bounds. */
+  function bounds(rect: FloatRect): void { props.onBounds(props.group, rect) }
   /** @private @author ddj 2026年10月14号 Return all tabs to the main group. */
-  function returnTabs(): void { latest.current.onReturn(props.group) }
+  function returnTabs(): void { props.onReturn(props.group) }
   /** @private @author ddj 2026年10月14号 Bring the group to the foreground. */
-  function focus(): void { latest.current.onFocus(props.group) }
-  const rect = clampFloat(props.rect, window.innerWidth, window.innerHeight)
-  return createPortal(React.createElement('div', { className: 'edrv-floating' + (props.focused ? ' edrv-floating-focused' : ''), 'data-edrv-view': '1', 'data-edrv-float': props.group, 'data-edrv-owner': props.owner, style: { ...rect, zIndex: (props.focused ? 80 : 60) + props.layer }, onPointerDownCapture: focus },
-    React.createElement('div', { className: 'edrv-floating-title', onPointerDown: moveStart },
-      React.createElement('span', null, '浮动编辑组'), React.createElement('button', { type: 'button', title: '将全部文件移回主编辑区', onClick: returnTabs }, '移回主编辑区'),
-      React.createElement('button', { type: 'button', title: '关闭浮窗并将文件移回主编辑区', 'aria-label': '关闭浮窗并移回文件', onClick: returnTabs }, '×')),
-    props.children,
-    React.createElement('div', { className: 'edrv-floating-grip', title: '拖动调整窗口大小', onPointerDown: sizeStart })), document.body)
+  function focus(): void { props.onFocus(props.group) }
+  const actions = React.createElement(React.Fragment, null,
+    React.createElement('button', { type: 'button', title: '将全部文件移回主编辑区', onClick: returnTabs }, '移回主编辑区'),
+    React.createElement('button', { type: 'button', title: '关闭浮窗并将文件移回主编辑区', 'aria-label': '关闭浮窗并移回文件', onClick: returnTabs }, '×'))
+  return React.createElement(FloatingWindow, {
+    title: '浮动编辑组', owner: props.owner, group: props.group, rect: props.rect,
+    closeOnEsc: false, onBounds: bounds, onFocus: focus, actions,
+  }, props.children)
 }

package/src/client/ui/FloatingWindow.ts

@@ -0,0 +1,121 @@
+/** 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 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 {
+  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) }
+  /** @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()
+    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. */
+  function stop(): void {
+    if (frame !== null) { cancelAnimationFrame(frame); paint() }
+    window.removeEventListener('pointermove', move, true)
+    window.removeEventListener('pointerup', end, true)
+    window.removeEventListener('pointercancel', end, true)
+    window.removeEventListener('blur', stop)
+    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
+}
+
+/** @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)
+  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号 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)) }
+  React.useEffect(() => {
+    raiseFloat(id)
+    window.addEventListener('resize', resize)
+    resize()
+    return () => { cancel(); window.removeEventListener('resize', resize); 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, current.current, sizing, apply, clear)
+  }
+  /** @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. */
+  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 rect = clampFloat(props.rect ?? bounds, window.innerWidth, window.innerHeight)
+  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/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)