dsh-vscode-mode 0.1.17 → 0.1.20

package/src/client/ui/EditorView.ts

@@ -13,9 +13,11 @@ import { createDiffRenderer } from '../monaco/diffRender.js'
 import { ST, callIdAttr, noopHunk, summarize } from '../state/records.js'
 import { diffRegions } from '../state/regions.js'
 import { QuickOpen } from './QuickOpen.js'
-import { DiffBox } from './DiffBox.js'
-import { DiffBarEmpty } from './DiffBarEmpty.js'
 import { DiffLauncher } from './DiffLauncher.js'
+import { SidebarView } from '../sidebar/SidebarView.js'
+import { clearDiffDock, publishDiffDock } from '../diffDockStore.js'
+import { displayDiffTotal, editorDockMode } from '../diffDock.js'
+import { editorHeight } from '../editorLayout.js'
 
 /**
  * 中央编辑区：文件页签（脏点/关闭/打开路径）+ Ctrl+P 搜索 + Monaco 编辑器 +
@@ -26,6 +28,7 @@ import { DiffLauncher } from './DiffLauncher.js'
 export function EditorView(props) {
   const sessionId = props?.sessionId
   const schedule = props.schedule
+  const addToConversation = props.addToConversation
   const [monaco, setMonaco] = React.useState(null)
   const [monacoErr, setMonacoErr] = React.useState(null)
   const [records, setRecords] = React.useState({})
@@ -33,6 +36,7 @@ export function EditorView(props) {
   const [active, setActive] = React.useState(null)
   const [dirtyMap, setDirtyMap] = React.useState({})
   const [content, setContent] = React.useState(null)
+  const [contentPath, setContentPath] = React.useState(null)
   const [status, setStatus] = React.useState('')
   const [error, setError] = React.useState(null)
   const [loadError, setLoadError] = React.useState(null)
@@ -45,7 +49,13 @@ export function EditorView(props) {
   const [hoverAct, setHoverAct] = React.useState(null) // { region, top } 编辑区 hover 差异块的 Keep/Undo 浮层
   const [diffIdx, setDiffIdx] = React.useState(0) // 当前文件内差异位置（x/x 显示）
   const [fileIdx, setFileIdx] = React.useState(0) // 全局差异文件位置（x/x 文件 显示）
+  const [tabMenu, setTabMenu] = React.useState(null) // Tab 右键菜单 { x,y,path }（编辑区右键走 Monaco 原生菜单，无此浮层）
+  const [sidebarOn, setSidebarOn] = React.useState(true) // 侧边栏显隐
+  const [sidebarW, setSidebarW] = React.useState(240) // 侧边栏宽度
+  const [activePanel, setActivePanel] = React.useState('explorer') // 激活面板 id
+  const [focusRequest, setFocusRequest] = React.useState(0) // 外部差异聚焦请求版本
   const editorRef = React.useRef(null)
+  const viewRootRef = React.useRef(null)
   const monacoRef = React.useRef(null)
   const modelsRef = React.useRef(new Map())
   const saveTimerRef = React.useRef(null)
@@ -62,6 +72,7 @@ export function EditorView(props) {
   const hoverEditorRef = React.useRef(false) // 鼠标是否仍在编辑器命中区
   const hoverPanelRef = React.useRef(false) // 鼠标是否已进入 Keep/Undo 浮层
   const batchBusyRef = React.useRef(false) // 批量 Keep All/Undo All 防重入
+  const menuHandlersRef = React.useRef(null) // 右键菜单动作的最新闭包（Monaco addAction 空依赖回调读取）
   const diffRendererRef = React.useRef(null)
   if (!diffRendererRef.current) diffRendererRef.current = createDiffRenderer((sid, t) => dbg(sid, t))
 
@@ -71,7 +82,8 @@ export function EditorView(props) {
     return list
   }, [records, active])
 
-  const regions = React.useMemo(() => diffRegions(currentRecords, content).filter((r) => !r.superseded), [currentRecords, content])
+  const contentReady = content !== null && contentPath === active
+  const regions = React.useMemo(() => diffRegions(currentRecords, contentReady ? content : null).filter((r) => !r.superseded), [currentRecords, content, contentPath, active])
   // useMemo 稳定引用：否则 hover 等重渲染会让 view zone effect 反复重建（- 号闪烁）
   const pendingRegions = React.useMemo(() => regions.filter((r) => r.status === ST.PENDING && !r.stale), [regions])
   const staleRegions = React.useMemo(() => regions.filter((r) => r.status === ST.PENDING && r.stale), [regions])
@@ -108,9 +120,9 @@ export function EditorView(props) {
     })
   }
 
-  const refreshRecords = () => {
+  const refreshRecords = (skipStale) => {
     if (!sessionId) return
-    rpc('edrv.list', { sessionId }).then((res) => {
+    rpc('edrv.list', { sessionId, ...(skipStale ? { skipStale: true } : {}) }).then((res) => {
       if (!res || !res.ok || !Array.isArray(res.records)) return
       const map = {}
       for (const r of res.records) {
@@ -129,6 +141,7 @@ export function EditorView(props) {
       if (seq !== loadSeqRef.current || path !== active) return
       if (res && res.ok) {
         setContent(res.content)
+        setContentPath(path)
         setLoadStage((prev) => ({ progress: Math.max(84, prev.progress), message: '文件已读取，准备创建编辑器…' }))
         setStatus('已加载')
       } else {
@@ -159,9 +172,18 @@ export function EditorView(props) {
   React.useEffect(() => {
     const onOpen = (e) => {
       const p = e?.detail?.path
-      if (p) addTab(p, true)
+      if (!p) return
+      if (e?.detail?.focusDiff === true) {
+        pendingFocusRef.current = { path: p, region: null }
+        setFocusRequest((value) => value + 1)
+      }
+      addTab(p, true)
+    }
+    const onShowLauncher = (event) => {
+      const tab = event?.detail?.tab
+      if (tab === 'pending' || tab === 'archive') setLauncherTab(tab)
+      setLauncherOpen(true)
     }
-    const onShowLauncher = () => setLauncherOpen(true)
     window.addEventListener('edrv:open-editor', onOpen)
     window.addEventListener('edrv:show-launcher', onShowLauncher)
     return () => {
@@ -170,6 +192,64 @@ export function EditorView(props) {
     }
   }, [sessionId])
 
+  // 对话输入区的唯一差异 dock 读取此会话快照；编辑器卸载时只清理自己的发布者令牌。
+  const dockSourceRef = React.useRef({})
+  React.useEffect(() => () => clearDiffDock(sessionId, dockSourceRef.current), [sessionId])
+
+  // DSH composer 保持原生布局；编辑区只读取几何边界并同步自己的高度。
+  React.useLayoutEffect(() => {
+    const root = viewRootRef.current
+    const scroll = root?.closest?.('[data-conversation-scroll]')
+    if (!root || !scroll) return
+    let seat = null
+    let frame = null
+    let resizeObserver = null
+    const update = () => {
+      frame = null
+      const rootRect = root.getBoundingClientRect()
+      const scrollRect = scroll.getBoundingClientRect()
+      const seatRect = seat?.getBoundingClientRect?.()
+      const height = editorHeight(rootRect.top, scrollRect.bottom, seatRect?.top)
+      root.style.setProperty('--edrv-editor-height', height + 'px')
+    }
+    const scheduleUpdate = () => {
+      if (frame !== null) return
+      frame = requestAnimationFrame(update)
+    }
+    const attachSeat = () => {
+      const next = scroll.querySelector?.('[data-composer-seat]')
+      if (next === seat) {
+        scheduleUpdate()
+        return
+      }
+      resizeObserver?.disconnect()
+      seat = next
+      resizeObserver = null
+      if (seat && typeof ResizeObserver === 'function') {
+        resizeObserver = new ResizeObserver(scheduleUpdate)
+        resizeObserver.observe(seat)
+      }
+      scheduleUpdate()
+    }
+    attachSeat()
+    const mutationObserver = typeof MutationObserver === 'function'
+      ? new MutationObserver(attachSeat)
+      : null
+    mutationObserver?.observe(scroll, { childList: true })
+    const scrollObserver = typeof ResizeObserver === 'function' ? new ResizeObserver(scheduleUpdate) : null
+    scrollObserver?.observe(scroll)
+    window.addEventListener('resize', scheduleUpdate)
+    scheduleUpdate()
+    return () => {
+      if (frame !== null) cancelAnimationFrame(frame)
+      resizeObserver?.disconnect()
+      scrollObserver?.disconnect()
+      mutationObserver?.disconnect()
+      window.removeEventListener('resize', scheduleUpdate)
+      root.style.removeProperty('--edrv-editor-height')
+    }
+  }, [sessionId])
+
   // localStorage v2 恢复页签
   React.useEffect(() => {
     if (bootRef.current || !sessionId) return
@@ -192,15 +272,64 @@ export function EditorView(props) {
     catch (e) { /* 忽略 */ }
   }, [tabs, active, sessionId])
 
