dsh-vscode-mode 0.14.12 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.14.12",
+  "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/sidebar/panels/FileExplorer.ts

@@ -24,6 +24,7 @@ import { Button } from '@deepseek-ai/dsh-client-ui-primitives'
 import { emitRefresh } from '../../events.js'
 import { svnOverlayEl, viewOverlayOf } from '../../ui/SvnOverlay.js'
 import { useExplorerSvn } from './useExplorerSvn.js'
+import { useExplorerReveal, treeRevealPath } from './useExplorerReveal.js'
 import type { SidebarCtx } from '../types.js'
 
 const DIR_CAP = 4000
@@ -31,10 +32,6 @@ const SAVE_DEBOUNCE_MS = 300
 const FOLLOW_INTERVAL_MS = 10_000
 const PREFETCH_MAX = 4
 const PREFETCH_EXCLUDED = new Set(['node_modules', '.git', '.hg', '.svn', '.pnpm', '.pnpm-store'])
-/** 「在资源管理器视图中显示」高亮时长与定位重试上限（目录懒加载需等待行渲染）。 */
-const REVEAL_HIGHLIGHT_MS = 2000
-const REVEAL_RETRY_MAX = 6
-const REVEAL_RETRY_MS = 120
 /** 外部文件变化重列去抖：一轮外部批量写入（如 agent 连写多文件）合并为一次重列。 */
 const FILE_CHANGE_DEBOUNCE_MS = 400
 
@@ -97,16 +94,6 @@ function rowView(props) {
 }
 const ExplorerRow = React.memo(rowView)
 
