dsh-vscode-mode 0.14.13 → 0.15.0

package/package.json

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

@@ -16,6 +16,8 @@ export const CACHE_KEY = {
   viewstate: 'edrv.cache.viewstate.v1.',
   /** 编辑器页签/活动文件（EditorView v3：页签带 pinned 固定标记）。 */
   editor: 'edrv.editor.v3.',
+  /** Multi-group split tree and floating window geometry. */
+  editorLayout: 'edrv.editorLayout.v1.',
   /** 旧编辑器页签键（v2：页签为纯路径数组）——仅用于一次性回读迁移，不再写入。 */
   editorLegacy: 'edrv.editor.v2.',
   /** 侧边栏状态（EditorView；按布局 side/central 追加段）。 */

package/src/client/state/documentStore.ts

@@ -0,0 +1,148 @@
+/** One save owner per document, independent of group placement. @author ddj 2026年10月14号 */
+export interface TextModel { getValue(): string; isDisposed?(): boolean; getVersionId?(): number }
+export interface SaveResult { ok: boolean; rev?: string; conflict?: boolean; error?: string }
+export interface DocumentState {
+  model: TextModel | null
+  rev?: string
+  dirty: boolean
+  conflict: boolean
+  pending: ReturnType<typeof setTimeout> | null
+  saving: Promise<SaveResult> | null
+  again: boolean
+  generation: number
+}
+export interface SaveRequest { path: string; content: string; rev?: string }
+export interface DocumentDeps {
+  save(request: SaveRequest): Promise<SaveResult>
+  changed?(path: string, state: DocumentState): void
+  saved?(path: string, content: string, model: TextModel, result: SaveResult): void
+  failed?(path: string, result: SaveResult): void
+  blocked?(path: string): boolean
+}
+
+/** @public @author ddj 2026年10月14号 @param deps IO/version guard and view notifications. @returns Shared lifecycle without model disposal. */
+export function createDocStore(deps: DocumentDeps) {
+  const documents = new Map<string, DocumentState>()
+  let disposed = false
+
+  /** @public @author ddj 2026年10月14号 @param path Canonical file path. @returns Document state, lazily created. */
+  function state(path: string): DocumentState {
+    let item = documents.get(path)
+    if (!item) {
+      item = { model: null, dirty: false, conflict: false, pending: null, saving: null, again: false, generation: 0 }
+      documents.set(path, item)
+    }
+    return item
+  }
+
+  /** @private @author ddj 2026年10月14号 @param path Canonical path. @param item Current state. Publish change to all views. */
+  function notify(path: string, item: DocumentState): void { deps.changed?.(path, item) }
+
+  /** @public @author ddj 2026年10月14号 @param path File path. @param model Existing model. @param rev Optional disk revision. Bind without erasing edits. */
+  function bind(path: string, model: TextModel, rev?: string): void {
+    const item = state(path)
+    if (item.model && item.model !== model) item.generation += 1
+    item.model = model
+    if (rev) item.rev = rev
+  }
+
+  /** @public @author ddj 2026年10月14号 @param path File path. @param rev Disk token. @param conflict Optional conflict marker. Update disk baseline only. */
+  function baseline(path: string, rev?: string, conflict?: boolean): void {
+    const item = state(path)
+    if (rev) item.rev = rev
+    if (conflict !== undefined) item.conflict = conflict
+    notify(path, item)
+  }
+
+  /** @private @author ddj 2026年10月14号 @param item Document state. Cancel delayed save, not in-flight IO. */
+  function cancel(item: DocumentState): void {
+    if (item.pending !== null) clearTimeout(item.pending)
+    item.pending = null
+  }
+
+  /** @private @author ddj 2026年10月14号 @param path Saved path. @param item Owner state. @param model Captured model. @param content Saved snapshot. @param version Captured version. @param generation Owner generation. @param result IO result. Accept only current content. */
+  function accept(path: string, item: DocumentState, model: TextModel, content: string, version: number | undefined, generation: number, result: SaveResult): void {
+    if (documents.get(path) !== item || item.generation !== generation || item.model !== model) return
+    if (!result.ok) {
+      item.conflict = result.conflict === true || item.conflict
+      deps.failed?.(path, result)
+      return
+    }
+    if (result.rev) item.rev = result.rev
+    if (!model.isDisposed?.() && model.getValue() === content && (version === undefined || version === model.getVersionId?.())) item.dirty = false
+    deps.saved?.(path, content, model, result)
+  }
+
+  /** @public @author ddj 2026年10月14号 @param path File path. @param manual Explicit user save may invoke version guard despite conflict. @returns Deduplicated save completion; failures retain dirty state. */
+  function save(path: string, manual = false): Promise<SaveResult> {
+    const item = state(path)
+    cancel(item)
+    if (disposed || !item.model || item.model.isDisposed?.()) return Promise.resolve({ ok: false, error: '文件模型不可用' })
+    if (!manual && (item.conflict || deps.blocked?.(path))) return Promise.resolve({ ok: false, conflict: true })
+    if (item.saving) { item.again = item.dirty; return item.saving }
+    const model = item.model, content = model.getValue(), version = model.getVersionId?.(), generation = item.generation
+    const request = { path, content, rev: item.rev }
+    /** @private @author ddj 2026年10月14号 @param result IO result. @returns Original result after guarded acceptance. */
+    function success(result: SaveResult): SaveResult { accept(path, item, model, content, version, generation, result); return result }
+    /** @private @author ddj 2026年10月14号 @param error IO failure. @returns Failure without discarding content. */
+    function failure(error: unknown): SaveResult {
+      const result = { ok: false, error: String(error) }
+      if (documents.get(path) === item) deps.failed?.(path, result)
+      return result
+    }
+    /** @private @author ddj 2026年10月14号 Complete one request before scheduling another changed snapshot. */
+    function settled(): void {
+      item.saving = null
+      notify(path, item)
+      if (documents.get(path) !== item || disposed || !item.again) return
+      item.again = false
+      if (item.dirty && !item.conflict) edit(path)
+    }
+    item.saving = Promise.resolve().then(() => deps.save(request)).then(success, failure).finally(settled)
+    notify(path, item)
+    return item.saving
+  }
+
+  /** @public @author ddj 2026年10月14号 @param path File path. @param delay Debounce milliseconds. Mark dirty and schedule a document-owned save. */
+  function edit(path: string, delay = 700): void {
+    if (disposed) return
+    const item = state(path)
+    item.dirty = true
+    cancel(item)
+    if (!item.conflict && !deps.blocked?.(path)) {
+      /** @private @author ddj 2026年10月14号 Save the same document even after group/focus changes. */
+      function delayed(): void { item.pending = null; void save(path) }
+      item.pending = setTimeout(delayed, delay)
+    }
+    notify(path, item)
+  }
+
+  /** @public @author ddj 2026年10月14号 @param path Optional document. @returns Pending saves submitted; moving groups need not call this. */
+  function flush(path?: string): Promise<SaveResult[]> {
+    const work: Promise<SaveResult>[] = []
+    for (const [key, item] of documents) {
+      if (path && path !== key) continue
+      if (item.pending !== null || (item.dirty && !item.saving)) work.push(save(key))
+      else if (item.saving) work.push(item.saving)
+    }
+    return Promise.all(work)
+  }
+
+  /** @public @author ddj 2026年10月14号 @param path File removed from tracking. @returns False while unsafe; never destroys a model. */
+  function release(path: string): boolean {
+    const item = documents.get(path)
+    if (!item) return true
+    if (item.dirty || item.saving) return false
+    cancel(item)
+    documents.delete(path)
+    return true
+  }
+
+  /** @public @author ddj 2026年10月14号 @returns Whether dirty or in-flight content prevents reload. */
+  function unsafe(): boolean { return [...documents.values()].some((item) => item.dirty || item.pending !== null || !!item.saving) }
+
+  /** @public @author ddj 2026年10月14号 Cancel timers on teardown; retained models and in-flight save guards survive. */
+  function dispose(): void { disposed = true; for (const item of documents.values()) cancel(item) }
+  return { state, bind, baseline, edit, save, flush, release, unsafe, dispose }
+}
+export type DocumentStore = ReturnType<typeof createDocStore>

package/src/client/state/editorLayout.ts

@@ -0,0 +1,179 @@
+/** Workbench group layout without file-content ownership. @author ddj 2026年10月14号 */
+import { normalizeTabs, pickActive, tabPathOf, type TabLike } from '../tabActions.js'
+
+export const GROUP_LIMIT = 8
+export const MAIN_GROUP = 'main'
+export type Edge = 'left' | 'right' | 'top' | 'bottom'
+export interface Group { id: string; tabs: TabLike[]; active: string | null }
+export type LayoutNode = { group: string } | { axis: 'horizontal' | 'vertical'; ratio: number; first: LayoutNode; second: LayoutNode }
+export interface FloatRect { left: number; top: number; width: number; height: number }
+export interface FloatGroup extends FloatRect { group: string }
+export interface EditorLayout { v: 1; tree: LayoutNode; groups: Group[]; floats: FloatGroup[]; focused: string; serial: number }
+export type DropTarget = { kind: 'group'; group: string; index?: number } | { kind: 'split'; group: string; edge: Edge } | { kind: 'float'; rect: FloatRect }
+
+// --region Layout transactions
+/** @public @author ddj 2026年10月14号 @param tabs Legacy tabs. @param active Legacy selection. @returns Single-group layout. */
+export function createLayout(tabs: TabLike[] = [], active: string | null = null): EditorLayout {
+  return { v: 1, tree: { group: MAIN_GROUP }, groups: [{ id: MAIN_GROUP, tabs, active: pickActive(tabs, active) }], floats: [], focused: MAIN_GROUP, serial: 0 }
+}
+
+/** @public @author ddj 2026年10月14号 @param layout Workbench. @param path Normalized path. @returns Unique owning group. */
+export function ownerOf(layout: EditorLayout, path: string): Group | undefined {
+  return layout.groups.find((group) => group.tabs.some((tab) => tab.path === path))
+}
+
+/** @public @author ddj 2026年10月14号 @param layout Workbench. @param group Group id. @param path Optional tab selection. @returns Focused layout. */
+export function focusGroup(layout: EditorLayout, group: string, path?: string): EditorLayout {
+  const found = layout.groups.find((item) => item.id === group)
+  if (!found) return layout
+  const active = path && found.tabs.some((tab) => tab.path === path) ? path : found.active
+  if (layout.focused === group && active === found.active) return layout
+  return { ...layout, focused: group, groups: layout.groups.map((item) => item.id === group ? { ...item, active } : item) }
+}
+
+/** @private @author ddj 2026年10月14号 @param node Split subtree. @param group Leaf to replace. @param next Replacement. @returns Rewritten tree. */
+function replaceLeaf(node: LayoutNode, group: string, next: LayoutNode): LayoutNode {
+  if ('group' in node) return node.group === group ? next : node
+  return { ...node, first: replaceLeaf(node.first, group, next), second: replaceLeaf(node.second, group, next) }
+}
+
+/** @private @author ddj 2026年10月14号 @param node Split subtree. @param alive Surviving ids. @returns Collapsed tree or null. */
+function pruneTree(node: LayoutNode, alive: Set<string>): LayoutNode | null {
+  if ('group' in node) return alive.has(node.group) ? node : null
+  const first = pruneTree(node.first, alive)
+  const second = pruneTree(node.second, alive)
+  return first && second ? { ...node, first, second } : first ?? second
+}
+
+/** @private @author ddj 2026年10月14号 @param layout Changed layout. @returns Empty auxiliary groups removed; primary group retained. */
+function compact(layout: EditorLayout): EditorLayout {
+  const groups = layout.groups.filter((group) => group.id === MAIN_GROUP || group.tabs.length)
+  const alive = new Set(groups.map((group) => group.id))
+  return { ...layout, groups, tree: pruneTree(layout.tree, alive) ?? { group: MAIN_GROUP }, floats: layout.floats.filter((item) => alive.has(item.group)), focused: alive.has(layout.focused) ? layout.focused : MAIN_GROUP }
+}
+
+/** @private @author ddj 2026年10月14号 @param tabs Target tabs without moved tab. @param tab Moved record. @param index Requested insertion slot. @returns Pinned-partition-safe insertion. */
+function insertAt(tabs: TabLike[], tab: TabLike, index = tabs.length): TabLike[] {
+  const pins = tabs.filter((item) => item.pinned).length
+  const at = tab.pinned ? Math.max(0, Math.min(pins, index)) : Math.max(pins, Math.min(tabs.length, index))
+  return [...tabs.slice(0, at), tab, ...tabs.slice(at)]
+}
+
+/** @public @author ddj 2026年10月14号 @param layout Workbench. @param path Existing normalized file. @param target Accepted destination. @returns Atomic move; invalid target leaves original unchanged. */
+export function moveTab(layout: EditorLayout, path: string, target: DropTarget): EditorLayout {
+  const source = ownerOf(layout, path)
+  const tab = source?.tabs.find((item) => item.path === path)
+  if (!source || !tab) return layout
+  if (target.kind !== 'group' && layout.groups.length >= GROUP_LIMIT) return layout
+  const destination = target.kind !== 'float' ? layout.groups.find((item) => item.id === target.group) : null
+  if (target.kind !== 'float' && !destination) return layout
+  if (target.kind === 'split' && layout.floats.some((item) => item.group === target.group)) return layout
+  const id = target.kind === 'group' ? target.group : 'group-' + (layout.serial + 1)
+  let index = target.kind === 'group' ? target.index : undefined
+  const oldIndex = source.tabs.findIndex((item) => item.path === path)
+  if (source.id === id && index !== undefined && oldIndex < index) index -= 1
+  let groups = layout.groups.map((group) => {
+    const tabs = group.tabs.filter((item) => item.path !== path)
+    if (group.id === id) return { ...group, tabs: insertAt(tabs, tab, index), active: path }
+    return { ...group, tabs, active: pickActive(tabs, group.active) }
+  })
+  let tree = layout.tree
+  let floats = layout.floats
+  if (target.kind !== 'group') groups = [...groups, { id, tabs: [tab], active: path }]
+  if (target.kind === 'float') floats = [...floats, { ...target.rect, group: id }]
+  if (target.kind === 'split') {
+    const before = target.edge === 'left' || target.edge === 'top'
+    const old: LayoutNode = { group: target.group }
+    const added: LayoutNode = { group: id }
+    tree = replaceLeaf(tree, target.group, { axis: target.edge === 'left' || target.edge === 'right' ? 'horizontal' : 'vertical', ratio: 0.5, first: before ? added : old, second: before ? old : added })
+  }
+  return compact({ ...layout, groups, tree, floats, focused: id, serial: target.kind === 'group' ? layout.serial : layout.serial + 1 })
+}
+
+/** @public @author ddj 2026年10月14号 @param layout Workbench. @param group Auxiliary group. @returns All tabs returned to main without closing documents. */
+export function returnGroup(layout: EditorLayout, group: string): EditorLayout {
+  const found = layout.groups.find((item) => item.id === group)
+  if (!found || group === MAIN_GROUP) return layout
+  let next = layout
+  for (const tab of found.tabs) next = moveTab(next, tab.path, { kind: 'group', group: MAIN_GROUP })
+  return next
+}
+
+/** @public @author ddj 2026年10月14号 @param layout Workbench. @param tabs Global file records. @param active Optional newly selected file. @returns Layout reconciled with opens/closes/renames. */
+export function syncTabs(layout: EditorLayout, tabs: TabLike[], active?: string | null): EditorLayout {
+  const byPath = new Map(tabs.map((tab) => [tab.path, tab]))
+  const groups = layout.groups.map((group) => {
+    const kept = group.tabs.flatMap((tab) => byPath.has(tab.path) ? [byPath.get(tab.path)!] : [])
+    return { ...group, tabs: kept, active: pickActive(kept, group.active) }
+  })
+  const seen = new Set(groups.flatMap((group) => group.tabs.map((tab) => tab.path)))
+  const focused = groups.find((group) => group.id === layout.focused) ?? groups[0]!
+  for (const tab of tabs) if (!seen.has(tab.path)) focused.tabs = insertAt(focused.tabs, tab)
+  let next = compact({ ...layout, groups })
+  if (active) {
+    const owner = ownerOf(next, active)
+    if (owner) next = focusGroup(next, owner.id, active)
+  }
+  return next
+}
+// --endregion
+
+// --region Persistence and geometry
+/** @public @author ddj 2026年10月14号 @param rect Floating bounds. @param width Viewport width. @param height Viewport height. @returns Visible, finite rectangle. */
+export function clampFloat(rect: FloatRect, width: number, height: number): FloatRect {
+  const w = Math.max(1, width), h = Math.max(1, height)
+  const sizeW = Math.min(w, Math.max(Math.min(360, w), Number.isFinite(rect.width) ? rect.width : 600))
+  const sizeH = Math.min(h, Math.max(Math.min(240, h), Number.isFinite(rect.height) ? rect.height : 400))
+  return { width: sizeW, height: sizeH, left: Math.max(0, Math.min(w - sizeW, Number.isFinite(rect.left) ? rect.left : 0)), top: Math.max(0, Math.min(h - sizeH, Number.isFinite(rect.top) ? rect.top : 0)) }
+}
+
+/** @private @author ddj 2026年10月14号 @param raw Unknown tree. @param ids Available nonfloating groups. @param seen Leaf uniqueness guard. @param depth Recursion budget. @returns Valid tree or null. */
+function parseTree(raw: unknown, ids: Set<string>, seen: Set<string>, depth = 0): LayoutNode | null {
+  if (!raw || typeof raw !== 'object' || depth > GROUP_LIMIT) return null
+  const node = raw as Record<string, unknown>
+  if (typeof node.group === 'string') {
+    if (!ids.has(node.group) || seen.has(node.group)) return null
+    seen.add(node.group)
+    return { group: node.group }
+  }
+  if (node.axis !== 'horizontal' && node.axis !== 'vertical') return null
+  if (typeof node.ratio !== 'number' || !Number.isFinite(node.ratio)) return null
+  const first = parseTree(node.first, ids, seen, depth + 1)
+  const second = parseTree(node.second, ids, seen, depth + 1)
+  return first && second ? { axis: node.axis, ratio: Math.max(0.1, Math.min(0.9, node.ratio)), first, second } : null
+}
+
+/** @public @author ddj 2026年10月14号 @param text Saved layout JSON. @param cwd Workspace path normalization. @returns Valid bounded layout or null for legacy fallback. */
+export function parseLayout(text: string | null, cwd?: string | null): EditorLayout | null {
+  if (!text) return null
+  try {
+    const raw = JSON.parse(text)
+    if (raw?.v !== 1 || !Array.isArray(raw.groups) || !Array.isArray(raw.floats)) return null
+    if (!raw.groups.length || raw.groups.length > GROUP_LIMIT) return null
+    const seen = new Set<string>(), paths = new Set<string>()
+    const groups: Group[] = []
+    for (const item of raw.groups) {
+      if (typeof item?.id !== 'string' || !item.id || seen.has(item.id)) return null
+      seen.add(item.id)
+      const tabs = normalizeTabs(item.tabs, cwd)
+      if (tabs.some((tab) => paths.has(tab.path))) return null
+      for (const tab of tabs) paths.add(tab.path)
+      groups.push({ id: item.id, tabs, active: pickActive(tabs, typeof item.active === 'string' ? tabPathOf(item.active, cwd) : null) })
+    }
+    if (!seen.has(MAIN_GROUP)) return null
+    const floats: FloatGroup[] = [], floating = new Set<string>()
+    for (const item of raw.floats) {
+      if (!seen.has(item?.group) || item.group === MAIN_GROUP || floating.has(item.group)) return null
+      if (![item.left, item.top, item.width, item.height].every(Number.isFinite)) return null
+      floating.add(item.group)
+      floats.push({ group: item.group, ...clampFloat(item, 100000, 100000) })
+    }
+    const leaves = new Set<string>(), ids = new Set([...seen].filter((id) => !floating.has(id)))
+    const tree = parseTree(raw.tree, ids, leaves)
+    if (!tree || leaves.size !== ids.size) return null
+    const serial = Number.isSafeInteger(raw.serial) && raw.serial >= 0 ? raw.serial : 0
+    if (groups.some((group) => group.id !== MAIN_GROUP && (!/^group-\d+$/.test(group.id) || Number(group.id.slice(6)) > serial))) return null
+    return compact({ v: 1, tree, groups, floats, focused: seen.has(raw.focused) ? raw.focused : MAIN_GROUP, serial })
+  } catch { return null }
+}
+// --endregion

package/src/client/state/modelCache.ts

@@ -15,6 +15,13 @@ export const MODEL_CACHE_CAP = 40
 
 /** scope →（path → model）缓存表。 */
 const caches = new Map<string, Map<string, unknown>>()
+/** Open/dirty documents must not be evicted while another group is active. */
+const retained = new WeakMap<Map<string, unknown>, Set<string>>()
+
+/** @public @author ddj 2026年10月14号 @param map Workspace model cache. @param paths Open or otherwise unsafe documents. Protect models without changing ownership. */
+export function retainModels(map: Map<string, unknown>, paths: Iterable<string>): void {
+  retained.set(map, new Set(paths))
+}
 /** 当前激活作用域（切换时释放上一个）。 */
 let activeScope: string | null = null
 // --endregion
@@ -44,9 +51,12 @@ export function modelsForScope(scope: string): Map<string, unknown> {
   if (activeScope !== null && activeScope !== scope) {
     const prev = caches.get(activeScope)
     if (prev) {
-      for (const model of prev.values()) disposeIfFree(model)
-      prev.clear()
-      caches.delete(activeScope)
+      for (const [path, model] of prev) {
+        if (retained.get(prev)?.has(path) || isAttached(model)) continue
+        disposeIfFree(model)
+        prev.delete(path)
+      }
+      if (!prev.size) caches.delete(activeScope)
     }
   }
   activeScope = scope
@@ -67,10 +77,9 @@ export function rememberModel(map: Map<string, unknown>, path: string, model: un
   if (!path || !model) return
   map.delete(path)
   map.set(path, model)
-  while (map.size > MODEL_CACHE_CAP) {
-    const oldest = map.keys().next().value
-    if (oldest === undefined) break
-    const evicted = map.get(oldest)
+  for (const [oldest, evicted] of map) {
+    if (map.size <= MODEL_CACHE_CAP) break
+    if (retained.get(map)?.has(oldest) || isAttached(evicted)) continue
     map.delete(oldest)
     disposeIfFree(evicted)
   }

package/src/client/styles/editor.css

@@ -6,11 +6,12 @@
 [data-edrv-view] { box-sizing: border-box; --edrv-tab-h: 34px; }
 
 [data-edrv-view] .edrv-tabs { display: flex; align-items: center; gap: 2px; padding: 2px 8px 0; background: var(--dsw-alias-bg-layer-1, transparent); overflow-x: auto; overflow-y: hidden; scrollbar-width: thin; flex-shrink: 0; overscroll-behavior-x: contain; } /* overscroll-behavior-x: 横滚到边界不把滚动链传给页面（滚轮横滚接管更可控）@author ddj 2026年09月18号 */
-[data-edrv-view] .edrv-tab { display: inline-flex; align-items: center; gap: 6px; height: 28px; padding: 0 8px 0 12px; border: none; border-radius: 6px 6px 0 0; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 12px; cursor: pointer; white-space: nowrap; flex-shrink: 0; }
+[data-edrv-view] .edrv-tab { user-select: none; -webkit-user-select: none; display: inline-flex; align-items: center; gap: 6px; height: 28px; padding: 0 8px 0 12px; border: none; border-radius: 6px 6px 0 0; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 12px; cursor: pointer; white-space: nowrap; flex-shrink: 0; }
 [data-edrv-view] .edrv-tab:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
 [data-edrv-view] .edrv-tab.edrv-tab-active { background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); box-shadow: inset 0 -2px 0 var(--dsw-alias-brand-primary, #4f8cff); }
 [data-edrv-view] .edrv-tab .edrv-tab-star { color: var(--dsw-alias-brand-primary, #4f8cff); font-size: 13px; font-weight: 700; line-height: 1; flex-shrink: 0; } /* 未保存修改星号 @author ddj 2026年09月09号 */
-[data-edrv-view] .edrv-tab .edrv-tab-x { display: inline-flex; align-items: center; justify-content: center; width: 16px; height: 16px; border-radius: 4px; color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; }
+[data-edrv-view] .edrv-tab .edrv-tab-x { appearance: none; display: inline-flex; align-items: center; justify-content: center; flex: 0 0 16px; width: 16px; height: 16px; padding: 0; border: 0; border-radius: 4px; background: transparent; box-shadow: none; color: var(--dsw-alias-label-tertiary, #888); font-family: inherit; font-size: 11px; line-height: 1; cursor: pointer; }
+[data-edrv-view] .edrv-tab .edrv-tab-x:focus-visible { outline: 1px solid var(--dsw-alias-state-info-primary, #4d6bfe); outline-offset: 1px; }
 [data-edrv-view] .edrv-tab .edrv-tab-x:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.12)); color: var(--dsw-alias-label-primary, #eee); }
 /* 固定页签：📌 标记 + 免关闭按钮（固定页签不渲染 ×，仅可经右键菜单取消固定） */
 [data-edrv-view] .edrv-tab .edrv-tab-pin { flex-shrink: 0; font-size: 10px; line-height: 1; opacity: .85; }
@@ -971,4 +972,29 @@
 /* Alt 提示层：由 hoverTree 注入到 .monaco-hover（滚动区之外）贴底常驻；容器预留同高内边距避免遮挡末行。
    不再用 sticky / `:has()`：滚动链在 .monaco-hover-content 上，sticky 会被滚走。 */
 [data-edrv-view] .monaco-hover[data-edrv-hint-host="1"] { padding-bottom: 22px; }
-[data-edrv-view] [data-edrv-hint="1"] { position: absolute; left: 0; right: 0; bottom: 0; box-sizing: border-box; height: 22px; padding: 2px 8px; font-size: 11px; line-height: 18px; color: var(--dsw-alias-label-tertiary, #8a949b); background: var(--dsw-alias-bg-overlay, #ffffff); border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }
+[data-edrv-view] [data-edrv-hint="1"] { position: absolute; left: 0; right: 0; bottom: 0; box-sizing: border-box; height: 22px; padding: 2px 8px; font-size: 11px; line-height: 18px; color: var(--dsw-alias-label-tertiary, #8a949b); background: var(--dsw-alias-bg-overlay, #ffffff); border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }
+
+/* Workbench panes: existing theme, action-driven drop previews. ddj 2026年10月14号 */
+[data-edrv-view] .edrv-group, [data-edrv-view] .edrv-group-body,
+[data-edrv-view] .edrv-full-slot, [data-edrv-view] .edrv-full-view,
+[data-edrv-view] .edrv-passive-view { display: flex; flex-direction: column; flex: 1 1 auto; min-width: 0; min-height: 0; overflow: hidden; }
+[data-edrv-view] .edrv-group { border: 0; }
+[data-edrv-view] .edrv-group .edrv-tabs { flex: 0 0 auto; touch-action: none; }
+[data-edrv-view] .edrv-group-tab-name { overflow: hidden; text-overflow: ellipsis; max-width: 180px; }
+[data-edrv-view] .edrv-workbench-tools { flex: 0 0 auto; }
+[data-edrv-view] .edrv-split { display: flex; flex: 1 1 auto; min-width: 0; min-height: 0; overflow: hidden; }
+[data-edrv-view] .edrv-split-vertical { flex-direction: column; }
+[data-edrv-view] .edrv-split-child { display: flex; min-width: 0; min-height: 0; overflow: hidden; }
+[data-edrv-view] .edrv-split-handle { flex: 0 0 5px; background: var(--dsw-alias-border-l1, #e0e6e8); cursor: col-resize; touch-action: none; }
+[data-edrv-view] .edrv-split-vertical > .edrv-split-handle { cursor: row-resize; }
+[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 > 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); }
+.edrv-drop-label, .edrv-drag-ghost { position: fixed; z-index: 151; pointer-events: none; padding: 4px 8px; background: var(--dsw-alias-bg-overlay, #fff); color: var(--dsw-alias-label-primary, #1f2933); border: 1px solid var(--dsw-alias-border-l2, #cdd6da); font-size: 12px; white-space: nowrap; }
+.edrv-drop-label { position: absolute; left: 4px; top: 4px; }
+[data-edrv-view] .edrv-tab:focus-visible { outline: 2px solid var(--dsw-alias-state-info-primary, #4d6bfe); outline-offset: -2px; }
+@media (prefers-reduced-motion: reduce) { .edrv-drag-overlay { transition: none; } }

package/src/client/tabDrag.ts

@@ -0,0 +1,137 @@
+/** Internal pointer drag: never converts external text into file paths. @author ddj 2026年10月14号 */
+import { clampFloat, type DropTarget, type Edge } from './state/editorLayout.js'
+
+export interface Rect { left: number; top: number; width: number; height: number }
+export interface Point { x: number; y: number }
+export type TabDrop = DropTarget | { kind: 'reference' }
+export interface HitRegion { group: string; rect: Rect; tabs?: { path: string; rect: Rect }[]; tabRect?: Rect; floating?: boolean }
+export interface DragHitInput {
+  point: Point
+  viewport: { width: number; height: number }
+  composer?: Rect | null
+  regions: HitRegion[]
+  blank: boolean
+  allowCreate: boolean
+}
+export interface DragPreview { path: string; point: Point; target: TabDrop | null; rect: Rect | null; label: string }
+
+/** @public @author ddj 2026年10月14号 @param point Pointer position. @param rect View bounds. @returns Containment. */
+export function contains(point: Point, rect: Rect): boolean {
+  return point.x >= rect.left && point.x <= rect.left + rect.width && point.y >= rect.top && point.y <= rect.top + rect.height
+}
+
+/** @public @author ddj 2026年10月14号 @param from Press origin. @param to Current pointer. @returns Whether movement exceeds the drag threshold. */
+export function dragStarted(from: Point, to: Point): boolean { return Math.hypot(from.x - to.x, from.y - to.y) >= 6 }
+
+/** @public @author ddj 2026年10月14号 @param point Pointer. @param rect Editor bounds. @returns Nearest edge in a 22% band, or null. */
+export function edgeAt(point: Point, rect: Rect): Edge | null {
+  const x = (point.x - rect.left) / rect.width, y = (point.y - rect.top) / rect.height
+  const distances: [Edge, number][] = [['left', x], ['right', 1 - x], ['top', y], ['bottom', 1 - y]]
+  distances.sort((a, b) => a[1] - b[1])
+  return distances[0]![1] < 0.22 ? distances[0]![0] : null
+}
+
+/** @public @author ddj 2026年10月14号 @param rect Editor bounds. @param edge Split direction. @returns Preview half rectangle. */
+export function splitRect(rect: Rect, edge: Edge): Rect {
+  const { left, top, width, height } = rect
+  if (edge === 'left' || edge === 'right') return { left: left + (edge === 'right' ? width / 2 : 0), top, width: width / 2, height }
+  return { left, top: top + (edge === 'bottom' ? height / 2 : 0), width, height: height / 2 }
+}
+
+/** @public @author ddj 2026年10月14号 @param input Trusted geometry and blank classification. @returns Drop proposal; no state is mutated. */
+export function hitTarget(input: DragHitInput): { target: TabDrop; rect: Rect; label: string } | null {
+  const { point, viewport, composer, regions } = input
+  if (!contains(point, { left: 0, top: 0, ...viewport })) return null
+  if (composer && contains(point, composer)) return { target: { kind: 'reference' }, rect: composer, label: '添加文件引用（不发送）' }
+  for (const region of regions) {
+    if (!contains(point, region.rect)) continue
+    if (region.tabRect && contains(point, region.tabRect)) {
+      const tabs = region.tabs ?? []
+      const index = tabs.findIndex((tab) => point.x < tab.rect.left + tab.rect.width / 2)
+      const at = index < 0 ? tabs.length : index
+      const left = tabs[at]?.rect.left ?? (tabs.length ? tabs[tabs.length - 1]!.rect.left + tabs[tabs.length - 1]!.rect.width : region.tabRect.left)
+      return { target: { kind: 'group', group: region.group, index: at }, rect: { left, top: region.tabRect.top, width: 3, height: region.tabRect.height }, label: '移动到此处' }
+    }
+    const edge = edgeAt(point, region.rect)
+    const fits = edge === 'left' || edge === 'right' ? region.rect.width >= 480 : region.rect.height >= 320
+    if (edge && !region.floating && input.allowCreate && fits) return { target: { kind: 'split', group: region.group, edge }, rect: splitRect(region.rect, edge), label: '分屏编辑' }
+    return { target: { kind: 'group', group: region.group }, rect: region.rect, label: '移入编辑组' }
+  }
+  if (!input.blank || !input.allowCreate) return null
+  const rect = clampFloat({ left: point.x - 120, top: point.y - 18, width: 600, height: 400 }, viewport.width, viewport.height)
+  return { target: { kind: 'float', rect }, rect, label: '独立浮窗' }
+}
+
+export interface DragDeps {
+  hit(point: Point): ReturnType<typeof hitTarget>
+  preview(value: DragPreview | null): void
+  drop(path: string, target: TabDrop): void
+}
+
+/** @public @author ddj 2026年10月14号 @param deps DOM geometry/readback callbacks. @param host Browser window. @returns Single internal drag controller with cleanup. */
+export function createTabDrag(deps: DragDeps, host: Window) {
+  let session: { path: string; origin: Point; point: Point; pointerId: number; dragging: boolean; capture: Element | null } | null = null
+  let frame: number | null = null
+  let suppressClick = false
+
+  /** @private @author ddj 2026年10月14号 Render only once per animation frame. */
+  function paint(): void {
+    frame = null
+    if (!session?.dragging) return
+    const hit = deps.hit(session.point)
+    // DOMRect properties live on its prototype; React style needs own enumerable geometry.
+    const rect = hit ? { left: hit.rect.left, top: hit.rect.top, width: hit.rect.width, height: hit.rect.height } : null
+    deps.preview({ path: session.path, point: session.point, target: hit?.target ?? null, rect, label: hit?.label ?? '无法放置' })
+  }
+  /** @public @author ddj 2026年10月14号 Cancel without changing file/layout ownership. */
+  function cancel(): void {
+    if (frame !== null) host.cancelAnimationFrame(frame)
+    frame = null
+    const previous = session
+    session = null
+    if (previous?.dragging) suppressClick = true
+    try { previous?.capture?.releasePointerCapture(previous.pointerId) } catch { /* Pointer may already be released. */ }
+    host.removeEventListener('pointermove', move, true)
+    host.removeEventListener('pointerup', up, true)
+    host.removeEventListener('pointercancel', cancel, true)
+    host.removeEventListener('keydown', key, true)
+    host.removeEventListener('blur', cancel)
+    deps.preview(null)
+  }
+  /** @private @author ddj 2026年10月14号 @param event Pointer move. Update geometry, not layout. */
+  function move(event: PointerEvent): void {
+    if (!session || event.pointerId !== session.pointerId) return
+    session.point = { x: event.clientX, y: event.clientY }
+    session.dragging ||= dragStarted(session.origin, session.point)
+    if (!session.dragging) return
+    event.preventDefault()
+    if (frame === null) frame = host.requestAnimationFrame(paint)
+  }
+  /** @private @author ddj 2026年10月14号 @param event Pointer release. Commit only a currently valid drop. */
+  function up(event: PointerEvent): void {
+    if (!session || event.pointerId !== session.pointerId) return
+    const previous = session
+    const hit = previous.dragging ? deps.hit({ x: event.clientX, y: event.clientY }) : null
+    cancel()
+    if (hit) deps.drop(previous.path, hit.target)
+  }
+  /** @private @author ddj 2026年10月14号 @param event Keyboard event. Escape cancels this drag only. */
+  function key(event: KeyboardEvent): void { if (event.key === 'Escape' && session) { event.preventDefault(); event.stopPropagation(); cancel() } }
+  /** @public @author ddj 2026年10月14号 @param path Trusted disk tab. @param event Primary pointer press. Start observation, not a move. */
+  function start(path: string, event: PointerEvent): void {
+    if (event.button !== 0 || !event.isPrimary || !path) return
+    cancel()
+    suppressClick = false
+    const origin = { x: event.clientX, y: event.clientY }
+    session = { path, origin, point: origin, pointerId: event.pointerId, dragging: false, capture: event.currentTarget instanceof Element ? event.currentTarget : null }
+    try { session.capture?.setPointerCapture(event.pointerId) } catch { /* Global listeners cover older platforms. */ }
+    host.addEventListener('pointermove', move, true)
+    host.addEventListener('pointerup', up, true)
+    host.addEventListener('pointercancel', cancel, true)
+    host.addEventListener('keydown', key, true)
+    host.addEventListener('blur', cancel)
+  }
+  /** @public @author ddj 2026年10月14号 @returns Whether to consume the synthetic post-drag click. */
+  function consumeClick(): boolean { const result = suppressClick; suppressClick = false; return result }
+  return { start, cancel, consumeClick }
+}

package/src/client/tabMenu.ts

@@ -4,8 +4,8 @@
  * EditorView 只把结果映射成 ContextMenu 的 entries 并派发动作。
  *
  * 与参考图（VS Code / CodeBuddy 页签右键菜单）的对齐口径：
- * 保留其分组顺序（对话 / 关闭族 / 路径 / 定位 / 固定），**省略**本架构无法实现的
- * 「向右拆分 / Split & Move / 移动到新窗口 / 复制到新窗口」（浏览器内单编辑器实例）。
+ * 保留其分组顺序（对话 / 关闭族 / 分组 / 路径 / 定位 / 固定）。
+ * 分屏与页面内浮窗由 workbench 能力显式控制，不伪造系统窗口或复制编辑器能力。
  * 只显示**真实已绑定**的键位；参考图里的两步弦（Ctrl+K W 等）引擎不支持，故不伪造。
  *
  * 「固定 = 保护」：关闭其他 / 关闭右侧 / 关闭已保存 / 全部关闭 一律不关固定页签，
@@ -44,6 +44,10 @@ export interface TabMenuState {
   svnStatusOfTarget?: SvnItemStatus
   /** 「关闭」项的键位提示（缺省无提示；由调用方读 chordOf 注入）。 */
   closeChord?: string | null
+  /** Real workbench capabilities; omitted for legacy consumers. */
+  canSplit?: boolean
+  canFloat?: boolean
+  canReturn?: boolean
 }
 
 /** 一条页签菜单项（ContextMenu 的展示形状 + 动作 id）。 */
@@ -62,7 +66,7 @@ export interface TabMenuEntry {
 export const CLOSE_MENU_IDS = ['close', 'close-others', 'close-right', 'close-saved', 'close-all'] as const
 
 /** 本架构不支持的条目 id（参考图有、浏览器单编辑器实例无法实现）——显式登记以防误加。 */
-export const UNSUPPORTED_MENU_IDS = ['split-right', 'split-move', 'move-new-window', 'copy-new-window'] as const
+export const UNSUPPORTED_MENU_IDS = ['split-move', 'copy-new-window'] as const
 
 /**
  * 构建 SVN 组条目（动作清单来自 shared/svnActions.ts，与树菜单/命令栏同一份规则）。
@@ -123,6 +127,14 @@ export function buildTabMenu(state: TabMenuState): TabMenuEntry[] {
     { id: 'close-right', label: '关闭右侧标签页', disabled: nothingToClose(closeRight(tabs, path, active), tabs) },
     { id: 'close-saved', label: '关闭已保存', disabled: nothingToClose(closeSaved(tabs, dirty, active), tabs) },
     { id: 'close-all', label: '全部关闭', disabled: nothingToClose(closeAll(tabs, active), tabs) },
+    ...(state.canSplit !== undefined ? [
+      { id: 'split-left', label: '向左分屏', separator: true, disabled: !state.canSplit },
+      { id: 'split-right', label: '向右分屏', disabled: !state.canSplit },
+      { id: 'split-top', label: '向上分屏', disabled: !state.canSplit },
+      { id: 'split-bottom', label: '向下分屏', disabled: !state.canSplit },
+      { id: 'move-new-window', label: '移到页面内浮窗', disabled: !state.canFloat },
+      { id: 'return-main', label: '移回主编辑区', disabled: !state.canReturn },
+    ] : []),
     { id: 'copy-path', label: '复制路径', separator: true },
     { id: 'copy-relative-path', label: '复制相对路径', disabled: !hasCwd(cwd) },
     { id: 'reveal-in-os', label: '在文件资源管理器中显示', separator: true, disabled: !hasSession },