dsh-vscode-mode 0.25.1 → 0.27.0

package/src/client/state/reviewFeed.ts

@@ -4,7 +4,7 @@ import type { ReviewPage } from '../../shared/review.js'
 
 export interface ReviewFeed { page: ReviewPage | null; error: string }
 type Listener = (feed: ReviewFeed) => void
-interface Entry { listeners: Set<Listener>; value: ReviewFeed; controller: AbortController; timer?: ReturnType<typeof setTimeout>; loading: boolean; again: boolean; onRefresh: () => void }
+interface Entry { listeners: Set<Listener>; value: ReviewFeed; controller: AbortController; timer?: ReturnType<typeof setTimeout>; loading: boolean; again: boolean; onRefresh: () => void; onVisible?: () => void }
 const feeds = new Map<string, Entry>()
 
 /** @private @author ddj 2026年10月26号 @param entry Shared feed. Notify mounted observers only. */
@@ -13,6 +13,7 @@ function notify(entry: Entry): void { for (const listener of entry.listeners) li
 /** @private @author ddj 2026年10月26号 @param sessionId Scope. @param entry Current generation. @returns First-page metadata update; no overlap or late publication. */
 async function refresh(sessionId: string, entry: Entry, force = false): Promise<void> {
   if (entry.controller.signal.aborted) return
+  if (typeof document !== 'undefined' && document.hidden) { entry.again = true; return }
   if (entry.loading) { entry.again = true; return }
   clearTimeout(entry.timer)
   entry.loading = true
@@ -46,14 +47,20 @@ export function subscribeReview(sessionId: string, listener: Listener): () => vo
     entry = { listeners: new Set(), value: { page: null, error: '' }, controller: new AbortController(), loading: false, again: false, onRefresh }
     feeds.set(sessionId, entry)
     if (typeof window !== 'undefined') window.addEventListener('edrv:refresh', onRefresh)
+    if (typeof document !== 'undefined') {
+      const current = entry
+      entry.onVisible = () => { if (!document.hidden) void refresh(sessionId, current) }
+      document.addEventListener('visibilitychange', entry.onVisible)
+    }
     void refresh(sessionId, entry)
   }
   entry.listeners.add(listener); listener(entry.value)
   return () => {
     entry.listeners.delete(listener)
-    if (entry.listeners.size) return
+    if (entry.listeners.size || feeds.get(sessionId) !== entry) return
     entry.controller.abort(); clearTimeout(entry.timer); feeds.delete(sessionId)
     if (typeof window !== 'undefined') window.removeEventListener('edrv:refresh', entry.onRefresh)
+    if (entry.onVisible && typeof document !== 'undefined') document.removeEventListener('visibilitychange', entry.onVisible)
   }
 }
 

package/src/client/tabMenu.ts

@@ -48,6 +48,7 @@ export interface TabMenuState {
   canSplit?: boolean
   canFloat?: boolean
   canReturn?: boolean
+  forgeReady?: boolean
 }
 
 /** 一条页签菜单项（ContextMenu 的展示形状 + 动作 id）。 */
@@ -122,6 +123,10 @@ export function buildTabMenu(state: TabMenuState): TabMenuEntry[] {
       label: '添加到对话',
       disabled: !(hasSession && canAddToConversation),
     },
+    ...(state.forgeReady ? [
+      { id: 'forge-open', label: '打开 Forge' },
+      { id: 'forge-local', label: '查看本地变更（Forge）' },
+    ] : []),
     { id: 'close', label: '关闭', separator: true, ...(closeChord ? { hint: closeChord } : {}) },
     { id: 'close-others', label: '关闭其他', disabled: nothingToClose(closeOthers(tabs, path, active), tabs) },
     { id: 'close-right', label: '关闭右侧标签页', disabled: nothingToClose(closeRight(tabs, path, active), tabs) },

package/src/client/ui/ClaimRouter.ts

@@ -8,7 +8,7 @@
  * 作者 ddj 2026年09月10号
  */
 import React from 'react'
-import { forwardToEditor, parseOfficialFileAddress, resolveNavLine } from '../officialSidebar.js'
+import { forwardToEditor, parseOfficialFileAddress, resolveNavLine, resolveNavColumn } from '../officialSidebar.js'
 import { log } from '../log.js'
 
 /** 转发尝试次数（含首次）与重试间隔。 */