-/**
- * 转义 CSS 属性选择器的值（路径含引号/反斜杠时避免选择器语法错误）。
- * @author ddj 2026年09月11号
- * @param value 原始值
- * @returns 可安全嵌入 `[attr="…"]` 的字符串
- */
-function cssEscape(value) {
-  return String(value ?? '').replace(/\\/g, '\\\\').replace(/"/g, '\\"')
-}
-
 /**
  * 目录树面板主体（SWR：有缓存先渲染，无缓存才显示加载态；加载总在后台）。
  * @param props.ctx 面板共享上下文（sessionId/openFile/activePath/pendingByPath/fileMenuItems/notify）
@@ -127,7 +114,6 @@ export function FileExplorer(props) {
   const [loading, setLoading] = React.useState({})
   const [errors, setErrors] = React.useState({}) // rel → 错误文案（仅无任何数据时展示）
   const [menu, setMenu] = React.useState(null) // 右键菜单 { x, y, target }
-  const [revealPath, setRevealPath] = React.useState(null) // 高亮的相对路径（「在资源管理器视图中显示」）
   // 各状态 ref 镜像：定时器/监听用最新闭包
   const tokensRef = React.useRef({})
   const expandedRef = React.useRef({})
@@ -139,9 +125,6 @@ export function FileExplorer(props) {
   const saveTimerRef = React.useRef(null)
   const loadDirRef = React.useRef(null)
   const refreshRef = React.useRef(null)
-  const revealTimerRef = React.useRef(null) // 高亮清除计时器
-  const revealTryRef = React.useRef(0) // 当前定位的重试计数（行渲染需等目录加载）
-  const revealInTreeRef = React.useRef(null) // 定位动作最新闭包（窗口监听读取）
   const treeRef = React.useRef(null) // 目录树容器（定位时按 data-edrv-path 查行）
   const reloadDirRef = React.useRef(null) // loadDir 最新闭包（文件变化监听读取，防陈旧闭包）
   const changedTimerRef = React.useRef(null) // 文件变化合并去抖计时器
@@ -172,8 +155,10 @@ export function FileExplorer(props) {
     const force = opts?.force === true
     const doPrefetch = opts?.prefetch === true
     if (!force && loadingRef.current[rel]) return
-    const token = (tokensRef.current[rel] || 0) + 1
-    tokensRef.current[rel] = token
+    const tokens = tokensRef.current
+    const token = (tokens[rel] || 0) + 1
+    tokens[rel] = token
+    loadingRef.current = Object.assign({}, loadingRef.current, { [rel]: true })
     setLoading((prev) => Object.assign({}, prev, { [rel]: true }))
     setErrors((prev) => {
       const next = Object.assign({}, prev)
@@ -183,7 +168,7 @@ export function FileExplorer(props) {
     const args = { sessionId, path: rel }
     if (force) args.force = true
     rpc('edrv.listDir', args).then((res) => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       if (res && res.ok && Array.isArray(res.entries)) {
         setDirs((prev) => Object.assign({}, prev, { [rel]: res.entries }))
         if (res.root) setRoot((prev) => prev || res.root)
@@ -196,12 +181,12 @@ export function FileExplorer(props) {
         }
       }
     }).catch((e) => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       if (!entriesOf(rel)) {
         setErrors((prev) => Object.assign({}, prev, { [rel]: '读取目录异常:' + String(e) }))
       }
     }).finally(() => {
-      if (tokensRef.current[rel] !== token) return
+      if (scopeRef.current !== scope || tokensRef.current !== tokens || tokens[rel] !== token) return
       setLoading((prev) => {
         const next = Object.assign({}, prev)
         delete next[rel]
@@ -220,55 +205,28 @@ export function FileExplorer(props) {
     void loadDir(rel, { prefetch: true })
   }
 
-  /**
-   * 尝试把目标行滚入可见并高亮；行尚未渲染（祖先目录仍在加载）时按上限重试。
-   * @author ddj 2026年09月11号
-   * @param path 目标相对路径
-   */
-  const tryReveal = (path) => {
-    const host = treeRef.current
-    const row = host?.querySelector?.('[data-edrv-path="' + cssEscape(path) + '"]')
-    if (!row) {
-      revealTryRef.current += 1
-      if (revealTryRef.current < REVEAL_RETRY_MAX) {
-        window.setTimeout(() => tryReveal(path), REVEAL_RETRY_MS)
-      }
-      return
-    }
-    row.scrollIntoView?.({ block: 'center' })
-    setRevealPath(path)
-    if (revealTimerRef.current) clearTimeout(revealTimerRef.current)
-    revealTimerRef.current = window.setTimeout(() => {
-      revealTimerRef.current = null
-      setRevealPath(null)
-    }, REVEAL_HIGHLIGHT_MS)
-  }
-
-  /**
-   * 在资源管理器视图中显示：展开全部祖先目录并定位高亮目标文件。
-   * 目录条目懒加载，故先展开祖先并触发加载，再由 tryReveal 轮询等行渲染。
-   * @author ddj 2026年09月11号
-   * @param path 目标相对路径
-   */
-  const revealInTree = (path) => {
-    if (!path) return
+  /** @private @author ddj 2026年10月14号 @param path Safe relative file path. Expands only the ancestor chain and reuses available directory entries. */
+  function prepareReveal(path) {
     const ancestors = ancestorDirsOf(path)
-    revealTryRef.current = 0
-    setExpanded((prev) => {
+    setExpanded(expandParents)
+    for (const dir of ['', ...ancestors]) {
+      if (entriesOf(dir)) continue
+      void loadDir(dir, { prefetch: false })
+    }
+    /** @private @author ddj 2026年10月14号 @param prev Current expansion map. @returns Expanded ancestor map. */
+    function expandParents(prev) {
       const next = Object.assign({}, prev)
       for (const dir of ancestors) next[dir] = true
       return next
-    })
-    for (const dir of ancestors) void loadDir(dir, { prefetch: false })
-    tryReveal(path)
+    }
   }
-  revealInTreeRef.current = revealInTree
 
   const refresh = (event) => {
     if (event?.detail?.scope && event.detail.scope !== scope) return
     if (event?.detail?.paths?.length) { for (const path of event.detail.paths) onFileChanged(path); return }
     const keep = Object.keys(expandedRef.current).filter((k) => expandedRef.current[k] === true)
     tokensRef.current = {}
+    loadingRef.current = {}
     setMenu(null)
     setErrors({})
     // SWR：保留旧条目不清空，后台强制重列（force 跳过索引）
@@ -334,13 +292,13 @@ export function FileExplorer(props) {
 
   React.useEffect(() => {
     tokensRef.current = {}
+    loadingRef.current = {}
     setDirs({})
     setExpanded({})
     setLoading({})
     setErrors({})
     setMenu(null)
     setRoot(null)
-    setRevealPath(null)
     // 恢复上次展开状态（对齐 VSCode：持久化展开路径，条目缓存即时渲染、后台刷新）
     const cached = scope ? explorerLoad(scope) : null
     const restored = cached?.expanded ?? []
@@ -379,19 +337,9 @@ export function FileExplorer(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  // 在资源管理器视图中显示（页签右键菜单）：展开祖先目录并定位高亮
-  React.useEffect(() => {
-    const onReveal = (event) => {
-      const path = event?.detail?.path
-      if (typeof path === 'string' && path) revealInTreeRef.current?.(path)
-    }
-    window.addEventListener('edrv:reveal-path', onReveal)
-    return () => {
-      window.removeEventListener('edrv:reveal-path', onReveal)
-      if (revealTimerRef.current) { clearTimeout(revealTimerRef.current); revealTimerRef.current = null }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  // 在恢复工作区展开状态之后跟随活动文件；隐藏期间目标由编辑器保留，重新挂载时兑现。
+  const { revealPath } = useExplorerReveal({ scope, activePath, treeRef, prepare: prepareReveal })
+  const activeTreePath = treeRevealPath(activePath)
 
   // 10s 轻量跟随：已展开目录后台刷新（命中 host 索引，近零成本），树跟随 agent 写入
   React.useEffect(() => {
@@ -446,7 +394,7 @@ export function FileExplorer(props) {
     if (!row.e) return React.createElement('div', { key: row.key, className: 'edrv-tree-loading', style: { paddingLeft: 6 + row.depth * 14 } }, row.text)
     const { e, depth, isDir, isOpen } = row
     return React.createElement(ExplorerRow, { key: e.path, path: e.path, name: e.name, type: e.type, depth, isDir, isOpen,
-      pending: isDir ? 0 : pendingByPath[e.path] ?? 0, active: !isDir && e.path === activePath,
+      pending: isDir ? 0 : pendingByPath[e.path] ?? 0, active: !isDir && e.path === activeTreePath,
       context: Boolean(menu && menuEntries.length && menu.target.path === e.path), reveal: revealPath === e.path,
       mark: svn.local?.get(e.path), remote: svn.remote?.get(e.path) ?? 0, onSelect, onContext })
   }

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

@@ -0,0 +1,109 @@
+import React from 'react'
+import { isTreeRevealable } from '../../tabActions.js'
+
+/** @private @author ddj 2026年10月14号 @param path Editor path. @returns Safe normalized tree path, or null. */
+export function treeRevealPath(path: string | null): string | null {
+  if (!path || !isTreeRevealable(path)) return null
+  return path.replace(/\\/g, '/').replace(/^\.\//, '')
+}
+
+/** @private @author ddj 2026年10月14号 @param host Tree scroll container. @param path Exact row path. @returns Whether a visible row was located. Only scrolls the tree. */
+export function revealTreeRow(host: HTMLElement | null, path: string): boolean {
+  if (!host || host.clientHeight <= 0) return false
+  const escaped = path.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+  const row = host.querySelector<HTMLElement>('[data-edrv-path="' + escaped + '"]')
+  if (!row) return false
+  const viewport = host.getBoundingClientRect()
+  const bounds = row.getBoundingClientRect()
+  const top = viewport.top + host.clientTop
+  if (bounds.top < top || bounds.bottom > top + host.clientHeight) {
+    host.scrollTop += bounds.top - top - (host.clientHeight - bounds.height) / 2
+  }
+  return true
+}
+
+interface RevealOptions {
+  scope: string
+  activePath: string | null
+  treeRef: React.RefObject<HTMLElement>
+  prepare: (path: string) => void
+}
+interface RevealTarget {
+  scope: string
+  path: string
+  active: string | null
+}
+
+/** @private @author ddj 2026年10月14号 @param options Current workspace, active editor and tree preparation. @returns Highlight and manual request callback. Waits for committed rows without polling; unmount cancels highlight cleanup. */
+export function useExplorerReveal(options: RevealOptions) {
+  const { scope, activePath, treeRef } = options
+  const [target, setTarget] = React.useState<RevealTarget | null>(null)
+  const [revealPath, setRevealPath] = React.useState<string | null>(null)
+  const pending = React.useRef<RevealTarget | null>(null)
+  const timer = React.useRef<ReturnType<typeof setTimeout> | null>(null)
+  const latest = React.useRef(options)
+  latest.current = options
+
+  /** @private @author ddj 2026年10月14号 Clears only this hook's highlight timer. */
+  function clearHighlight(): void {
+    if (timer.current !== null) clearTimeout(timer.current)
+    timer.current = null
+  }
+  /** @private @author ddj 2026年10月14号 @param path Requested tree path. Expands ancestors and replaces any previous pending target. */
+  function requestReveal(path: string | null): void {
+    clearHighlight()
+    setRevealPath(null)
+    const normalized = treeRevealPath(path)
+    const current = latest.current
+    const next = normalized ? { scope: current.scope, path: normalized, active: current.activePath } : null
+    pending.current = next
+    setTarget(next)
+    if (next) current.prepare(next.path)
+  }
+  /** @private @author ddj 2026年10月14号 Attempts the latest target after row commit or container resize. Consumes only a successful, current request. */
+  function tryReveal(): void {
+    const next = pending.current
+    const current = latest.current
+    if (!next || next.scope !== current.scope || next.active !== current.activePath) return
+    if (!revealTreeRow(current.treeRef.current, next.path)) return
+    pending.current = null
+    setRevealPath(next.path)
+    clearHighlight()
+    timer.current = setTimeout(endHighlight, 2000)
+  }
+  /** @private @author ddj 2026年10月14号 Ends transient reveal styling without changing the active editor row. */
+  function endHighlight(): void {
+    timer.current = null
+    setRevealPath(null)
+  }
+
+  /** @private @author ddj 2026年10月14号 Establishes the latest editor target after workspace tree restoration. */
+  function followActive(): void { requestReveal(activePath) }
+  React.useEffect(followActive, [scope, activePath])
+  React.useLayoutEffect(tryReveal)
+
+  /** @private @author ddj 2026年10月14号 @returns Cleanup for manual events, resize observation and highlight timer. */
+  function listenReveal(): () => void {
+    /** @private @author ddj 2026年10月14号 @param event Existing explicit reveal request. */
+    function onReveal(event: Event): void {
+      const detail = (event as CustomEvent<{ path?: string; scope?: string }>).detail
+      if (detail?.scope && detail.scope !== latest.current.scope) return
+      if (typeof detail?.path === 'string') requestReveal(detail.path)
+    }
+    const observer = typeof ResizeObserver === 'function' ? new ResizeObserver(tryReveal) : null
+    if (treeRef.current) observer?.observe(treeRef.current)
+    window.addEventListener('edrv:reveal-path', onReveal)
+    /** @private @author ddj 2026年10月14号 Cancels callbacks owned by this mounted tree. */
+    function cleanup(): void {
+      observer?.disconnect()
+      window.removeEventListener('edrv:reveal-path', onReveal)
+      pending.current = null
+      clearHighlight()
+    }
+    return cleanup
+  }
+  React.useEffect(listenReveal, [treeRef])
+  // Keep the request state as a render trigger when an already-open tree is revealed manually.
+  void target
+  return { revealPath, requestReveal }
+}

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