+  // 侧边栏状态：恢复（显隐/宽度/激活面板）
+  React.useEffect(() => {
+    if (!sessionId) return
+    try {
+      const raw = localStorage.getItem('edrv.sidebar.' + String(sessionId))
+      if (raw) {
+        const saved = JSON.parse(raw)
+        if (typeof saved.on === 'boolean') setSidebarOn(saved.on)
+        if (typeof saved.width === 'number') setSidebarW(Math.max(180, Math.min(560, saved.width)))
+        if (typeof saved.panel === 'string') setActivePanel(saved.panel)
+      }
+    } catch (e) { /* 损坏忽略 */ }
+  }, [sessionId])
+
+  // 侧边栏状态持久化
+  React.useEffect(() => {
+    if (!sessionId) return
+    try { localStorage.setItem('edrv.sidebar.' + String(sessionId), JSON.stringify({ on: sidebarOn, width: sidebarW, panel: activePanel })) }
+    catch (e) { /* 忽略 */ }
+  }, [sidebarOn, sidebarW, activePanel, sessionId])
+
+  // Ctrl+B 切换侧边栏（capture 抢占，避免与 DSH 全局冲突）
+  React.useEffect(() => {
+    const onKey = (e) => {
+      if ((e.ctrlKey || e.metaKey) && String(e.key).toLowerCase() === 'b') {
+        e.preventDefault(); e.stopPropagation()
+        setSidebarOn((v) => !v)
+      }
+    }
+    window.addEventListener('keydown', onKey, true)
+    return () => window.removeEventListener('keydown', onKey, true)
+  }, [])
+
+  // 文件 → 待处理差异数 映射（侧边栏角标）
+  const pendingByPath = React.useMemo(() => {
+    const out = {}
+    for (const f of sum.files) if (f.pending > 0) out[f.path] = f.pending
+    return out
+  }, [sum])
+
   React.useEffect(() => {
     if (!active) return
     setContent(null)
+    setContentPath(null)
     setLoadError(null)
     setLoadStage({ progress: 10, message: '准备读取文件…' })
     setStatus('加载中…')
     loadContent(active, sessionId)
   }, [active, sessionId])
 