@@ -68,17 +68,22 @@ export function createClaimRouter(spec) {
     const doneRef = React.useRef(-1)
 
     React.useEffect(() => {
-      if (revision === doneRef.current) return
-      doneRef.current = revision
+      const intent = JSON.stringify([props?.sessionId, tab?.id, revision, navigation?.address])
+      if (intent === doneRef.current) return
       const parsed = parseOfficialFileAddress(navigation?.address)
       if (!parsed) {
         setFailed(true)
         return
       }
       const line = resolveNavLine(navigation?.params)
+      const column = resolveNavColumn(navigation?.params)
+      let alive = true
+      setFailed(false)
       let left = FORWARD_ATTEMPTS
       const attempt = () => {
-        if (forwardToEditor(service, parsed.path, line, navigation?.params?.preview)) {
+        if (!alive || tab?.signal?.aborted) return
+        if (forwardToEditor(typeof tab?.actions?.openTab === 'function' ? tab.actions : service, parsed.path, line, navigation?.params?.preview, column)) {
+          doneRef.current = intent
           closeTab(tab)
           return
         }
@@ -87,7 +92,8 @@ export function createClaimRouter(spec) {
         else setFailed(true)
       }
       attempt()
-    }, [revision])
+      return () => { alive = false }
+    }, [revision, props?.sessionId, tab?.id, navigation?.address])
 
     if (!failed || typeof fallback !== 'function') return null
     return React.createElement(fallback, props)

package/src/client/ui/EditorPane.ts

@@ -43,7 +43,15 @@ export function EditorPane(props: PaneProps): React.ReactElement {
     /** @private @author ddj 2026年10月14号 @param event Close press. Never start a drag. */
     function stop(event: React.PointerEvent): void { event.stopPropagation() }
     /** @private @author ddj 2026年10月14号 @param event Keyboard activation. */
-    function key(event: React.KeyboardEvent): void { if (event.key === 'Enter' || event.key === ' ') { event.preventDefault(); props.onSelect(group.id, tab.path) } }
+    function key(event: React.KeyboardEvent): void {
+      if (event.key === 'ContextMenu' || (event.shiftKey && event.key === 'F10')) {
+        event.preventDefault(); event.stopPropagation()
+        const rect = event.currentTarget.getBoundingClientRect()
+        props.onMenu(tab.path, { clientX: rect.left, clientY: rect.bottom } as React.MouseEvent)
+        return
+      }
+      if (event.key === 'Enter' || event.key === ' ') { event.preventDefault(); props.onSelect(group.id, tab.path) }
+    }
     return React.createElement('div', {
       key: tab.path, 'data-edrv-tab-path': tab.path, role: 'tab', tabIndex: 0, 'aria-selected': selected,
       className: 'edrv-tab' + (selected ? ' edrv-tab-active' : '') + (tab.pinned ? ' edrv-tab-pinned' : ''),

package/src/client/ui/EditorView.ts

@@ -24,10 +24,12 @@ import { dbg, isDebug, rpc } from '../rpc.js'
 import { refreshFeed, subscribeErrors, subscribeRecords } from '../state/recordsFeed.js'
 import { subscribeReview, refreshReview } from '../state/reviewFeed.js'
 import { runReviewBatch } from '../reviewBatch.js'
+import { runKeepAll } from '../reviewKeepAll.js'
+import { toastDom } from '../externalOpen.js'
 import { ReviewAllConfirm } from './ReviewAllConfirm.js'
 import { reviewRegions } from '../../shared/reviewRegions.js'
 import { PENDING_PREFIX } from '../../shared/pendingReview.js'
-import { diffSummary, officialPath } from '../state/diffSummary.js'
+import { coveredPathKeys, diffPathKey, diffSummary } from '../state/diffSummary.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
 import { bindEditActions, runEditAction } from '../monaco/editActions.js'
@@ -134,7 +136,7 @@ import { clampToolbarPosition, loadToolbarPosition, saveToolbarPosition } from '
 import { editorModelPathOf } from '../dap/modelPath.js'
 import { dapTrace } from '../dap/trace.js'
 import { isSessionMissingError, sessionErrorText, sessionMissingDetail, sessionMissingTitle } from '../sessionError.js'
-import { officialDownView, SESSION_DOWN_NOTICE } from '../reviewBar.js'
+import { officialDownView, SESSION_DOWN_NOTICE, SIDECAR_KEEP_DONE } from '../reviewBar.js'
 
 /** 官方差异读取失败前缀：仅用于清理同源陈旧错误，不吞并保存类错误。@author ddj 2026年10月27号 */
 const REVIEW_LOAD_ERROR = '官方差异读取失败：'
@@ -272,11 +274,11 @@ export function EditorView(props) {
   const [monacoErr, setMonacoErr] = React.useState(null)
   const [records, setRecords] = React.useState({})
   const [review, setReview] = React.useState({ page: null, error: '' })
+  React.useEffect(() => { setReview({ page: null, error: '' }) }, [sessionId])
   React.useEffect(() => {
-    setReview({ page: null, error: '' })
-    if (!sessionId) return undefined
+    if (!sessionId || props.visible === false) return undefined
     return subscribeReview(sessionId, setReview)
-  }, [sessionId])
+  }, [sessionId, props.visible])
   const [tabs, setTabs] = React.useState([])
   const [active, setDiskActive] = React.useState(null)
   const [planTabs, setPlanTabs] = React.useState([])
@@ -565,14 +567,17 @@ export function EditorView(props) {
   layoutRef.current = layout
   if (!diffRendererRef.current) diffRendererRef.current = createDiffRenderer((sid, t) => dbg(sid, t))
 
+  // 已有权威通道（官方汇总 / 待审累计基线）在管的路径：旧工具记录不得再画出来，也不得被批量纳入
+  const coveredPaths = React.useMemo(() => coveredPathKeys(review.page), [review.page])
+
   const currentRecords = React.useMemo(() => {
     const list = []
     for (const rec of Object.values(records)) {
-      if (rec.archived === true || officialPath(rec.path, review.page)) continue
+      if (rec.archived === true || coveredPaths.has(diffPathKey(rec.path))) continue
       if (sameFile(rec.path, active)) list.push(rec)
     }
     return list
-  }, [records, active, cwd, review.page])
+  }, [records, active, cwd, coveredPaths])
 
   const reviewOpsRef = React.useRef(new Map())
   // 已自动结案的记录 id：防止「改动已不在文件中」的记录在刷新期间被反复提交判定
@@ -1449,12 +1454,12 @@ export function EditorView(props) {
 
   // 挂载：接入会话级共享订阅（单定时器由 recordsFeed 持有，本组件不再自建 interval）
   React.useEffect(() => {
-    if (!sessionId) return undefined
+    if (!sessionId || props.visible === false) return undefined
     const offRecords = subscribeRecords(sessionId, applyRecords)
     const offErrors = subscribeErrors(sessionId, (message) => setError('list异常:' + message))
     refreshRecords()
     return () => { offRecords(); offErrors() }
-  }, [sessionId])
+  }, [sessionId, props.visible])
 
   /**
    * 展示外部同步提示（按路径+类型去重：同一文件重复回调不重置已关闭的提示）。
@@ -1555,12 +1560,21 @@ export function EditorView(props) {
   })
 
   React.useEffect(() => {
-    const publishLsp = (servers) => setLspServers(Array.isArray(servers) ? servers : [])
+    let alive = true
+    let loading = false
+    const publishLsp = (servers) => { if (alive) setLspServers(Array.isArray(servers) ? servers : []) }
+    const refreshLsp = async () => {
+      if (loading || props.visible === false || document.hidden) return
+      loading = true
+      try { publishLsp(await refreshStatus(true)) }
+      finally { loading = false }
+    }
     const unsubscribe = onLspProgress(publishLsp)
-    void refreshStatus(true).then(publishLsp)
-    const timer = setInterval(() => { void refreshStatus(true).then(publishLsp) }, 1500)
-    return () => { unsubscribe(); clearInterval(timer) }
-  }, [sessionId])
+    void refreshLsp()
+    const timer = setInterval(refreshLsp, 1500)
+    document.addEventListener('visibilitychange', refreshLsp)
+    return () => { alive = false; unsubscribe(); clearInterval(timer); document.removeEventListener('visibilitychange', refreshLsp) }
+  }, [sessionId, props.visible])
 
   // LSP 会话：EditorView 持有权威 sessionId，直接写入 lspClient 并广播。
   // 直接调用不依赖事件时序（订阅可能晚于首次派发），广播供其它消费方复用。
@@ -1604,6 +1618,9 @@ export function EditorView(props) {
   const fileOpenRef = React.useRef(null)
   /** @private @author ddj 2026年10月08号 @param e Routed file request. Always uses the current workspace and save/preview callbacks. */
   fileOpenRef.current = (e) => {
+    if (e?.detail?.sessionId && e.detail.sessionId !== sessionId) return
+    if (e?.detail?.ownerId && e.detail.ownerId !== props?.ownerId) return
+    if (!e?.detail?.ownerId && props?.visible === false) return
     const p = e?.detail?.path
     if (!p) return
     // G9：入口统一归一为工作区相对路径（差异栏/对话链接/LSP 跳转等都经此事件）
@@ -3315,8 +3332,10 @@ export function EditorView(props) {
       }
       // #endregion
       if (!res || !res.ok || !Array.isArray(res.results)) {
-        setError(res?.error ? String(res.error) : '批量处理失败')
-        return { ok: 0, fail: items.length, stale: 0 }
+        const failure = res?.error ? String(res.error) : '批量处理失败'
+        setError(failure)
+        // 真实原因要一路带到调用处：调用方按计数兜底会把 Host 原文盖掉，用户只看得到泛化文案
+        return { ok: 0, fail: items.length, stale: 0, error: failure }
       }
       let ok = 0
       let fail = 0
@@ -3336,8 +3355,9 @@ export function EditorView(props) {
       if (Object.keys(next).length) setRecords((prev) => Object.assign({}, prev, next))
       return { ok, fail, stale }
     }).catch((e) => {
-      setError('批量处理异常:' + String(e))
-      return { ok: 0, fail: items.length, stale: 0 }
+      const failure = '批量处理异常:' + String(e)
+      setError(failure)
+      return { ok: 0, fail: items.length, stale: 0, error: failure }
     })
   }
 
