dsh-vscode-mode 0.15.3 → 0.15.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.15.3",
+  "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/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 数组开头）',
@@ -4367,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 原生渲染。
@@ -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)
 }