+  // Tab 右键菜单打开时 Esc 关闭
+  React.useEffect(() => {
+    if (!tabMenu) return
+    const onKey = (e) => { if (e.key === 'Escape') dismissMenus() }
+    window.addEventListener('keydown', onKey, true)
+    return () => window.removeEventListener('keydown', onKey, true)
+  }, [tabMenu])
+
   React.useEffect(() => {
     if (monaco || monacoErr) return
     let alive = true
@@ -247,6 +376,7 @@ export function EditorView(props) {
       if (res && res.ok) {
         setStatus('已保存 ' + new Date().toTimeString().slice(0, 8))
         setContent(text)
+        setContentPath(active)
         setDirtyMap((d) => Object.assign({}, d, { [active]: false }))
         refreshRecords()
         emitRefresh()
@@ -327,6 +457,40 @@ export function EditorView(props) {
     ed.onDidChangeCursorPosition((e) => {
       setCursor('Ln ' + e.position.lineNumber + ', Col ' + e.position.column)
     })
+    // 编辑区右键 → 注入 Monaco 原生 context menu（与 Go to Definition 等同菜单，避免分离浮层）。
+    // 有选区时额外显示「选中内容」项：context key edrvSelection 由光标选区变化驱动。
+    // 路径/选区在点击时从 model/editor 实时读取（不依赖闭包里的过期 active）。
+    const menuHandlers = () => menuHandlersRef.current
+    const pathOf = (edx) => {
+      const model = edx?.getModel?.()
+      const uriPath = model?.uri?.path
+      return uriPath ? decodeURIComponent(String(uriPath).replace(/^\//, '')) : null
+    }
+    const selectionOf = (edx) => {
+      const s = edx?.getSelection?.()
+      if (!s) return null
+      if (s.startLineNumber === s.endLineNumber && s.startColumn === s.endColumn) return null
+      return { startLine: s.startLineNumber, endLine: s.endLineNumber }
+    }
+    const selKey = ed.createContextKey('edrvSelection', false)
+    ed.onDidChangeCursorSelection((e) => {
+      const s = e?.selection
+      selKey.set(!!(s && (s.startLineNumber !== s.endLineNumber || s.startColumn !== s.endColumn)))
+    })
+    ed.addAction({
+      id: 'edrv.addFileRef', label: '添加文件到对话', contextMenuGroupId: '1_edrv',
+      precondition: 'editorTextFocus',
+      run: (edx) => menuHandlers()?.addRefToChat(pathOf(edx)),
+    })
+    ed.addAction({
+      id: 'edrv.addSelectionRef', label: '添加选中内容为引用', contextMenuGroupId: '1_edrv',
+      precondition: 'edrvSelection',
+      run: (edx) => {
+        const s = selectionOf(edx)
+        const p = pathOf(edx)
+        if (s && p) menuHandlers()?.addRefToChat(p, { startLine: s.startLine, endLine: s.endLine })
+      },
+    })
     // hover 差异块 → 浮出 Keep/Undo（req：鼠标移到编辑区差异块时显示）
     // 防闪烁：① 区域不变不 setState（浮窗锚定差异块起始行，不跟随鼠标）；② 延迟隐藏；
     // ③ 浮窗自身 onMouseEnter 取消隐藏计时（鼠标在浮窗与编辑器间移动不闪）。
@@ -373,7 +537,7 @@ export function EditorView(props) {
     ed.revealLineInCenter(Math.max(1, target.start ?? 1))
     ed.setPosition({ lineNumber: Math.max(1, target.start ?? 1), column: 1 })
     ed.focus()
-  }, [active, content, pendingRegions])
+  }, [active, content, pendingRegions, focusRequest])
 
   const jumpTo = (region) => {
     if (editorRef.current) {
@@ -410,10 +574,16 @@ export function EditorView(props) {
     openFile(sum.pendingFiles[next].path, true)
   }
 
-  const reloadFile = () => {
+  const openNextFile = () => {
+    if (!sum.pendingFiles.length) return
+    if (sum.pendingFiles.some((file) => file.path === active)) gotoFile(1)
+    else openFile(sum.pendingFiles[0].path, true)
+  }
+
+  const reloadFile = (skipStale) => {
     if (!active) return
     loadContent(active, sessionId)
-    refreshRecords()
+    refreshRecords(skipStale === true)
   }
 
   /**
@@ -454,8 +624,64 @@ export function EditorView(props) {
     })
   }
 
-  const acceptFile = () => { for (const r of pendingRegions) actHunk(r, false) }
-  const undoFile = () => { for (const r of [...pendingRegions].reverse()) actHunk(r, true) }
+  /**
+   * 批量采纳/不采纳：一次 RPC 处理多个差异（Keep 整文件 / Keep All / Undo All）。
+   * 单次 setRecords 合并全部结果，避免逐条往返读写整个 sidecar。
+   * @author ddj 2026年08月25号
+   * @param items 决策项数组（callId/scope/hunkIndex/decision）
+   * @returns Promise<{ok:number; fail:number}> 成功/失败计数
+   */
+  const actMany = (items) => {
+    if (!items.length) return Promise.resolve({ ok: 0, fail: 0 })
+    return rpc('edrv.decideBatch', { sessionId, items }).then((res) => {
+      if (!res || !res.ok || !Array.isArray(res.results)) {
+        setError(res?.error ? String(res.error) : '批量处理失败')
+        return { ok: 0, fail: items.length }
+      }
+      let ok = 0
+      let fail = 0
+      const next = {}
+      for (const item of res.results) {
+        if (item && item.ok) {
+          ok++
+          if (item.record) next[item.callId] = item.record
+        } else {
+          fail++
+        }
+      }
+      setRecords((prev) => Object.assign({}, prev, next))
+      return { ok, fail }
+    }).catch((e) => {
+      setError('批量处理异常:' + String(e))
+      return { ok: 0, fail: items.length }
+    })
+  }
+
+  /**
+   * 决策项构造（与单条 actHunk 的 scope 语义一致：create 记录走 call 作用域）。
+   * @author ddj 2026年08月25号
+   * @param r 差异区域/待处理项（callId/idx/create）
+   * @param reject true=不采纳
+   * @returns decideBatch items 元素
+   */
+  const itemOf = (r, reject) => ({ callId: r.callId, scope: r.create ? 'call' : 'hunk', hunkIndex: r.idx, decision: reject ? 'rejected' : 'accepted' })
+
+  const acceptFile = () => {
+    actMany(pendingRegions.map((r) => itemOf(r, false))).then(({ ok, fail }) => {
+      reloadFile(true)
+      emitRefresh()
+      setStatus('已采纳 ' + ok + ' 处差异' + (fail ? '，' + fail + ' 处失败' : ''))
+      if (fail) setError(fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
+    })
+  }
+  const undoFile = () => {
+    actMany([...pendingRegions].reverse().map((r) => itemOf(r, true))).then(({ ok, fail }) => {
+      reloadFile(true)
+      emitRefresh()
+      setStatus('已不采纳 ' + ok + ' 处差异' + (fail ? '，' + fail + ' 处失败' : ''))
+      if (fail) setError(fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
+    })
+  }
 
   // 所有差异文件的待处理 hunk 列表（二级菜单 Keep All / Undo All 用）
   const allPending = React.useMemo(() => {
@@ -473,7 +699,7 @@ export function EditorView(props) {
   }, [records])
 
   /**
-   * 批量处理所有差异文件：采纳全部 / 不采纳全部。不采纳按 at 降序（新改先回滚）串行执行。
+   * 批量处理所有差异文件：采纳全部 / 不采纳全部。不采纳按 at 降序（新改先回滚）排序后一次 RPC。
    * @author ddj 2026年08月20号
    * @param reject true=全部不采纳（回滚），false=全部采纳
    */
@@ -481,19 +707,13 @@ export function EditorView(props) {
     if (batchBusyRef.current || !allPending.length) return
     batchBusyRef.current = true
     const list = reject ? [...allPending].sort((a, b) => (a.at < b.at ? 1 : a.at > b.at ? -1 : b.idx - a.idx)) : allPending
-    let ok = 0, fail = 0
-    const run = async () => {
-      for (const r of list) {
-        if (await actHunk(r, reject, true)) ok++
-        else fail++
-      }
+    actMany(list.map((r) => itemOf(r, reject))).then(({ ok, fail }) => {
       batchBusyRef.current = false
-      reloadFile()
+      reloadFile(true)
       emitRefresh()
       setStatus((reject ? '已不采纳 ' : '已采纳 ') + ok + ' 处差异' + (fail ? '，' + fail + ' 处失败' : ''))
       if (fail) setError(fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
-    }
-    run()
+    }).catch(() => { batchBusyRef.current = false })
   }
   const acceptAllFiles = () => actAllPending(false)
   const undoAllFiles = () => actAllPending(true)
@@ -508,6 +728,32 @@ export function EditorView(props) {
     }).catch((e) => setError('回滚异常:' + String(e)))
   }
 
+  /**
+   * 关闭 Tab 右键菜单。
+   * @author ddj 2026年08月25号
+   */
+  const dismissMenus = () => {
+    setTabMenu(null)
+  }
+
+  /** 把「添加到对话」返回状态映射为状态栏文案。
+   * @author ddj 2026年08月25号 */
+  const statusOfAdd = (outcome, okText) => {
+    if (outcome === 'ok') return okText
+    if (outcome === 'busy') return okText + '（输入框忙，已降级纯文本）'
+    return '无法添加到对话（无会话或输入框不可用）'
+  }
+
+  /** 添加文件/选中区引用到对话（异步，状态栏反馈）。 */
+  const addRefToChat = (path, range) => {
+    if (!path) { setStatus('无活动文件'); return }
+    if (!addToConversation) { setStatus('添加到对话不可用'); return }
+    addToConversation.appendReference(sessionId, path, range).then((o) => setStatus(statusOfAdd(o, '已添加文件引用')))
+  }
+
+  // 供 Monaco 原生右键菜单 addAction 读取的最新动作闭包（空依赖回调不随渲染重建）
+  menuHandlersRef.current = { addRefToChat }
+
   const openFile = (path, focusDiff) => {
     if (!path) return
     addTab(path, true)
@@ -532,6 +778,11 @@ export function EditorView(props) {
       className: 'edrv-tab' + (t.path === active ? ' edrv-tab-active' : ''),
       title: t.path,
       onClick: () => { if (t.path !== active) { flushSave(); setActive(t.path) } },
+      onContextMenu: (e) => {
+        e.preventDefault()
+        e.stopPropagation()
+        setTabMenu({ x: e.clientX, y: e.clientY, path: t.path })
+      },
     },
       React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', maxWidth: 180 } }, t.path.split(/[\\/]/).pop() || t.path),
       (dirtyMap[t.path] ? React.createElement('span', { className: 'edrv-tab-dot' }) : null),
@@ -542,22 +793,19 @@ export function EditorView(props) {
 
   const pathBar = React.createElement('div', { className: 'edrv-pathbar', title: active || '' },
     React.createElement('span', { className: 'edrv-pb-name' }, active ? String(active).split(/[\\/]/).pop() : '未打开文件'),
-    React.createElement('span', { className: 'edrv-pb-full' }, active || '使用右上搜索框 (Ctrl+P) 打开文件'))
+    React.createElement('span', { className: 'edrv-pb-full' }, active || '使用右上搜索框 (Ctrl+P) 打开文件'),
+    (active && langOf(active) ? React.createElement('span', { className: 'edrv-pb-meta' }, langOf(active)) : null),
+    (cursor ? React.createElement('span', { className: 'edrv-pb-meta' }, cursor) : null),
+    (status ? React.createElement('span', { className: 'edrv-pb-meta edrv-pb-status' }, status) : null))
 
   const tabRow = React.createElement('div', { style: { display: 'flex', alignItems: 'center', background: 'var(--dsw-alias-bg-layer-1,transparent)', flexShrink: 0 } },
     tabsEl,
-    React.createElement(QuickOpen, { sessionId, onOpen: (p) => openFile(p, false) }))
-
-  const statusBar = React.createElement('div', { className: 'edrv-statusbar' },
-    React.createElement('span', null, '编辑'),
-    React.createElement('span', null, active ? langOf(active) : ''),
-    React.createElement('span', null, cursor),
-    (status ? React.createElement('span', null, status) : null),
-    React.createElement('span', { style: { flex: 1 } }),
     (sum.totalFiles > 0
       ? React.createElement('button', { className: 'edrv-diffchip', title: '打开差异总览/归档', onClick: () => setLauncherOpen((o) => !o) }, '⚠ 差异 ' + sum.totalFiles + ' 文件')
       : null),
-    React.createElement('button', { className: 'edrv-chip-btn', title: '刷新', onClick: reloadFile }, '⟳'))
+    React.createElement('button', { className: 'edrv-chip-btn' + (sidebarOn ? ' edrv-chip-on' : ''), title: '切换侧边栏 (Ctrl+B)', onClick: () => setSidebarOn((v) => !v) }, '☰'),
+    React.createElement('button', { className: 'edrv-chip-btn', title: '刷新', onClick: reloadFile }, '⟳'),
+    React.createElement(QuickOpen, { sessionId, onOpen: (p) => openFile(p, false) }))
 
   const otherFiles = sum.pendingFiles.filter((f) => f.path !== active)
 
@@ -598,6 +846,7 @@ export function EditorView(props) {
     body = loadingBody('文件加载失败：' + loadError, 0, () => {
       setLoadError(null)
       setContent(null)
+      setContentPath(null)
       setLoadStage({ progress: 10, message: '重新读取文件…' })
       loadContent(active, sessionId)
     })
@@ -630,46 +879,104 @@ export function EditorView(props) {
         React.createElement('button', { className: 'edrv-pill edrv-pill-undo', onClick: () => { dismissHover(); actHunk(hoverAct.region, true) } }, '↩ Undo'))
     : null
 
+  React.useEffect(() => {
+    if (!sessionId) return
+    const mode = editorDockMode(active)
+    publishDiffDock(sessionId, {
+      mode,
+      pendingRegions,
+      staleRegions,
+      onAct: actHunk,
+      onAcceptFile: acceptFile,
+      onUndoFile: undoFile,
+      onAcceptAllFiles: acceptAllFiles,
+      onUndoAllFiles: undoAllFiles,
+      allPendingCount: allPending.length,
+      onRollback: rollbackFile,
+      onJump: jumpTo,
+      otherFiles,
+      onOpenOther: (path) => openFile(path, true),
+      onOpenLauncher: (tab) => { setLauncherTab(tab || 'pending'); setLauncherOpen(true) },
+      onRefresh: reloadFile,
+      activePath: active,
+      diffIdx: contentReady ? diffIdx : 0,
+      diffTotal: displayDiffTotal(contentReady, pendingRegions.length, sum.files.find((file) => file.path === active)?.pending ?? 0),
+      fileIdx,
+      fileTotal: sum.pendingFiles.length,
+      onPrevDiff: () => gotoDiff(-1),
+      onNextDiff: () => gotoDiff(1),
+      onPrevFile: () => gotoFile(-1),
+      onNextFile: () => gotoFile(1),
+      onOpenNextFile: openNextFile,
+    }, dockSourceRef.current)
+  })
+
   const overlay = launcherOpen
     ? React.createElement(React.Fragment, null,
         React.createElement('div', { style: { position: 'fixed', inset: 0, zIndex: 30 }, onClick: () => setLauncherOpen(false) }),
         React.createElement(DiffLauncher, { sessionId, sum, tab: launcherTab, onClose: () => setLauncherOpen(false), onOpenFile: (p) => { openFile(p, true); setLauncherOpen(false) } }))
-    : (pendingRegions.length > 0
-        ? React.createElement(DiffBox, {
-            pendingRegions, staleRegions,
-            onAct: actHunk,
-            onAcceptFile: acceptFile,
-            onUndoFile: undoFile,
-            onAcceptAllFiles: acceptAllFiles,
-            onUndoAllFiles: undoAllFiles,
-            allPendingCount: allPending.length,
-            onRollback: rollbackFile,
-            onJump: jumpTo,
-            otherFiles,
-            onOpenOther: (p) => openFile(p, true),
-            onOpenLauncher: (tab) => { setLauncherTab(tab || 'pending'); setLauncherOpen(true) },
-            onRefresh: reloadFile,
-            activePath: active,
-            diffIdx, diffTotal: pendingRegions.length,
-            fileIdx, fileTotal: sum.pendingFiles.length,
-            onPrevDiff: () => gotoDiff(-1), onNextDiff: () => gotoDiff(1),
-            onPrevFile: () => gotoFile(-1), onNextFile: () => gotoFile(1),
-          })
-        : (sum.pendingFiles.length > 0
-            ? React.createElement(DiffBarEmpty, {
-                sum, active, staleCount: staleRegions.length,
-                onNextFile: () => { if (sum.pendingFiles.length) openFile(sum.pendingFiles[0].path, true) },
-                onOpenLauncher: (tab) => { setLauncherTab(tab || 'pending'); setLauncherOpen(true) },
-                onRefresh: reloadFile,
-              })
-            : null))
-
-  return React.createElement('div', { 'data-edrv-view': '1', style: { height: '100%', minHeight: 0, display: 'flex', flexDirection: 'column', background: 'var(--dsw-alias-bg-base,transparent)', overflow: 'hidden' } },
+    : null
+
+  // Tab 右键菜单浮层：全屏遮罩（点击/右键关闭）+ 菜单（固定定位，clamp 防越界）。
+  // 编辑区右键走 Monaco 原生 context menu（editor.addAction），不在此渲染浮层。
+  /**
+   * 计算右键菜单固定定位（clamp 防越出视口）。
+   * @author ddj 2026年08月25号
+   */
+  const menuPos = (x, y) => ({
+    left: Math.max(4, Math.min(x, (window.innerWidth || 800) - 224)),
+    top: Math.max(4, Math.min(y, (window.innerHeight || 600) - 176)),
+  })
+  const menuBackdrop = tabMenu
+    ? React.createElement('div', {
+        style: { position: 'fixed', inset: 0, zIndex: 70 },
+        onClick: dismissMenus,
+        onContextMenu: (e) => { e.preventDefault(); dismissMenus() },
+      })
+    : null
+  const tabMenuEl = tabMenu
+    ? React.createElement('div', { className: 'edrv-ctxmenu', style: menuPos(tabMenu.x, tabMenu.y) },
+        React.createElement('button', { className: 'edrv-ctxmenu-item', onClick: () => { addRefToChat(tabMenu.path); dismissMenus() } }, '添加文件到对话'),
+        React.createElement('div', { className: 'edrv-ctxmenu-sep' }),
+        React.createElement('button', { className: 'edrv-ctxmenu-item edrv-ctxmenu-danger', onClick: () => { closeTab(tabMenu.path); dismissMenus() } }, '关闭标签页'))
+    : null
+
+  const sidebarPanels = props.sidebarPanels
+  const sidebarCtx = {
+    sessionId,
+    openFile: (p) => openFile(p, false),
+    activePath: active,
+    pendingByPath,
+    sum: { totalFiles: sum.totalFiles, files: sum.files },
+    refreshRecords: () => refreshRecords(),
+  }
+
+  // 主编辑列（侧边栏右侧）：pathBar + tabRow + 编辑/差异区（底部整条留给 DSH 对话输入栏）
+  const editorArea = React.createElement('div', { className: 'edrv-editor-area' },
+    body,
+    hoverEl,
+    overlay)
+  const mainCol = React.createElement('div', { className: 'edrv-main-col', style: { flex: 1, minWidth: 0, minHeight: 0, display: 'flex', flexDirection: 'column', overflow: 'hidden' } },
     pathBar,
     tabRow,
-    React.createElement('div', { style: { position: 'relative', flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column' } },
-      body,
-      hoverEl,
-      overlay),
-    statusBar)
+    editorArea)
+  // 编辑器根节点按 composer 顶部边界动态限高，底部对话区域继续由 DSH 原生渲染。
+  const editorRow = React.createElement('div', { className: 'edrv-editor-row' },
+    (sidebarOn && sidebarPanels
+      ? React.createElement(SidebarView, {
+          registry: sidebarPanels,
+          ctx: sidebarCtx,
+          activePanel,
+          onActive: setActivePanel,
+          width: sidebarW,
+          onWidth: setSidebarW,
+          onHide: () => setSidebarOn(false),
+        })
+      : null),
+    mainCol)
+
+  return React.createElement('div', { ref: viewRootRef, 'data-edrv-view': '1', style: { height: 'var(--edrv-editor-height, 100%)', maxHeight: 'var(--edrv-editor-height, 100%)', minHeight: 0, display: 'flex', flexDirection: 'column', background: 'var(--dsw-alias-bg-base,transparent)', overflow: 'hidden' } },
+    editorRow,
+    menuBackdrop,
+    tabMenuEl)
 }