@@ -3470,6 +3490,33 @@ export function EditorView(props) {
     finally { batchBusyRef.current = false; if (lifetime?.live) setReviewBatchBusy(false) }
   }
 
+  /**
+   * 批量失败提示：Host 原文优先，只有拿不到原因时才按计数兜底。
+   * @author ddj 2026年11月3号
+   * @param result actMany 的结果
+   * @returns 提示文案；没有失败返回 null
+   */
+  const batchError = (result) => {
+    if (!result.error) return batchFailText(result)
+    // 会话没在当前端激活：写类 RPC 一律被 requireSession 拒绝（冷读列表却正常），
+    // 只把「会话不存在」原文丢给用户会像新故障，这里改说清「没执行、记录没动、怎么恢复」。
+    if (isSessionMissingError(result.error)) return '这个会话没在当前端激活，Keep/Undo 没有执行（记录未改动）；在会话里发一条消息激活后重试'
+    return result.error
+  }
+
+  /**
+   * 批量结果没有 Host 原文时的计数兜底文案。
+   * @author ddj 2026年11月3号
+   * @param result actMany 的结果
+   * @returns 提示文案；没有失败返回 null
+   */
+  const batchFailText = (result) => {
+    if (!result.fail) return null
+    return result.stale
+      ? `${result.fail} 处未处理（其中 ${result.stale} 处已不在文件中，只更新了记录），可刷新后重试`
+      : `${result.fail} 处未处理，可刷新后重试`
+  }
+
   const acceptFile = () => {
     if (missingNow && !officialDetail) return decideMissing(false)
     if (officialDetail) return decideOfficial(false)
@@ -3479,8 +3526,11 @@ export function EditorView(props) {
       batchBusyRef.current = false
       reloadFile(true)
       emitRefresh({ scope, paths: active ? [active] : undefined, kind: 'structure' })
-      setStatus(decideStatus('已采纳 ', result))
-      if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
+      // 能走到这里的都是「历史改动」通道：Keep 只把记录标成已看过，不写盘，
+      // 用「已采纳」会让人以为文件被改过，这里必须换成准确措辞
+      setStatus(result.ok ? `${SIDECAR_KEEP_DONE}（${result.ok} 处）` : decideStatus('已采纳 ', result))
+      const message = batchError(result)
+      if (message) setError(message)
     }).catch(() => { batchBusyRef.current = false })
   }
   const undoFile = () => {
@@ -3493,7 +3543,8 @@ export function EditorView(props) {
       reloadFile(true)
       emitRefresh({ scope, paths: active ? [active] : undefined, kind: 'structure' })
       setStatus(decideStatus('已不采纳 ', result))
-      if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
+      const message = batchError(result)
+      if (message) setError(message)
     }).catch(() => { batchBusyRef.current = false })
   }
 
