dsh-vscode-mode 0.23.1 → 0.23.3

package/package.json

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

@@ -1,6 +1,30 @@
 import type { MissingReview } from '../shared/types.js'
 import { splitLines } from '../shared/diff.js'
 
+/** 缺失文件终态：文件已在磁盘删除，且没有可展示的整文件预览。 */
+export interface GoneState {
+  title: string
+  message: string
+  /** 该文件还有官方待审改动：Keep 可在差异栏结案，Undo 不可用。 */
+  official: boolean
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月31号
+ * @description: 把 missingReview 的失败归并成「文件已删除」终态。只有确认删除的拒绝码才是终态；
+ * 会话缺失、权限、文件重新出现等失败返回 null，调用方继续走通用加载失败（可重试、保留跨端提示）。
+ * @param failure RPC 失败结果（error 必填，code 可选）
+ * @returns 终态信息或 null
+ */
+export function goneStateOf(failure: { error?: unknown; code?: unknown } | null | undefined): GoneState | null {
+  const code = failure?.code
+  const official = code === 'official-covered'
+  if (!official && code !== 'official-decided' && code !== 'no-records' && code !== 'no-evidence' && code !== 'too-large') return null
+  const message = String(failure?.error ?? '文件已在磁盘删除').replace(/^Error:\s*/, '')
+  return { title: official ? '文件已在磁盘删除 · 有官方待审改动' : '文件已在磁盘删除', message, official }
+}
+
 /** @public @author ddj 2026年10月28号 @param review Frozen complete snapshot. @returns One whole-file deletion, including empty files; no invented current lines. */
 export function missingRegion(review: MissingReview) {
   return {

package/src/client/reviewBatch.ts

@@ -1,5 +1,6 @@
 /** Official bulk decisions use persisted metadata, never the visible history page. @author ddj 2026年10月27号 */
 import type { ReviewDetail, ReviewItem, ReviewPage, ReviewResult } from '../shared/review.js'
+import { PENDING_PREFIX } from '../shared/pendingReview.js'
 
 export interface BatchPort {
   snapshot: () => Promise<ReviewPage>
@@ -41,6 +42,10 @@ export async function runReviewBatch(port: BatchPort, reject: boolean): Promise<
     for (const item of items) {
       port.guard()
       const detail = await port.detail(item.id)
+      // 待审条目判定要在会话活跃的一端做：冷端能力位已关闭，这里给出比「版本变化」更准确的原因
+      if (detail.capability.live === false && item.id.startsWith(PENDING_PREFIX)) {
+        throw new Error(`${item.display}：待审条目需要在会话活跃的一端判定，请先在那一端处理或在本端打开该会话`)
+      }
       if (!detail.item.current || detail.item.seq !== item.seq || detail.item.revision !== item.revision
         || !detail.capability.keep) throw new Error(`${item.display}：审查版本变化，请刷新后重试`)
       if (reject && !detail.capability.undo) throw new Error(`${item.display}：${detail.capability.reason}`)

package/src/client/ui/EditorView.ts

@@ -62,7 +62,7 @@ import { applyOfficial, editorFont, registerThemes, themeNameOf } from '../monac
 import { createDiffRenderer } from '../monaco/diffRender.js'
 import { ST, callIdAttr, noopHunk, summarize } from '../state/records.js'
 import { diffRegions } from '../state/regions.js'
-import { missingBatch, missingRegion } from '../missingReview.js'
+import { goneStateOf, missingBatch, missingRegion } from '../missingReview.js'
 import { QuickOpen } from './QuickOpen.js'
 import { attachHorizontalWheel } from './horizontalWheel.js'
 import { CommandPalette } from './CommandPalette.js'
@@ -343,6 +343,11 @@ export function EditorView(props) {
   const aiStatusTimer = React.useRef(null)
   const [error, setError] = React.useState(null)
   const [loadError, setLoadError] = React.useState(null)
+  // 缺失文件的终态：{ path, sessionId, title, message, official }。
+  // 与 loadError 区分开——加载失败可以重试，磁盘删除是终态，不能一直卡在进度条 0%。
+  const [goneFile, setGoneFile] = React.useState(null)
+  const missingReadRef = React.useRef(new Map()) // path → 已重读次数（防 文件缺失↔重现 抖动死循环）
+  const goneNow = goneFile && goneFile.path === active && goneFile.sessionId === sessionId ? goneFile : null
   const [largeCandidate, setLargeCandidate] = React.useState(null)
   const [pagedFile, setPagedFile] = React.useState(null)
   const [pageChanged, setPageChanged] = React.useState(null)
@@ -569,6 +574,8 @@ export function EditorView(props) {
   }, [records, active, cwd, review.page])
 
   const reviewOpsRef = React.useRef(new Map())
+  // 已自动结案的记录 id：防止「改动已不在文件中」的记录在刷新期间被反复提交判定
+  const settledRef = React.useRef(new Set())
   const [officialDetail, setOfficialDetail] = React.useState(null)
   const [officialRecords, setOfficialRecords] = React.useState([])
   const [selectedReview, setSelectedReview] = React.useState(null)
@@ -588,6 +595,9 @@ export function EditorView(props) {
       .find((path) => sameFile(path, active))
     const coveredPath = review.page?.overview?.coveredPaths.find((path) => sameFile(path, active))
     const reviewPath = coveredPath ?? pendingPath
+    dbg(sessionId, `[DEBUG reviewPath] active=${active ?? '(null)'} covered=${coveredPath ?? '(none)'}`
+      + ` pending=${pendingPath ?? '(none)'} coveredCount=${review.page?.overview?.coveredPaths.length ?? -1}`
+      + ` items=${review.page?.items?.length ?? -1} overview=${review.page?.overview ? 1 : 0}`)
     if (!active || !reviewPath) {
       setOfficialDetail(null)
       setOfficialRecords([])
@@ -601,9 +611,15 @@ export function EditorView(props) {
         if (controller.signal.aborted) return
         if (!page.ok) throw new Error(page.error)
         const selected = page.page.items.find((item) => item.id === selectedReview) ?? page.page.items[0]
+        dbg(sessionId, `[DEBUG reviewList] path=${reviewPath} items=${page.page.items.length}`
+          + ` waiting=${page.page.pending} selected=${selected?.id ?? '(none)'}`)
         if (!selected) { setOfficialRecords([]); setOfficialDetail(null); return }
         const result = await rpc('edrv.review.detail', { sessionId, id: selected.id }, controller.signal)
         if (controller.signal.aborted) return
+        dbg(sessionId, `[DEBUG reviewDetail] id=${selected.id} ok=${result.ok ? 1 : 0}`
+          + ` keep=${result.ok ? (result.detail.capability?.keep === true ? 1 : 0) : '-'}`
+          + ` live=${result.ok ? String(result.detail.capability?.live) : '-'}`
+          + ` err=${result.ok ? '' : String(result.error).slice(0, 120)}`)
         if (!result.ok) throw new Error(result.error)
         setOfficialRecords((previous) => JSON.stringify(previous) === JSON.stringify(page.page.items) ? previous : page.page.items)
         setOfficialDetail((previous) => JSON.stringify(previous) === JSON.stringify(result.detail) ? previous : result.detail)
@@ -672,6 +688,15 @@ export function EditorView(props) {
   const noBlocks = !!officialDetail && (officialDetail.diff.kind !== 'text' || officialDetail.diff.hunks.length === 0)
   // 单文件 Keep/Undo 的作用域：可定位差异 + 无法定位的冲突差异（后者否则永久留在待处理列表）
   const decideRegions = React.useMemo(() => [...pendingRegions, ...staleRegions], [pendingRegions, staleRegions])
+  // 记录的改动已全部不在当前文件中时没有可见差异可审：自动结案，不再让「改动已失效」占用差异栏。
+  React.useEffect(() => {
+    if (!officialDetail || contentReady !== true || batchBusyRef.current) return
+    if (pendingRegions.length > 0 || staleRegions.length === 0) return
+    if (noBlocks || officialDetail.capability?.keep !== true) return
+    if (dirtyRef.current[active]) return
+
+    void settleInvisibleRecord(officialDetail)
+  }, [officialDetail, contentReady, pendingRegions, staleRegions, noBlocks, active])
   hoverRegionsRef.current = pendingRegions
   // 行 → 差异区域 映射（hover O(1) 命中；每行归属其区域）
   const lineRegionMap = React.useMemo(() => {
@@ -1153,17 +1178,49 @@ export function EditorView(props) {
    * @param force 强制走 RPC（reloadFile 用，跳过 model 复用）
    * @param version 已知磁盘版本（缺省走 RPC 返回值）
    */
-  /** @private @author ddj 2026年10月28号 @param path Missing text file. @param sid Owning session. @param seq Loader generation. @sideEffects Loads deletion evidence without creating or saving the file. */
+  /**
+   * 把「文件已在磁盘删除」记成终态面板：不占进度条、不反复重试，并允许直接关闭页签。
+   * 只有确认删除的原因才走终态；会话/权限类失败仍回退通用加载失败，保留跨端提示。
+   * @private @author ddj 2026年10月31号
+   * @param path 目标文件
+   * @param sid 会话 id
+   * @param seq 加载序号（过期响应丢弃）
+   * @param failure 宿主拒绝原因（可带稳定 code）
+   */
+  function settleGone(path, sid, seq, failure) {
+    if (!loadCurrent(path, seq)) return
+    const error = failure && typeof failure === 'object' ? failure : { error: failure }
+    const gone = goneStateOf(error)
+      ?? (error.deleted === true ? { title: '文件已在磁盘删除', official: false, message: String(error.error ?? '') } : null)
+    if (!gone) { failLoad(path, sid, seq, String(error.error ?? error)); return }
+    stampLoad(path, sid, seq, gone.message)
+    setLoadError(null)
+    setError(null)
+    setGoneFile({ ...gone, path, sessionId: sid })
+    setStatus(gone.official ? '文件已删除 · 差异栏可 Keep 结案' : '文件已删除')
+  }
+
+  /** @private @author ddj 2026年10月28号 / 2026年10月31号 @param path Missing text file. @param sid Owning session. @param seq Loader generation. @sideEffects Loads deletion evidence without creating or saving the file. */
   async function loadMissing(path, sid, seq) {
     try {
       const result = await rpc('edrv.missingReview', { sessionId: sid, path })
       if (!loadCurrent(path, seq)) return
-      if (!result.ok) { failLoad(path, sid, seq, result.error); return }
-      if (!result.review) { loadContent(path, sid, true); return }
+      if (!result.ok) { settleGone(path, sid, seq, result); return }
+      if (!result.review) {
+        // 宿主观测到文件仍在磁盘（与读取时的 file-missing 竞态）：重读一次即可；
+        // 同一文件反复抖动时收尾为终态，绝不再递归重读。
+        const attempts = (missingReadRef.current.get(path) ?? 0) + 1
+        missingReadRef.current.set(path, attempts)
+        if (attempts <= 2) { loadContent(path, sid, true); return }
+        settleGone(path, sid, seq, { deleted: true, error: '文件状态在磁盘上反复变化，请稍后重试，或关闭该标签页' })
+        return
+      }
+      missingReadRef.current.delete(path)
       if (dirtyRef.current[path] || savingRef.current.has(path)) { failLoad(path, sid, seq, '文件已删除，但有未保存编辑；请先处理本地缓冲'); return }
       const preview = { ...result.review, sessionId: sid, keepId: crypto.randomUUID(), undoId: crypto.randomUUID() }
       missingRef.current.set(path, preview)
       setMissingPreview(preview)
+      setGoneFile(null)
       setContent('')
       setContentPath(path)
       setLoadError(null)
@@ -1178,6 +1235,7 @@ export function EditorView(props) {
     const seq = ++loadSeqRef.current
     setReceiptLoad({ path, cwd, sessionId: sid, sequence: seq, status: 'loading' })
     setLoadError(null)
+    setGoneFile(null)
     setLargeCandidate(null)
     setPagedFile(null)
     setPageChanged(null)
@@ -3303,33 +3361,84 @@ export function EditorView(props) {
    */
   const itemOf = (r, reject) => ({ callId: r.callId, scope: r.create ? 'call' : 'hunk', hunkIndex: r.idx, decision: reject ? 'rejected' : 'accepted' })
 
+  /**
+   * @private
+   * @author ddj 2026年10月31号
+   * @description: 提交一条官方记录的判定；operationId 按决策键复用，网络重试保持幂等。
+   * @param detail 目标记录（含冻结的 seq / revision）
+   * @param reject true=Undo
+   * @param blockId 可选的连续块；缺省为整文件
+   * @returns 成功返回提交结果，失败抛出 host 给出的原因
+   */
+  async function submitOfficialDecision(detail, reject, blockId) {
+    const source = detail.item
+    const opKey = JSON.stringify([sessionId, source.id, source.seq, source.revision, blockId, reject])
+    let operationId = reviewOpsRef.current.get(opKey)
+    if (!operationId) { operationId = crypto.randomUUID(); reviewOpsRef.current.set(opKey, operationId) }
+
+    const result = await rpc('edrv.review.decide', { sessionId, id: source.id, seq: source.seq,
+      revision: source.revision, operationId, scope: blockId ? 'hunk' : 'file', blockId,
+      decision: reject ? 'rejected' : 'accepted' })
+    if (!result.ok) throw new Error(result.error)
+
+    reviewOpsRef.current.delete(opKey)
+    return result
+  }
+
+  /**
+   * @private
+   * @author ddj 2026年10月31号
+   * @description: 结案一条改动已不在当前文件中的官方记录：等价于 Keep（只标记已采纳，不改写磁盘）。
+   * 这类记录没有可见差异可审，留在差异栏只会让用户去处理一个不存在的东西。
+   * @param detail 待结案的记录
+   */
+  async function settleInvisibleRecord(detail) {
+    if (batchBusyRef.current) return
+
+    const settled = settledRef.current
+    if (settled.has(detail.item.id)) return
+    settled.add(detail.item.id)
+
+    batchBusyRef.current = true
+    try {
+      await submitOfficialDecision(detail, false)
+      refreshReview(sessionId)
+    } catch (cause) {
+      // 结案失败不打扰用户：记录仍留在待审列表，下次打开该文件再试
+      settled.delete(detail.item.id)
+      dbg(sessionId, `[DEBUG settleInvisible] id=${detail.item.id} err=${String(cause).slice(0, 160)}`)
+    } finally { batchBusyRef.current = false }
+  }
+
   /** @private @author ddj 2026年10月27号 @param reject Undo instead of Keep. @param blockId Optional contiguous block. @returns Persisted decision result; never reloads over a dirty buffer. */
   async function decideOfficial(reject, blockId) {
-    if (!officialDetail || batchBusyRef.current) return false
+    dbg(sessionId, `[DEBUG decideOfficial] reject=${reject ? 1 : 0} detail=${officialDetail ? 1 : 0}`
+      + ` busy=${batchBusyRef.current ? 1 : 0} active=${active ?? '(null)'}`)
+    if (!officialDetail || batchBusyRef.current) {
+      // 详情缺失时按钮仍可点（能力位来自列表数据），必须给可读原因而不是静默返回
+      if (!officialDetail && !batchBusyRef.current) setError('官方差异详情尚未加载完成，请稍后重试；若一直如此，请切换文件或刷新页面。')
+      return false
+    }
     if (reject && (dirtyRef.current[active] || savingRef.current.has(active) || saveTimerRef.current.isPending())) {
       setError('存在未保存或正在保存的修改，请等待完成后重试'); return false
     }
     batchBusyRef.current = true
-    const source = officialDetail.item
+    const detail = officialDetail
     const undoPath = active
     const undoModel = editorRef.current?.getModel?.()
     const undoVersion = undoModel?.getVersionId?.()
-    const opKey = JSON.stringify([sessionId, source.id, source.seq, source.revision, blockId, reject])
-    let operationId = reviewOpsRef.current.get(opKey)
-    if (!operationId) { operationId = crypto.randomUUID(); reviewOpsRef.current.set(opKey, operationId) }
     try {
-      const result = await rpc('edrv.review.decide', { sessionId, id: source.id, seq: source.seq,
-        revision: source.revision, operationId, scope: blockId ? 'hunk' : 'file', blockId,
-        decision: reject ? 'rejected' : 'accepted' })
-      if (!result.ok) throw new Error(result.error)
-      reviewOpsRef.current.delete(opKey)
+      await submitOfficialDecision(detail, reject, blockId)
       if (reject && activeRef.current === undoPath && !dirtyRef.current[undoPath]
         && !savingRef.current.has(undoPath) && undoModel?.getVersionId?.() === undoVersion) reloadFile(true)
       else if (reject) setError('Undo 已完成，编辑器在等待期间变化；未覆盖当前缓冲区，请核对磁盘后刷新')
       refreshReview(sessionId)
       setStatus(reject ? '已 Undo 选中差异' : '已 Keep 选中差异')
       return true
-    } catch (cause) { setError(String(cause)); return false }
+    } catch (cause) {
+      dbg(sessionId, `[DEBUG decideOfficialFail] id=${detail.item.id} reject=${reject ? 1 : 0} err=${String(cause).slice(0, 160)}`)
+      setError(String(cause)); return false
+    }
     finally { batchBusyRef.current = false }
   }
 
@@ -3466,10 +3575,26 @@ export function EditorView(props) {
     return operationId
   }
 
+  /**
+   * @private
+   * @author ddj 2026年10月31号
+   * @description: 批量操作要求官方待审列表已就绪；切换会话后列表还在载入时，
+   * 先触发一次刷新并给出可读提示，而不是直接报错中止（用户看到红色「尚未就绪」会以为功能坏了）。
+   * @param action 面向用户的动作名
+   * @returns 列表已就绪时为 true
+   */
+  function reviewReadyForBatch(action) {
+    if (review.page?.overview) return true
+
+    refreshReview(sessionId)
+    setStatus(`官方待审列表正在载入，载入完成后请再次点击${action}`)
+    return false
+  }
+
   /** @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
-    if (!review.page?.overview) { setError('官方待审列表尚未就绪，未执行批量操作'); return }
+    if (!reviewReadyForBatch(reject ? 'Undo All' : 'Keep All')) return
     if (!sum.pendingFiles.length) return
     const token = reviewLifeRef.current
     const undoPath = activeRef.current
@@ -3504,7 +3629,7 @@ export function EditorView(props) {
   /** @private @author ddj 2026年10月27号 @param reject Whether to undo pending files. @description Open a DSH confirmation without starting any mutations. */
   function askReviewAll(reject) {
     if (batchBusyRef.current || !sum.pendingFiles.length) return
-    if (!review.page?.overview) { setError('官方待审列表尚未就绪，未执行批量操作'); return }
+    if (!reviewReadyForBatch(reject ? 'Undo All' : 'Keep All')) return
     setReviewAllPrompt({ reject, count: sum.pendingFiles.length, token: reviewLifeRef.current })
   }
 
@@ -4581,6 +4706,25 @@ export function EditorView(props) {
     React.createElement('div', { className: 'edrv-loading-percent' }, Math.round(progress) + '%'),
     retry ? React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: retry }, '重试') : null)
 
+  /**
+   * 渲染缺失文件终态面板：说明 + 重试 + 关闭页签（不显示进度条，避免卡在 0%）。
+   * @private @author ddj 2026年10月31号
+   * @param gone 终态信息
+   * @param retry 重新读取回调
+   * @param close 关闭该标签页回调
+   * @returns 终态面板 React 元素
+   */
+  const goneBody = (gone, retry, close) => React.createElement('div', { className: 'edrv-empty edrv-loading', 'aria-live': 'polite', role: 'status' },
+    React.createElement('div', { className: 'edrv-loading-title' }, gone.title),
+    React.createElement('div', { style: { fontSize: 12, maxWidth: 460, lineHeight: 1.6 } }, gone.message),
+    gone.official
+      ? React.createElement('div', { style: { fontSize: 12, maxWidth: 460, lineHeight: 1.6, opacity: 0.8 } },
+        '待审改动在差异栏：Keep 保留删除结果并结案；Undo 需要该文件的原始内容，磁盘已删除时不可用。')
+      : null,
+    React.createElement('div', { style: { display: 'flex', gap: 8 } },
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: retry }, '重试'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: close }, '关闭标签页')))
+
   let body
   if (activePlan) {
     const labels = PLAN_MD_LABELS
@@ -4609,6 +4753,12 @@ export function EditorView(props) {
     body = React.createElement('div', { className: 'edrv-empty' },
       React.createElement('div', null, '暂无打开的文件'),
       React.createElement('div', { style: { fontSize: 12 } }, '使用右上搜索框 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ') 打开工作区文件；' + (chordOf('edrv.showCommands') ?? 'Ctrl+Shift+P') + ' 打开命令栏；agent 修改文件后顶部会出现差异角标'))
+  } else if (goneNow) {
+    // 终态：文件已在磁盘删除且没有可用预览。不再显示 0% 进度条，也不无限重试。
+    body = goneBody(goneNow, () => {
+      missingReadRef.current.delete(goneNow.path)
+      loadContent(active, sessionId, true)
+    }, () => { void closeTab(goneNow.path) })
   } else if (content === null && loadError && isSessionMissingError(loadError)) {
     // 跨端会话缺失：终态提示而非加载失败卡死（会话仅在一端激活，本端 RPC 均被拒）
     body = React.createElement('div', { className: 'edrv-empty edrv-loading', 'aria-live': 'polite' },
@@ -4697,6 +4847,9 @@ export function EditorView(props) {
   const sessionDown = isSessionMissingError(rawReviewError)
   const reviewErrorTone = sessionDown ? 'info' : 'error'
   const reviewErrorText = !rawReviewError ? undefined : sessionDown ? SESSION_DOWN_NOTICE : sessionErrorText(rawReviewError)
+  // 官方元数据未到位且没有报错 = 首次载入中：此时还不知道哪些历史记录会被官方通道接管，
+  // 直接按历史记录报数会在每次重启时闪出几十个「待处理文件」，故先显示占位、批量也先不放开。
+  const reviewLoading = review.page === null && !review.error
   const buildDockSnapshot = () => ({
     mode: editorDockMode(active),
     missingDeletion: !!missingNow,
@@ -4718,7 +4871,7 @@ export function EditorView(props) {
     onUndoFile: undoFile,
     onAcceptAllFiles: acceptAllFiles,
     onUndoAllFiles: undoAllFiles,
-    allPendingCount: allPending.length + (review.page?.pending ?? 0),
+    allPendingCount: reviewLoading ? 0 : allPending.length + (review.page?.pending ?? 0),
     reviewBatchBusy,
     batchUnavailable: !review.page?.overview ? '官方待审列表尚未就绪' : undefined,
     onRollback: rollbackFile,
@@ -4732,7 +4885,7 @@ export function EditorView(props) {
     contentReady,
     diffTotal: displayDiffTotal(contentReady, pendingRegions.length, sum.files.find((file) => sameFile(file.path, active))?.pending ?? 0),
     fileIdx,
-    fileTotal: sum.pendingFiles.length,
+    fileTotal: reviewLoading ? null : sum.pendingFiles.length,
     onPrevDiff: () => gotoDiff(-1),
     onNextDiff: () => gotoDiff(1),
     onPrevFile: () => gotoFile(-1),

package/src/client/ui/OfficialDiffBar.tsx

@@ -15,7 +15,8 @@ export interface OfficialBarProps {
   diffIdx?: number
   /** 编辑器内容是否就绪；未就绪时不得断言差异失效 */
   contentReady?: boolean
-  fileTotal?: number
+  /** 待审文件总数；null 表示官方元数据尚未就绪，栏内显示占位 */
+  fileTotal?: number | null
   fileIdx?: number
   allPendingCount?: number
   reviewBatchBusy?: boolean
@@ -51,6 +52,20 @@ export function barIcon(mark: Mark): React.ReactElement {
   return <svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth={1.5} strokeLinecap="round" strokeLinejoin="round" aria-hidden="true"><path d={marks[mark]} /></svg>
 }
 
+/**
+ * @private
+ * @author ddj 2026年10月31号
+ * @description: Keep 按钮提示。会话不在本端活跃时 Keep 仍可执行（只写共享审查库），
+ * 提示里补一句说明，免得用户把它当成跨端不可用的按钮。
+ * @param hint 差异栏给出的 Keep 说明
+ * @param live 会话是否在本端活跃
+ * @returns 按钮 title 文本
+ */
+function keepTitle(hint: string, live: boolean): string {
+  if (live) return hint
+  return `${hint}（会话在另一端激活：Keep 写入共享审查库，仍可执行）`
+}
+
 /** @public @author ddj 2026年10月27号 @param props Existing review callbacks and immutable record metadata. @returns Responsive review toolbar; no disk or decision side effects until an explicit action. */
 export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
   const { official, pendingRegions = [], staleRegions = [], diffIdx = 0 } = props
@@ -75,7 +90,7 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
 
   return <div className="edrv-diffbar edrv-diffbar-dock edrv-reviewbar" data-edrv-diffbox="1" data-edrv-diff-source="official" role="region" aria-label="文件差异审查">
     <ReviewAllRow
-      total={props.fileTotal ?? 0}
+      total={props.fileTotal ?? null}
       current={(props.fileTotal ?? 0) && (props.fileIdx ?? -1) >= 0 ? (props.fileIdx ?? 0) + 1 : 0}
       busy={props.reviewBatchBusy}
       unavailable={props.batchUnavailable}
@@ -104,7 +119,7 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
       </div>
       <div className="edrv-review-actions">
         <Button size="sm" variant="ghost" className="edrv-review-undo" icon={barIcon('undo')} onClick={props.onUndoFile} disabled={props.reviewBatchBusy || !detail?.capability.undo} title={detail?.capability.reason}>Undo</Button>
-        <Button size="sm" variant="primary" className="edrv-review-keep" icon={barIcon('check')} onClick={props.onAcceptFile} disabled={props.reviewBatchBusy || !detail?.capability.keep} title={detail?.capability.keep ? view.keepHint : detail?.capability.reason}>Keep</Button>
+        <Button size="sm" variant="primary" className="edrv-review-keep" icon={barIcon('check')} onClick={props.onAcceptFile} disabled={props.reviewBatchBusy || !detail?.capability.keep} title={detail?.capability.keep ? keepTitle(view.keepHint, detail.capability.live !== false) : detail?.capability.reason}>Keep</Button>
         <Menu open={menu === 'more'} anchor={moreTrigger} items={[{ id: 'pending', label: '差异总览' }, { id: 'archive', label: '归档 / 历史' }]} onSelect={openOverview} onClose={closeMenu} side="top" align="end" portal compact autoFocus />
       </div>
     </div>

package/src/client/ui/SidecarDiffBar.tsx

@@ -29,7 +29,8 @@ export interface SidecarBarProps {
   /** 编辑器内容是否就绪；未就绪时不得断言差异失效 */
   contentReady?: boolean
   fileIdx?: number
-  fileTotal?: number
+  /** 待审文件总数；null 表示官方元数据尚未就绪，栏内显示占位 */
+  fileTotal?: number | null
   allPendingCount?: number
   reviewBatchBusy?: boolean
   /** 官方元数据通道失败时的可操作提示 */
@@ -86,7 +87,7 @@ export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
 
   return <div className="edrv-diffbar edrv-diffbar-dock edrv-reviewbar" data-edrv-diffbox="1" data-edrv-diff-source="sidecar" role="region" aria-label="文件差异审查">
     <ReviewAllRow
-      total={props.fileTotal ?? 0}
+      total={props.fileTotal ?? null}
       current={(props.fileTotal ?? 0) && (props.fileIdx ?? -1) >= 0 ? (props.fileIdx ?? 0) + 1 : 0}
       busy={busy}
       pending={props.allPendingCount}

package/src/client/ui/reviewAllRow.tsx

@@ -5,8 +5,8 @@ import { Button } from '@deepseek-ai/dsh-client-ui-primitives'
 export interface ReviewAllRowProps {
   /** 当前文件序号（1 基，0 表示未定位） */
   current: number
-  /** 差异文件总数 */
-  total: number
+  /** 差异文件总数；null 表示官方元数据尚未就绪、归属还分不清，显示占位而不报个数 */
+  total: number | null
   /** 批量操作进行中 */
   busy?: boolean
   /** 批量不可用原因（悬浮提示） */
@@ -34,12 +34,13 @@ export interface ReviewAllRowProps {
  * @returns 持久化的全工作区控制条
  */
 export function ReviewAllRow(props: ReviewAllRowProps): React.ReactElement {
-  const total = props.total ?? 0
+  const known = typeof props.total === 'number'
+  const total = known ? props.total as number : 0
   const current = total && props.current > 0 ? props.current : 0
   const disabled = props.busy || !!props.unavailable || !props.pending
 
   return <div className="edrv-review-global" role="group" aria-label="全部待审文件">
-    <Button size="sm" variant="ghost" className="edrv-review-total" onClick={props.onOpen} title="打开当前工作区全部待审差异文件">差异文件 <strong>{current} / {total}</strong></Button>
+    <Button size="sm" variant="ghost" className="edrv-review-total" onClick={props.onOpen} title="打开当前工作区全部待审差异文件">差异文件 <strong>{known ? `${current} / ${total}` : '—'}</strong></Button>
     <span className="edrv-review-all-actions">
       <Button size="sm" variant="ghost" onClick={props.onKeepAll} disabled={disabled || !props.onKeepAll} title={props.unavailable || props.keepTitle || 'Keep 当前工作区全部待审文件'}>Keep All</Button>
       <Button size="sm" variant="ghost" className="edrv-review-undo" onClick={props.onUndoAll} disabled={disabled || !props.onUndoAll} title={props.unavailable || props.undoTitle || 'Undo 当前工作区全部待审文件'}>Undo All</Button>

package/src/missingReview.ts

@@ -2,9 +2,10 @@
 import { createHash, randomUUID } from 'node:crypto'
 import { resolve } from 'node:path'
 import type { DiffRecord, MissingReview } from './shared/types.js'
+import type { MissingRefusal } from './shared/rpc.js'
 import type { Ctx, Session } from './store.js'
 import { archiveRecords, policyOf, READ_CAP, resolveTargetIn, targetPathOf } from './store.js'
-import { hasOfficial } from './reviewDb.js'
+import { hasOfficial, officialPending } from './reviewDb.js'
 import { recordResolved } from './model.js'
 
 interface FrozenReview {
@@ -18,6 +19,32 @@ interface FrozenReview {
 const frozen = new Map<string, FrozenReview>()
 const locks = new Set<string>()
 
+/**
+ * @public
+ * @author ddj 2026年10月31号
+ * @description: 给缺失文件预览的可预期拒绝挂稳定错误码。客户端据此显示终态说明，
+ * 而不是把内部错误原文当「加载失败」反复重试；也不让上游把 SQLite 报错原文透给编辑器。
+ * @param code 稳定错误码（official-covered / no-records / no-evidence / too-large）
+ * @param message 可读原因
+ * @returns 带 code 的 Error
+ */
+export function refusal(code: MissingRefusal, message: string): Error {
+  return Object.assign(new Error(message), { code })
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月31号
+ * @description: 从任意错误里取回缺失文件预览的稳定拒绝码；不是本模块抛出的错误一律返回 undefined。
+ * @param error 捕获到的错误
+ * @returns 稳定拒绝码或 undefined
+ */
+export function refusalCodeOf(error: unknown): MissingRefusal | undefined {
+  const code = (error as { code?: unknown } | null)?.code
+  return code === 'official-covered' || code === 'official-decided' || code === 'no-records'
+    || code === 'no-evidence' || code === 'too-large' ? code : undefined
+}
+
 /** @private @author ddj 2026年10月28号 @param target Resolved absolute path. @returns Platform file identity. */
 function fileKey(target: string): string {
   const normalized = resolve(target).replace(/\\/g, '/')
@@ -67,13 +94,25 @@ export async function missingReview(ctx: Ctx, session: Session, cwd: string, buc
   // 解析结果可能是不透明 FsTarget，凡按路径字符串使用的分支都必须先还原。
   const abs = targetPathOf(ctx, target)
   if (!abs) throw new Error('无法解析目标文件路径')
-  if (hasOfficial(cwd, path) || hasOfficial(cwd, abs)) throw new Error('该文件已有官方审查记录，请使用官方审查入口')
+  // 官方记录覆盖该文件时不再给整文件删除预览：删除内容只能用差异栏的 Keep 结案，
+  // 但必须带稳定错误码，客户端才能显示「已删除」终态而不是卡在加载失败。
+  if (hasOfficial(cwd, path) || hasOfficial(cwd, abs)) {
+    if (!officialPending(cwd, abs) && !officialPending(cwd, path)) {
+      throw refusal('official-decided', '该文件已在磁盘删除，官方审查记录均已处理：可直接关闭该标签页')
+    }
+    throw refusal('official-covered', '该文件已有官方审查记录（磁盘上已删除）：请在差异栏对该待审条目执行 Keep 结案；'
+      + '整文件删除预览只适用于待审历史记录')
+  }
   if (!await fileAbsent(ctx, cwd, abs)) throw new Error('文件已重新出现，请刷新')
   const records = await fileRecords(ctx, cwd, bucket, abs)
   const latest = records.at(-1)
-  if (!records.some((record) => !record.archived && !recordResolved(record))) throw new Error('没有待审历史记录')
-  if (!latest || typeof latest.after !== 'string') throw new Error('缺少可靠的完整历史快照，无法展示或恢复；不会用局部差异拼接文件')
-  if (Buffer.byteLength(latest.after, 'utf8') > READ_CAP) throw new Error('历史快照过大，无法整文件预览')
+  if (!records.some((record) => !record.archived && !recordResolved(record))) {
+    throw refusal('no-records', '磁盘上已没有该文件，且没有待审历史记录：可直接关闭该标签页')
+  }
+  if (!latest || typeof latest.after !== 'string') {
+    throw refusal('no-evidence', '磁盘上已没有该文件，且缺少可靠的完整历史快照，无法展示或恢复；不会用局部差异拼接文件')
+  }
+  if (Buffer.byteLength(latest.after, 'utf8') > READ_CAP) throw refusal('too-large', '磁盘上已没有该文件，且历史快照过大，无法整文件预览')
 
   for (const [token, item] of frozen) if (item.expires < Date.now()) frozen.delete(token)
   if (frozen.size >= 256) throw new Error('缺失文件预览过多，请稍后重试')

package/src/officialCapture.ts

@@ -184,6 +184,11 @@ export function installCapture(ctx: Ctx, onSnapshot?: (cwd: string, snapshot: Re
       log.warn('官方历史补采不可用：缺少 sessionQuery；后续实时事件仍会采集')
       return
     }
+    const source = ctx.get('workspaceChanges')
+    if (!source?.summary) {
+      log.warn('官方历史补采不可用：缺少 workspaceChanges；后续实时事件仍会采集')
+      return
+    }
     try {
       // Repair durable history independently: official summaries do not survive Host restart.
       // Each saved snapshot resolves against its own cwd, not the current session directory.
@@ -193,11 +198,17 @@ export function installCapture(ctx: Ctx, onSnapshot?: (cwd: string, snapshot: Re
       }
       // Semantic search omits structural events; only the raw metadata list contains workspace/changes.
       const events = await query.listEvents(session.id)
+      let expired = 0
       for (const event of events) {
         if (event.type !== 'workspace/changes' || event.seq < (session.inheritedEventCount ?? 0)) continue
+        // Official summaries live only in Host memory, so a restart makes every
+        // historical event unreadable. Probe before enqueue: queueing them records
+        // one durable gap per turn that can never be repaired or replayed.
+        if (!source.summary(session.id, event.seq)) { expired += 1; continue }
         const window = await query.readEvent({ sessionId: session.id, seq: event.seq })
         collector.enqueue(session, window.target)
       }
+      if (expired) log.info(`官方历史补采跳过 ${expired} 轮已失效事件：官方 summary 不跨宿主重启保留，实时事件照常采集`)
     } catch (error) { log.warn('官方历史补采失败：' + String(error)) }
   }
 }

package/src/reviewDb.ts

@@ -205,6 +205,29 @@ export function reviewPage(cwd: string, cursor = 0, history = false, path?: stri
 
 }
 
+/**
+ * @public
+ * @author ddj 2026年10月31号
+ * @description: 该文件是否还有未处理的官方待审改动。缺失文件预览据此区分「需要去差异栏 Keep 结案」
+ * 与「记录都已处理、可直接关闭标签页」，避免已结案的删除文件继续提示待审。
+ * @param cwd Migrated workspace
+ * @param path Host path of the file
+ * @returns 存在未决官方记录时为 true
+ */
+export function officialPending(cwd: string, path: string): boolean {
+  if (typeof path !== 'string') return false
+  const db = dbFor(cwd)
+  if (!db.prepare("SELECT 1 FROM sqlite_master WHERE name='review_files' AND type='table'").get()) return false
+  // Windows 盘符路径按「反斜杠折成正斜杠 + 折大小写」比较（与 hasOfficial 的 SQL 归一化等价）；
+  // 其余平台按身份精确比较，别把大小写不同的两个文件当成同一个。
+  if (path.length > 1 && path[1] === ':') {
+    const folded = path.split(String.fromCharCode(92)).join('/').toLowerCase()
+    return !!db.prepare("SELECT 1 FROM review_files WHERE current=1 AND decision='pending'"
+      + " AND lower(replace(identity,char(92),'/'))=? LIMIT 1").get(folded)
+  }
+  return !!db.prepare("SELECT 1 FROM review_files WHERE current=1 AND decision='pending' AND identity=? LIMIT 1").get(path)
+}
+
 /** @public @author ddj 2026年10月26号 @param cwd Migrated workspace. @param path Legacy write target. @returns Whether any official version owns the file, including decided history. */
 export function hasOfficial(cwd: string, path: string): boolean {
   // 防御：解析结果若被误当成路径传进来（不透明对象），按「无官方记录」处理，