@@ -3501,7 +3552,7 @@ export function EditorView(props) {
   const allPending = React.useMemo(() => {
     const out = []
     for (const rec of Object.values(records)) {
-      if (rec.superseded === true || officialPath(rec.path, review.page)) continue
+      if (rec.superseded === true || coveredPaths.has(diffPathKey(rec.path))) continue
       const perHunk = Array.isArray(rec.decisions?.perHunk) ? rec.decisions.perHunk : []
       const hunks = Array.isArray(rec.hunks) ? rec.hunks : []
       for (let i = 0; i < hunks.length; i++) {
@@ -3555,7 +3606,8 @@ export function EditorView(props) {
       if (reject || !missingNow) reloadFile(true)
       emitRefresh({ scope, paths, kind: 'structure' })
       setStatus(decideStatus(reject ? '已不采纳 ' : '已采纳 ', result) + `；删除文件 ${handled.size} 个`)
-      if (result.fail) setError(result.fail + ' 处差异处理失败，可刷新后重试')
+      const message = batchError(result)
+      if (message) setError(message)
     } catch (cause) { if (lifetime?.live) setError(String(cause)) }
     finally { batchBusyRef.current = false; if (lifetime?.live) refreshRecords() }
   }
@@ -3592,6 +3644,68 @@ export function EditorView(props) {
     return false
   }
 
+  /** @private @author ddj 2026年11月03号 @description 批量通道的一次性完整快照（分页口径的 pending 只是页内计数）。 @returns 完整待审页 */
+  async function batchSnapshot() {
+    const res = await rpc('edrv.review.list', { sessionId, all: true })
+    if (!res.ok) throw new Error(res.error)
+    return res.page
+  }
+
+  /** @private @author ddj 2026年11月03号 @param token 起批时的会话寿命 @returns 逐条 Undo 的精确部分完成（冲突处停止） */
+  function undoAllBatch(token) {
+    return runReviewBatch({
+      snapshot: batchSnapshot,
+      detail: async (id) => { const res = await rpc('edrv.review.detail', { sessionId, id }); if (!res.ok) throw new Error(res.error); return res.detail },
+      decide: (detail, undo, operationId) => rpc('edrv.review.decide', { sessionId, id: detail.item.id, seq: detail.item.seq, revision: detail.item.revision, operationId, scope: 'file', decision: undo ? 'rejected' : 'accepted' }),
+      guard: () => guardReviewAll(true, token), operation: batchOperation,
+    }, true)
+  }
+
+  /** @private @author ddj 2026年11月03号 @param token 起批时的会话寿命 @returns 一次 RPC 的批量 Keep 结果（跳过项不算失败） */
+  function keepAllBatch(token) {
+    return runKeepAll({
+      snapshot: batchSnapshot,
+      keepAll: (items, batchId) => rpc('edrv.review.keepAll', { sessionId, batchId, items }),
+      guard: () => guardReviewAll(false, token),
+    })
+  }
+
+  /**
+   * @private
+   * @author ddj 2026年11月03号
+   * @description: 批量结果落界面：刷新列表、状态栏计数；Keep 的跳过只做提示不当错误，
+   * Undo 保持「遇冲突停止」口径。
+   * @param result 批量结果
+   * @param reject 本次是 Undo 还是 Keep
+   * @param undoPath 起批时的活动文件
+   * @param undoModel 起批时的编辑器模型
+   * @param undoVersion 起批时的模型版本
+   * @returns 官方段是否完全成功（legacy 通道是否继续）
+   */
+  function finishReviewAll(result, reject, undoPath, undoModel, undoVersion) {
+    refreshReview(sessionId)
+    if (result.paths.length) emitRefresh({ scope, paths: result.paths, kind: 'structure' })
+    if (reject) {
+      if (result.paths.some((path) => sameFile(path, undoPath)) && activeRef.current === undoPath
+        && !dirtyRef.current[undoPath] && !savingRef.current.has(undoPath) && undoModel?.getVersionId?.() === undoVersion) reloadFile(true)
+      setStatus(`Undo All：官方记录已完成 ${result.completed} / ${result.total}`)
+      if (result.error) setError(`批量已停止，已完成 ${result.completed} 项，其余未处理。${result.error}`)
+      return !result.error
+    }
+
+    const skipped = result.skipped ?? []
+    setStatus(`Keep All：已保留 ${result.completed} / ${result.total}` + (skipped.length ? `，跳过 ${skipped.length} 条` : ''))
+    if (result.error) setError(`Keep All 未全部完成：${result.error}`)
+    if (skipped.length) toastDom(skippedTip(skipped))
+    return !result.error
+  }
+
+  /** @private @author ddj 2026年11月03号 @param skipped 被跳过的条目 @returns 最多 3 条、余量汇总的提示文案 */
+  function skippedTip(skipped) {
+    const head = skipped.slice(0, 3).map((item) => `${item.display}：${item.reason}`).join('；')
+    return skipped.length > 3 ? `${head}；等 ${skipped.length} 条` : head
+  }
+
   /** @private @author ddj 2026年10月27号 @param reject Undo or Keep all workspace pending records, including previous rounds. @returns Explicit partial results; legacy proceeds only when official stage fully succeeds. */
   async function actReviewAll(reject) {
     if (batchBusyRef.current) return
@@ -3604,23 +3718,9 @@ export function EditorView(props) {
     batchBusyRef.current = true; setReviewBatchBusy(true)
     setStatus(reject ? '正在检查并 Undo 全部待审记录…' : '正在 Keep 全部待审记录…')
     try {
-      const result = await runReviewBatch({
-        snapshot: async () => {
-          const res = await rpc('edrv.review.list', { sessionId, all: true })
-          if (!res.ok) throw new Error(res.error)
-          return res.page
-        },
-        detail: async (id) => { const res = await rpc('edrv.review.detail', { sessionId, id }); if (!res.ok) throw new Error(res.error); return res.detail },
-        decide: (detail, undo, operationId) => rpc('edrv.review.decide', { sessionId, id: detail.item.id, seq: detail.item.seq, revision: detail.item.revision, operationId, scope: 'file', decision: undo ? 'rejected' : 'accepted' }),
-        guard: () => guardReviewAll(reject, token), operation: batchOperation,
-      }, reject)
+      const result = reject ? await undoAllBatch(token) : await keepAllBatch(token)
       if (!token?.live) return
-      refreshReview(sessionId)
-      if (reject && result.paths.some((path) => sameFile(path, undoPath)) && activeRef.current === undoPath
-        && !dirtyRef.current[undoPath] && !savingRef.current.has(undoPath) && undoModel?.getVersionId?.() === undoVersion) reloadFile(true)
-      if (result.paths.length) emitRefresh({ scope, paths: result.paths, kind: 'structure' })
-      setStatus(`${reject ? 'Undo All' : 'Keep All'}：官方记录已完成 ${result.completed} / ${result.total}`)
-      if (result.error) { setError(`批量已停止，已完成 ${result.completed} 项，其余未处理。${result.error}`); return }
+      if (!finishReviewAll(result, reject, undoPath, undoModel, undoVersion)) return
       guardReviewAll(reject, token)
       // Official-owned paths are excluded from allPending; never run legacy writes for official history.
       if (allPending.length) { batchBusyRef.current = false; await actAllPending(reject) }
@@ -4020,6 +4120,8 @@ export function EditorView(props) {
   }
   const tabMenuActions = (path) => ({
     'add-to-conversation': () => addRefToChat(path),
+    'forge-open': () => props.forge?.open(sessionId),
+    'forge-local': () => props.forge?.open(sessionId, true),
     'split-left': () => splitTab(path, 'left'),
     'split-right': () => splitTab(path, 'right'),
     'split-top': () => splitTab(path, 'top'),
@@ -4056,6 +4158,7 @@ export function EditorView(props) {
       cwd,
       hasSession: Boolean(sessionId),
       canAddToConversation: Boolean(addToConversation),
+      forgeReady: props.forge?.available() === true,
       canSplit: workbench.groups.length < GROUP_LIMIT && !workbench.floats.some((item) => item.group === ownerOf(workbench, tabMenu.path)?.id),
       canFloat: workbench.groups.length < GROUP_LIMIT,
       canReturn: ownerOf(workbench, tabMenu.path)?.id !== MAIN_GROUP,
@@ -4354,6 +4457,25 @@ export function EditorView(props) {
   function consumeDrag() { return dragRef.current?.consumeClick() ?? false }
   /** @private @author ddj 2026年10月14号 @param path File. @param event Context trigger. */
   function paneMenu(path, event) { setTabMenu({ path, x: event.clientX, y: event.clientY }) }
+  const menuOwner = React.useRef({ sessionId, scope, alive: true })
+  menuOwner.current.sessionId = sessionId
+  menuOwner.current.scope = scope
+  const menuValid = React.useRef(null)
+  React.useEffect(() => {
+    menuOwner.current.alive = props.visible !== false
+    return () => { menuOwner.current.alive = false; if (menuValid.current) props.officialMenus?.invalidate(menuValid.current) }
+  }, [sessionId, scope, props.visible, props.officialMenus])
+  React.useEffect(() => {
+    if (!tabMenu || !props.officialMenus || !sessionId) return
+    const capturedSession = sessionId
+    const capturedScope = scope
+    const path = tabMenu.path
+    const groupId = ownerOf(benchRef.current, path)?.id
+    const valid = () => menuOwner.current.alive && menuOwner.current.sessionId === capturedSession && menuOwner.current.scope === capturedScope && ownerOf(benchRef.current, path)?.id === groupId && tabsRef.current.some((tab) => tab.path === path)
+    menuValid.current = valid
+    const items = tabMenuEntries().map((entry) => ({ ...entry, run: entry.onClick ?? (() => {}) }))
+    if (props.officialMenus.open('tab', sessionId, path, { x: tabMenu.x, y: tabMenu.y }, items, valid)) setTabMenu(null)
+  }, [tabMenu, props.officialMenus, sessionId, scope])
   /** @private @author ddj 2026年10月14号 @param group Auxiliary group. Return documents rather than closing them. */
   function returnPane(group) { acceptLayout(returnGroup(benchRef.current, group)) }
   /** @private @author ddj 2026年10月14号 @param group Float id. @param rect Viewport-safe bounds. */
@@ -4959,6 +5081,9 @@ export function EditorView(props) {
     editor: () => editorRef.current,
     outlineSources: props.outlineSources,
     fileMenuItems: props.fileMenuItems,
+    officialMenus: props.officialMenus,
+    visible: props.visible,
+    forge: props.forge,
     addToConversation,
     svn: svnStatus,
     // SVN 变更：面板列表 + 文件树徽标查表（客户端合成，不改 listDir 契约）

package/src/client/ui/OfficialSideTab.ts

@@ -11,7 +11,7 @@ import React from 'react'
 import { pickSessionScope } from '../sessionScope.js'
 import { EditorView } from './EditorView.js'
 import { setSideEditorMounted } from '../sidebarBridge.js'
-import { editorMountEpoch, markEditorActive, markEditorMounted, parseOfficialFileAddress, resolveNavLine, resolveNavOpen } from '../officialSidebar.js'
+import { editorMountEpoch, markEditorActive, markEditorMounted, parseOfficialFileAddress, resolveNavLine, resolveNavColumn, resolveNavOpen } from '../officialSidebar.js'
 
 /**
  * 官方侧边栏 Tab 正文组件（keyed slot sidebar.right.pane.tab 装配）。
@@ -22,10 +22,14 @@ export function OfficialSideTab(props) {
   const sessionId = props?.sessionId
   const useTabInfo = props?.useTabInfo
   let navigation
+  let tab
+  let visible = true
   // useTabInfo 是 slot 框架按组件实例生成的 hook，须在组件顶层无条件调用
   if (typeof useTabInfo === 'function') {
     try {
-      navigation = useTabInfo()?.tab?.navigation
+      tab = useTabInfo()?.tab
+      navigation = tab?.navigation
+      visible = tab?.visible !== false
     } catch {
       navigation = undefined
     }
@@ -67,16 +71,16 @@ export function OfficialSideTab(props) {
     // file 资源 Tab：地址即文件（解码出真实路径，透传 params.line 行号定位）
     const fileHit = parseOfficialFileAddress(navigation?.address)
     if (fileHit) {
-      const line = navigation?.params?.line
+      const line = resolveNavLine(navigation?.params)
       window.dispatchEvent(new CustomEvent('edrv:open-editor', {
-        detail: { path: fileHit.path, line: typeof line === 'number' ? line : undefined, preview: navigation?.params?.preview },
+        detail: { sessionId, ownerId: tab?.id, path: fileHit.path, line, column: resolveNavColumn(navigation?.params), preview: navigation?.params?.preview },
       }))
       return
     }
     // 页类型 Tab：params 携带打开请求（line = 行引用/工具行跳转的行号定位）
     const request = resolveNavOpen(navigation?.params)
     window.dispatchEvent(new CustomEvent('edrv:open-editor', {
-      detail: { path: request.path, focusDiff: request.focusDiff, line: resolveNavLine(navigation?.params), preview: navigation?.params?.preview },
+      detail: { sessionId, ownerId: tab?.id, path: request.path, focusDiff: request.focusDiff, line: resolveNavLine(navigation?.params), column: resolveNavColumn(navigation?.params), preview: navigation?.params?.preview },
     }))
   })
 
@@ -84,11 +88,15 @@ export function OfficialSideTab(props) {
     key: sessionId,
     sessionId,
     layout: 'side',
+    visible,
+    ownerId: tab?.id,
     schedule: props?.schedule,
     addToConversation: props?.addToConversation,
     sidebarPanels: props?.sidebarPanels,
     outlineSources: props?.outlineSources,
     fileMenuItems: props?.fileMenuItems,
+    officialMenus: props?.officialMenus,
+    forge: props?.forge,
     fileOpeners: props?.fileOpeners,
     sessions: props?.sessions,
   })

package/src/client/ui/ReviewAllConfirm.ts

@@ -19,7 +19,7 @@ export function ReviewAllConfirm(props: ReviewAllProps): React.ReactElement {
   const action = props.reject ? 'Undo All' : 'Keep All'
   const warning = props.reject
     ? '撤销会改写磁盘；逐项安全校验，遇到冲突停止，已完成项不会自动恢复。'
-    : '只标记待审修改为保留，不改写文件。'
+    : '只标记待审修改为保留，不改写文件；个别条目若已变化或需在活跃端判定会被跳过并留在列表里，可逐个处理。'
   const footer = React.createElement(React.Fragment, null,
     React.createElement(Button, { variant: 'ghost', onClick: props.onCancel, autoFocus: true }, '取消'),
     React.createElement(Button, { variant: 'primary', onClick: props.onConfirm }, '确认 ' + action))

package/src/index.ts

@@ -76,7 +76,7 @@ function attachRuntime(ctx: Ctx, runtime: Runtime): void {
   const stopCapture = installCapture(ctx, (cwd, snapshot) => { evidence.persist(cwd, snapshot); return true })
   // 待审累计基线：只有写后内容确实变化才落库，异常一律不打断用户工具调用
   const pending = installPending(ctx, (write) => {
-    try { trackPendingCover(write.cwd, write.path, true) } catch { /* 内存登记失败不阻断采集 */ }
+    try { trackPendingCover(write.cwd, write.path, true, write.sessionId) } catch { /* 内存登记失败不阻断采集 */ }
     try { recordWrite(write) } catch (error) { log.warn('待审差异落库失败：' + String(error)) }
   })
   /** @author ddj 2026年09月28号 @param exec Tool execution. @param result Tool result. */