dsh-vscode-mode 0.20.0 → 0.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "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/monaco/diffRender.ts

@@ -5,7 +5,7 @@ import { detectColorScheme, officialThemeOf, themeNameOf } from './theme.js'
 // #region 显示数据
 /** @private @author ddj 2026年10月09号 @param regions 待显示区域 @returns 内容敏感且无分隔符碰撞的展示键 */
 function renderKey(regions) {
-  return JSON.stringify(regions.map((r) => [r.callId, r.idx, r.start, r.end, r.oldStart, r.create, r.oldLines, r.newLines]))
+  return JSON.stringify(regions.map((r) => [r.recordId ?? r.callId, r.id ?? r.idx, r.start, r.end, r.oldStart, r.create, r.oldLines, r.newLines]))
 }
 
 /** @private @author ddj 2026年10月09号 @param node 接收样式的节点 @param colors Monaco 颜色 @returns 设置插件局部变量；不覆盖官方令牌 */
@@ -48,7 +48,7 @@ function marginRow(line) {
 function zoneOf(region) {
   const domNode = document.createElement('div')
   domNode.className = 'edrv-del-zone'
-  domNode.dataset.edrvHunk = String(region.callId) + ':' + region.idx
+  domNode.dataset.edrvHunk = String(region.recordId ?? region.callId) + ':' + (region.id ?? region.idx)
   const marginDomNode = document.createElement('div')
   marginDomNode.className = 'edrv-del-margin'
   const rows = []

package/src/client/reviewBatch.ts

@@ -0,0 +1,64 @@
+/** 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'
+
+export interface BatchPort {
+  list: (cursor?: number) => Promise<ReviewPage>
+  detail: (id: string) => Promise<ReviewDetail>
+  decide: (detail: ReviewDetail, reject: boolean, operationId: string) => Promise<ReviewResult<{ revision: number }>>
+  guard: () => void
+  operation: (detail: ReviewDetail, reject: boolean) => string
+}
+export interface BatchResult { completed: number; total: number; paths: string[]; error: string }
+
+/** @public @author ddj 2026年10月27号 @param port Authenticated RPC adapter. @returns Frozen complete pending set; aborts before any decision if pagination shifts. @throws Incomplete or changing pages. */
+export async function loadPending(port: Pick<BatchPort, 'list'>): Promise<ReviewItem[]> {
+  const items: ReviewItem[] = []
+  const seen = new Set<string>()
+  const cursors = new Set<number>()
+  let cursor: number | undefined
+  let expected: number | undefined
+  do {
+    const page = await port.list(cursor)
+    expected ??= page.pending
+    if (page.pending !== expected) throw new Error('待审记录在分页期间变化，请刷新后重试')
+    for (const item of page.items) {
+      if (seen.has(item.id) || !item.current || item.decision !== 'pending') throw new Error('待审分页发生重复或版本变化，请刷新后重试')
+      seen.add(item.id); items.push(item)
+    }
+    if (page.nextCursor === null) break
+    if (cursors.has(page.nextCursor) || page.items.length === 0) throw new Error('待审分页未完整返回，请刷新后重试')
+    cursor = page.nextCursor; cursors.add(cursor)
+  } while (true)
+  if (items.length !== expected) throw new Error('待审记录数量不完整，未执行批量操作')
+  return items
+}
+
+/** @public @author ddj 2026年10月27号 @param port Guarded existing per-file decision adapter. @param reject Undo instead of Keep. @returns Precise partial result; Undo stops at first conflict, never claims atomic multi-file rollback. */
+export async function runReviewBatch(port: BatchPort, reject: boolean): Promise<BatchResult> {
+  const result: BatchResult = { completed: 0, total: 0, paths: [], error: '' }
+  try {
+    port.guard()
+    const items = await loadPending(port)
+    result.total = items.length
+    const details: ReviewDetail[] = []
+    // Preflight the entire frozen set before the first mutation. Disk CAS remains authoritative at execution.
+    for (const item of items) {
+      port.guard()
+      const detail = await port.detail(item.id)
+      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}`)
+      details.push(detail)
+    }
+    // Reverse chronological snapshots allow a newer round's result to expose the previous round's endpoint.
+    details.sort((left, right) => right.capturedAt.localeCompare(left.capturedAt) || right.item.seq - left.item.seq)
+    for (const detail of details) {
+      port.guard()
+      const reply = await port.decide(detail, reject, port.operation(detail, reject))
+      if (!reply.ok) throw new Error(`${detail.item.display}：${reply.error}`)
+      result.completed++
+      result.paths.push(detail.item.currentPath)
+    }
+  } catch (cause) { result.error = cause instanceof Error ? cause.message : String(cause) }
+  return result
+}

package/src/client/state/reviewFeed.ts

@@ -11,12 +11,13 @@ const feeds = new Map<string, Entry>()
 function notify(entry: Entry): void { for (const listener of entry.listeners) listener(entry.value) }
 
 /** @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): Promise<void> {
+async function refresh(sessionId: string, entry: Entry, force = false): Promise<void> {
   if (entry.controller.signal.aborted) return
   if (entry.loading) { entry.again = true; return }
   clearTimeout(entry.timer)
   entry.loading = true
   entry.again = false
+  const previous = entry.value
   try {
     const result = await rpc('edrv.review.list', { sessionId }, entry.controller.signal)
     if (!entry.controller.signal.aborted) entry.value = result.ok
@@ -26,8 +27,11 @@ async function refresh(sessionId: string, entry: Entry): Promise<void> {
   finally {
     entry.loading = false
     if (!entry.controller.signal.aborted) {
-      notify(entry)
-      if (entry.again) void refresh(sessionId, entry)
+      // Polling returns fresh JSON objects even when nothing changed. Preserve identity so
+      // editors do not tear down Monaco zones and reload file details every five seconds.
+      if (!force && JSON.stringify(previous) === JSON.stringify(entry.value)) entry.value = previous
+      else notify(entry)
+      if (entry.again) void refresh(sessionId, entry, true)
       else entry.timer = setTimeout(() => { void refresh(sessionId, entry) }, 5000)
     }
   }
@@ -56,5 +60,5 @@ export function subscribeReview(sessionId: string, listener: Listener): () => vo
 /** @public @author ddj 2026年10月26号 @param sessionId Refresh metadata after a decision; does not alter legacy or disk. */
 export function refreshReview(sessionId: string): void {
   const entry = feeds.get(sessionId)
-  if (entry) { clearTimeout(entry.timer); void refresh(sessionId, entry) }
+  if (entry) { clearTimeout(entry.timer); void refresh(sessionId, entry, true) }
 }

package/src/client/styles/editor.css

@@ -271,6 +271,45 @@
 [data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-body { max-height: min(180px, 25vh); max-width: 100%; }
 [data-edrv-view] .edrv-side-diff-dock .edrv-diff-details { max-height: min(260px, 35vh); overflow-y: auto; }
 
+/* Official review: file context above, navigation/actions below. Theme-owned surfaces; no neon status outlines. @author ddj 2026年10月27号 */
+[data-edrv-diff-dock-shell] .edrv-reviewbar {
+  width: 520px; max-width: 100%; min-width: 0; box-sizing: border-box;
+  color: var(--dsw-alias-label-primary, #26313d); font-family: var(--dsw-font-family, sans-serif);
+  font-size: 12px; line-height: 1.4; container: edrv-review / inline-size;
+}
+[data-edrv-diff-dock-shell] .edrv-review-global { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 4px; padding: 6px 8px; border-bottom: 1px solid var(--dsw-alias-border-l1, #e5e9ef); }
+[data-edrv-diff-dock-shell] .edrv-review-all-actions { display: flex; align-items: center; gap: 4px; }
+[data-edrv-diff-dock-shell] .edrv-review-total strong { font-variant-numeric: tabular-nums; }
+[data-edrv-diff-dock-shell] .edrv-review-heading {
+  display: flex; align-items: center; gap: 8px; min-width: 0; padding: 10px 12px 8px;
+  border-bottom: 1px solid var(--dsw-alias-border-l1, #e5e9ef);
+}
+[data-edrv-diff-dock-shell] .edrv-review-filemark { display: inline-flex; flex: none; color: var(--dsw-alias-label-tertiary, #697586); }
+[data-edrv-diff-dock-shell] .edrv-review-filename { min-width: 0; flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 13px; font-weight: 600; }
+[data-edrv-diff-dock-shell] .edrv-review-pending { flex: none; display: inline-flex; gap: 5px; align-items: center; color: var(--dsw-alias-label-secondary, #697586); font-size: 11px; white-space: nowrap; }
+[data-edrv-diff-dock-shell] .edrv-review-pending strong { font-size: 12px; font-weight: 600; font-variant-numeric: tabular-nums; color: var(--dsw-alias-label-primary, #26313d); }
+[data-edrv-diff-dock-shell] .edrv-review-tools { display: flex; flex-wrap: wrap; align-items: center; gap: 6px; padding: 7px 8px; }
+[data-edrv-diff-dock-shell] .edrv-review-nav { display: flex; align-items: center; flex: none; gap: 1px; }
+[data-edrv-diff-dock-shell] .edrv-review-blocknav { border-left: 1px solid var(--dsw-alias-border-l1, #e5e9ef); padding-left: 6px; }
+[data-edrv-diff-dock-shell] .edrv-review-position { min-width: 32px; text-align: center; font-size: 11px; font-variant-numeric: tabular-nums; color: var(--dsw-alias-label-secondary, #697586); }
+[data-edrv-diff-dock-shell] .edrv-review-actions { display: flex; align-items: center; flex: none; gap: 4px; margin-left: auto; }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button { height: 28px; min-height: 28px; padding: 0 8px; border-radius: 6px; font-family: inherit; font-size: 12px; font-weight: 500; white-space: nowrap; gap: 5px; }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button.edrv-review-icon { width: 28px; min-width: 28px; padding: 0; }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button.edrv-review-record { padding: 0 6px; font-size: 11px; color: var(--dsw-alias-label-secondary, #697586); }
+[data-edrv-diff-dock-shell] .edrv-review-record svg { width: 12px; height: 12px; }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button.edrv-review-keep { background: var(--dsw-alias-brand-primary, #3b63d9); color: var(--dsw-alias-label-primary-inverted, #fff); border: 1px solid transparent; }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button.edrv-review-keep:hover:not(:disabled) { filter: brightness(.94); }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button.edrv-review-undo:hover:not(:disabled) { color: var(--dsw-alias-state-error-primary, #b64043); }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button:disabled { opacity: .4; cursor: not-allowed; }
+[data-edrv-diff-dock-shell] .edrv-reviewbar button:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary, #3b63d9); outline-offset: 2px; }
+[data-edrv-diff-dock-shell] .edrv-review-notice { padding: 7px 12px; border-top: 1px solid var(--dsw-alias-border-l1, #e5e9ef); color: var(--dsw-alias-label-secondary, #697586); font-size: 11px; overflow-wrap: anywhere; }
+[data-edrv-diff-dock-shell] .edrv-review-error { color: var(--dsw-alias-state-error-primary, #b64043); }
+[data-edrv-diff-dock-shell] .edrv-review-body { border-top: 1px solid var(--dsw-alias-border-l1, #e5e9ef); max-height: min(240px, 30vh); overflow: auto; padding: 8px 12px; }
+@container edrv-review (max-width: 420px) {
+  .edrv-reviewbar .edrv-review-heading { gap: 6px; padding-inline: 10px; }
+  .edrv-reviewbar .edrv-review-actions { justify-content: flex-end; flex: 1 0 100%; border-top: 1px solid var(--dsw-alias-border-l1, #e5e9ef); padding-top: 6px; }
+}
+
 /* ===== 侧边栏（活动栏 + 面板区 + 文件树） ===== */
 [data-edrv-view] .edrv-editor-row { display: flex; flex: 1 1 auto; min-width: 0; min-height: 0; overflow: hidden; }
 [data-edrv-view] .edrv-main-col { box-sizing: border-box; min-width: 0; min-height: 0; overflow: hidden; }

package/src/client/ui/DiffBox.ts

@@ -8,7 +8,7 @@ import React from 'react'
 import { callIdAttr } from '../state/records.js'
 import { canDecideFile, diffDockText } from '../diffDock.js'
 import { badgeOf } from './shared.js'
-import { ReviewLedger } from './OfficialReview.js'
+import { OfficialDiffBar } from './OfficialDiffBar.js'
 
 /**
  * 折叠控制使用任务栏同尺寸的 chevron 轮廓，避免依赖未声明的运行时图标包。
@@ -66,22 +66,7 @@ export function DiffBox(props) {
         }, diffDockText(fileTotal))))
   }
 
-  if (props.official) {
-    const official = props.official
-    return React.createElement('div', { className: 'edrv-diffbar edrv-diffbar-dock', 'data-edrv-diffbox': '1', 'data-edrv-diff-source': 'official' },
-      React.createElement('div', { className: 'edrv-diffbar-row' },
-        React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: onPrevFile, disabled: !fileTotal }, '←'),
-        React.createElement('span', null, base + ' · ' + official.pending + ' 条官方待审记录'),
-        React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: onNextFile, disabled: !fileTotal }, '→'),
-        React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: () => setExpanded(!expanded), 'aria-expanded': expanded }, expanded ? '收起差异' : '查看差异 / 标记已审'),
-        React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', disabled: true, title: '官方仅提供差异块，缺少可验证全文，不能安全回滚。' }, 'Undo 不可用'),
-        React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: () => onOpenLauncher('pending') }, '差异总览'),
-        React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: () => onOpenLauncher('archive') }, '归档 / 历史')),
-      props.reviewError ? React.createElement('div', { role: 'alert' }, props.reviewError) : null,
-      expanded ? React.createElement('div', { className: 'edrv-diffbar-body' },
-        React.createElement(ReviewLedger, { key: official.sessionId + ':' + official.path, sessionId: official.sessionId,
-          first: official.page, path: official.path })) : null)
-  }
+  if (props.official) return React.createElement(OfficialDiffBar, props)
 
   let bodyEl = null
   if (expanded) {

package/src/client/ui/EditorView.ts

@@ -22,7 +22,9 @@ import { acceptsLoad, receiptErrorFor, receiptPath, receiptReadyFor, receiptTabP
 import { bindPanelCommand } from '../panelCommands.js'
 import { dbg, isDebug, rpc } from '../rpc.js'
 import { refreshFeed, subscribeErrors, subscribeRecords } from '../state/recordsFeed.js'
-import { subscribeReview } from '../state/reviewFeed.js'
+import { subscribeReview, refreshReview } from '../state/reviewFeed.js'
+import { runReviewBatch } from '../reviewBatch.js'
+import { reviewRegions } from '../../shared/reviewRegions.js'
 import { diffSummary, officialPath } from '../state/diffSummary.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
@@ -442,6 +444,13 @@ 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 [reviewBatchBusy, setReviewBatchBusy] = React.useState(false)
+  const reviewLifeRef = React.useRef(null)
+  React.useEffect(() => {
+    const token = { live: true }
+    reviewLifeRef.current = token
+    return () => { token.live = false }
+  }, [sessionId])
   const menuHandlersRef = React.useRef(null) // 右键菜单动作的最新闭包（Monaco addAction 空依赖回调读取）
   const svnMenuDisposersRef = React.useRef([]) // Monaco 右键 SVN 组当前 disposables（同步时先注销旧组）
   // 调试（DAP）：store 订阅 tick 驱动重渲 + gutter/F9 切换闭包（ensureEditor 空依赖读取）
@@ -545,6 +554,44 @@ export function EditorView(props) {
     return list
   }, [records, active, cwd, review.page])
 
+  const reviewOpsRef = React.useRef(new Map())
+  const [officialDetail, setOfficialDetail] = React.useState(null)
+  const [officialRecords, setOfficialRecords] = React.useState([])
+  const [selectedReview, setSelectedReview] = React.useState(null)
+  // Only switching file/session/selection invalidates the visible source immediately.
+  // Background metadata refresh must not remove and recreate the current Monaco zones.
+  React.useEffect(() => {
+    setOfficialDetail(null)
+    setOfficialRecords([])
+  }, [sessionId, active, selectedReview])
+  React.useEffect(() => {
+    const controller = new AbortController()
+    if (!active || !review.page?.overview?.coveredPaths.some((path) => sameFile(path, active))) {
+      setOfficialDetail(null)
+      setOfficialRecords([])
+      return () => controller.abort()
+    }
+    /** @private @author ddj 2026年10月27号 Load the active file independently of the global history page. */
+    async function loadReview() {
+      try {
+        // Tabs use workspace-relative paths; the metadata index owns the backend identity.
+        const reviewPath = review.page?.overview?.coveredPaths.find((path) => sameFile(path, active)) ?? active
+        const page = await rpc('edrv.review.list', { sessionId, path: reviewPath }, controller.signal)
+        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]
+        if (!selected) { setOfficialRecords([]); setOfficialDetail(null); return }
+        const result = await rpc('edrv.review.detail', { sessionId, id: selected.id }, controller.signal)
+        if (controller.signal.aborted) return
+        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)
+      } catch (cause) { if (!controller.signal.aborted) setError('官方差异读取失败：' + String(cause)) }
+    }
+    void loadReview()
+    return () => controller.abort()
+  }, [sessionId, active, review.page, selectedReview, sameFile])
+
   const contentReady = content !== null && contentPath === active
   // 当前 tab 是否处于图片预览模式（与 loadContent 的分派条件同源；SVG 文本模式时为 false）
   const isImageActive = !!active && isImagePath(active) && !svgTextRef.current.has(active)
@@ -558,14 +605,16 @@ export function EditorView(props) {
     const trace = isDebug() && contentReady && currentRecords.length > 0
     const start = trace ? performance.now() : 0
     // #endregion
-    const next = diffRegions(currentRecords, contentReady ? content : null).filter((r) => !r.superseded)
+    const next = officialDetail
+      ? reviewRegions(officialDetail.diff, officialDetail.item.id, officialDetail.blocks ?? [], contentReady ? content : null)
+      : diffRegions(currentRecords, contentReady ? content : null).filter((r) => !r.superseded)
     // #region debug log
     if (trace) {
       try { dbg(sessionId, `[DEBUG diffRegions] records=${currentRecords.length} bytes=${content.length} regions=${next.length} ms=${(performance.now() - start).toFixed(1)}`) } catch (e) { /* 诊断不可影响渲染 */ }
     }
     // #endregion
     return next
-  }, [currentRecords, content, contentPath, active])
+  }, [currentRecords, content, contentPath, active, officialDetail])
   // 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])
@@ -2529,7 +2578,7 @@ export function EditorView(props) {
       if (!line || !map.size) { hoverEditorRef.current = false; hideSoon(); return }
       const hit = map.get(line)
       if (!hit) { hoverEditorRef.current = false; hideSoon(); return }
-      const key = callIdAttr(hit.callId, hit.idx)
+      const key = hit.sourceKind === 'official' ? hit.recordId + ':' + hit.id : callIdAttr(hit.callId, hit.idx)
       const top = Math.max(0, ed.getTopForLineNumber(Math.max(1, hit.start)) - ed.getScrollTop())
       const layout = ed.getLayoutInfo()
       const minimapLeft = layout.minimap?.minimapLeft || 0
@@ -3013,6 +3062,7 @@ export function EditorView(props) {
    * @returns Promise<boolean> 是否成功
    */
   const actHunk = (region, reject, silent) => {
+    if (region.sourceKind === 'official') return decideOfficial(reject, region.id)
     const method = reject ? 'edrv.reject' : 'edrv.accept'
     // #region debug log
     const trace = isDebug()
@@ -3113,7 +3163,38 @@ 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月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
+    if (reject && (dirtyRef.current[active] || savingRef.current.has(active) || saveTimerRef.current.isPending())) {
+      setError('存在未保存或正在保存的修改，请等待完成后重试'); return false
+    }
+    batchBusyRef.current = true
+    const source = officialDetail.item
+    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)
+      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 }
+    finally { batchBusyRef.current = false }
+  }
+
   const acceptFile = () => {
+    if (officialDetail) return decideOfficial(false)
     if (batchBusyRef.current || !decideRegions.length) return
     batchBusyRef.current = true
     actMany(decideRegions.map((r) => itemOf(r, false))).then((result) => {
@@ -3125,6 +3206,7 @@ export function EditorView(props) {
     }).catch(() => { batchBusyRef.current = false })
   }
   const undoFile = () => {
+    if (officialDetail) return decideOfficial(true)
     if (batchBusyRef.current || !decideRegions.length) return
     batchBusyRef.current = true
     actMany([...decideRegions].reverse().map((r) => itemOf(r, true))).then((result) => {
@@ -3161,7 +3243,7 @@ export function EditorView(props) {
     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
     const paths = [...new Set(list.map((r) => records[r.callId]?.path).filter(Boolean))]
-    actMany(list.map((r) => itemOf(r, reject))).then((result) => {
+    return actMany(list.map((r) => itemOf(r, reject))).then((result) => {
       batchBusyRef.current = false
       reloadFile(true)
       emitRefresh({ scope, paths: paths.length ? paths : undefined, kind: 'structure' })
@@ -3169,8 +3251,58 @@ export function EditorView(props) {
       if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
     }).catch(() => { batchBusyRef.current = false })
   }
-  const acceptAllFiles = () => actAllPending(false)
-  const undoAllFiles = () => actAllPending(true)
+  /** @private @author ddj 2026年10月27号 @param reject Undo requires every local buffer to be saved. @param token Starting session lifetime. @returns Throws before the next mutation when unsafe. */
+  function guardReviewAll(reject, token) {
+    if (!token?.live) throw new Error('编辑器或会话已切换，批量操作已停止')
+    if (reject && (Object.values(dirtyRef.current).some(Boolean) || savingRef.current.size || saveTimerRef.current.isPending())) {
+      throw new Error('存在未保存或正在保存的文件，未执行下一项 Undo，请保存后重试')
+    }
+  }
+
+  /** @private @author ddj 2026年10月27号 @param detail Frozen official revision. @param reject Undo action. @returns Stable retry ID shared with single-file decisions. */
+  function batchOperation(detail, reject) {
+    const source = detail.item
+    const key = JSON.stringify([sessionId, source.id, source.seq, source.revision, undefined, reject])
+    let operationId = reviewOpsRef.current.get(key)
+    if (!operationId) { operationId = crypto.randomUUID(); reviewOpsRef.current.set(key, operationId) }
+    return operationId
+  }
+
+  /** @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 }
+    const count = sum.pendingFiles.length
+    if (!count) return
+    if (!window.confirm(`${reject ? 'Undo All' : 'Keep All'}：处理当前工作区全部 ${count} 个待审差异文件（含其他轮次）？${reject ? '\n撤销会改写磁盘；逐项安全校验，遇到冲突停止，已完成项不会自动恢复。' : '\n只标记待审修改为保留，不改写文件。'}`)) return
+    const token = reviewLifeRef.current
+    const undoPath = activeRef.current
+    const undoModel = editorRef.current?.getModel?.()
+    const undoVersion = undoModel?.getVersionId?.()
+    batchBusyRef.current = true; setReviewBatchBusy(true)
+    setStatus(reject ? '正在检查并 Undo 全部待审记录…' : '正在 Keep 全部待审记录…')
+    try {
+      const result = await runReviewBatch({
+        list: async (cursor) => { const res = await rpc('edrv.review.list', { sessionId, cursor }); 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)
+      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 }
+      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) }
+    } catch (cause) { if (token?.live) setError(String(cause)) }
+    finally { batchBusyRef.current = false; if (token?.live) setReviewBatchBusy(false) }
+  }
+  const acceptAllFiles = () => actReviewAll(false)
+  const undoAllFiles = () => actReviewAll(true)
   const rollbackFile = () => {
     if (!active) return
     if (!window.confirm('回滚当前文件到修改前状态？（相关差异将归档）')) return
@@ -4318,7 +4450,10 @@ export function EditorView(props) {
         },
       },
         React.createElement('button', { className: 'edrv-pill edrv-pill-keep', onClick: () => { dismissHover(); actHunk(hoverAct.region, false) } }, '✓ Keep'),
-        React.createElement('button', { className: 'edrv-pill edrv-pill-undo', onClick: () => { dismissHover(); actHunk(hoverAct.region, true) } }, '↩ Undo'))
+        React.createElement('button', { className: 'edrv-pill edrv-pill-undo',
+          disabled: hoverAct.region.sourceKind === 'official' && !officialDetail?.capability.undo,
+          title: hoverAct.region.sourceKind === 'official' ? officialDetail?.capability.reason : undefined,
+          onClick: () => { dismissHover(); actHunk(hoverAct.region, true) } }, '↩ Undo'))
     : null
 
   /**
@@ -4330,8 +4465,9 @@ export function EditorView(props) {
   const buildDockSnapshot = () => ({
     mode: editorDockMode(active),
     official: officialFile ? { sessionId, page: review.page, path: officialFile,
-      pending: sum.files.find((file) => sameFile(file.path, active))?.pending ?? 0 } : null,
-    reviewError: review.error,
+      pending: sum.files.find((file) => sameFile(file.path, active))?.pending ?? 0,
+      detail: officialDetail, records: officialRecords, onSelect: setSelectedReview } : null,
+    reviewError: review.error || error,
     layout,
     pendingRegions,
     staleRegions,
@@ -4340,7 +4476,9 @@ export function EditorView(props) {
     onUndoFile: undoFile,
     onAcceptAllFiles: acceptAllFiles,
     onUndoAllFiles: undoAllFiles,
-    allPendingCount: allPending.length,
+    allPendingCount: allPending.length + (review.page?.pending ?? 0),
+    reviewBatchBusy,
+    batchUnavailable: !review.page?.overview ? '官方待审列表尚未就绪' : undefined,
     onRollback: rollbackFile,
     onJump: jumpTo,
     otherFiles,

package/src/client/ui/OfficialDiffBar.tsx

@@ -0,0 +1,112 @@
+import React from 'react'
+import { Button, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
+import type { ReviewDetail, ReviewItem, ReviewPage } from '../../shared/review.js'
+import { ReviewLedger } from './OfficialReview.js'
+
+export interface OfficialBarProps {
+  official: { sessionId: string; path: string; pending: number; detail?: ReviewDetail; records?: ReviewItem[]; page: ReviewPage; onSelect: (id: string) => void }
+  activePath: string
+  pendingRegions?: unknown[]
+  staleRegions?: unknown[]
+  diffIdx?: number
+  fileTotal?: number
+  fileIdx?: number
+  allPendingCount?: number
+  reviewBatchBusy?: boolean
+  batchUnavailable?: string
+  onAcceptAllFiles?: () => void
+  onUndoAllFiles?: () => void
+  onPrevFile: () => void
+  onNextFile: () => void
+  onPrevDiff: () => void
+  onNextDiff: () => void
+  onAcceptFile: () => void
+  onUndoFile: () => void
+  onOpenLauncher: (tab: string) => void
+  reviewError?: string
+}
+
+type Mark = 'left' | 'right' | 'up' | 'down' | 'check' | 'undo' | 'more' | 'file'
+const marks: Record<Mark, string> = {
+  left: 'm10 4-5 4 5 4', right: 'm6 4 5 4-5 4', up: 'm4 10 4-5 4 5', down: 'm4 6 4 5 4-5',
+  check: 'm3 8 3 3 7-7', undo: 'M5 3 2 6l3 3M2 6h7a4 4 0 0 1 0 8',
+  more: 'M3 8h.01M8 8h.01M13 8h.01', file: 'M9 2H4v12h8V5L9 2Zm0 0v4h3M6 9h4M6 11h3',
+}
+
+/** @private @author ddj 2026年10月27号 @param mark Toolbar action. @returns Decorative consistent-stroke icon; labels live on buttons. */
+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月27号 @param props Global workspace counts and bulk handlers. @returns Persistent global review controls, distinct from current-file actions. */
+function ReviewAllRow(props: OfficialBarProps): React.ReactElement {
+  const total = props.fileTotal ?? 0
+  const current = total && (props.fileIdx ?? -1) >= 0 ? (props.fileIdx ?? 0) + 1 : 0
+  const disabled = props.reviewBatchBusy || !!props.batchUnavailable || !props.allPendingCount
+  return <div className="edrv-review-global" role="group" aria-label="全部待审文件">
+    <Button size="sm" variant="ghost" className="edrv-review-total" onClick={() => props.onOpenLauncher('pending')} title="打开当前工作区全部待审差异文件">差异文件 <strong>{current} / {total}</strong></Button>
+    <span className="edrv-review-all-actions">
+      <Button size="sm" variant="ghost" onClick={props.onAcceptAllFiles} disabled={disabled || !props.onAcceptAllFiles} title={props.batchUnavailable || 'Keep 当前工作区全部待审文件（含其他轮次），不改写磁盘'}>Keep All</Button>
+      <Button size="sm" variant="ghost" className="edrv-review-undo" onClick={props.onUndoAllFiles} disabled={disabled || !props.onUndoAllFiles} title={props.batchUnavailable || '检查全部待审记录后逐项 Undo；缺少证据或遇到冲突停止，不强制覆盖'}>Undo All</Button>
+    </span>
+  </div>
+}
+
+/** @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
+  const [expanded, setExpanded] = React.useState(false)
+  const [menu, setMenu] = React.useState<'records' | 'more' | null>(null)
+  const name = String(props.activePath || '').split(/[\\/]/).pop() || '当前文件'
+  const detail = official.detail
+  const records = official.records ?? []
+  const count = pendingRegions.length
+  const position = count ? `${Math.min(diffIdx + 1, count)} / ${count}` : '—'
+
+  /** @private @author ddj 2026年10月27号 @returns Close current popup without changing selection. */
+  function closeMenu(): void { setMenu(null) }
+  /** @private @author ddj 2026年10月27号 @param id Immutable record ID. @returns Select record and dismiss popup. */
+  function selectRecord(id: string): void { official.onSelect(id); closeMenu() }
+  /** @private @author ddj 2026年10月27号 @param tab Existing launcher tab. @returns Open existing overview, never create another review entry. */
+  function openOverview(tab: string): void { props.onOpenLauncher(tab); closeMenu() }
+  /** @private @author ddj 2026年10月27号 @param mark Navigation icon. @param label Accessible action. @param action Existing callback. @param disabled Whether navigation is unavailable. @returns Compact keyboard-focusable navigation control. */
+  function navButton(mark: Mark, label: string, action: () => void, disabled: boolean): React.ReactElement {
+    return <Button size="sm" variant="ghost" className="edrv-review-icon" aria-label={label} title={label} disabled={disabled} onClick={action}>{barIcon(mark)}</Button>
+  }
+
+  const recordTrigger = <Button size="sm" variant="ghost" className="edrv-review-record" aria-label="选择官方差异记录" aria-haspopup="menu" aria-expanded={menu === 'records'} disabled={!records.length} onClick={() => setMenu(menu === 'records' ? null : 'records')}>
+    {detail ? `轮次 ${detail.item.turn}` : '选择记录'}{barIcon('down')}
+  </Button>
+  const moreTrigger = <Button size="sm" variant="ghost" className="edrv-review-icon" aria-label="更多审查操作" title="更多审查操作" aria-haspopup="menu" aria-expanded={menu === 'more'} onClick={() => setMenu(menu === 'more' ? null : 'more')}>{barIcon('more')}</Button>
+
+  return <div className="edrv-diffbar edrv-diffbar-dock edrv-reviewbar" data-edrv-diffbox="1" data-edrv-diff-source="official" role="region" aria-label="文件差异审查">
+    <ReviewAllRow {...props} />
+    {props.reviewBatchBusy ? <div className="edrv-review-notice" role="status">正在处理全部待审记录…</div> : null}
+    <div className="edrv-review-heading">
+      <span className="edrv-review-filemark">{barIcon('file')}</span>
+      <span className="edrv-review-filename" title={props.activePath}>{name}</span>
+      <span className="edrv-review-pending" title={`${official.pending} 条官方待审记录`}>待审 <strong>{official.pending}</strong></span>
+      <Menu open={menu === 'records'} anchor={recordTrigger} items={records.map((item) => ({ id: item.id, label: `轮次 ${item.turn} / 事件 ${item.seq}` }))} selectedId={detail?.item.id} onSelect={selectRecord} onClose={closeMenu} side="top" align="end" portal compact autoFocus />
+    </div>
+    <div className="edrv-review-tools">
+      <div className="edrv-review-nav" role="group" aria-label="文件导航">
+        {navButton('left', '上一个差异文件', props.onPrevFile, !props.fileTotal)}
+        {navButton('right', '下一个差异文件', props.onNextFile, !props.fileTotal)}
+      </div>
+      <div className="edrv-review-nav edrv-review-blocknav" role="group" aria-label="差异导航">
+        {navButton('up', '上一个差异', props.onPrevDiff, !count)}
+        <span className="edrv-review-position" aria-live="polite">{position}</span>
+        {navButton('down', '下一个差异', props.onNextDiff, !count)}
+      </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="保留当前记录的未处理修改">Keep</Button>
+        <Button size="sm" variant="ghost" className="edrv-review-details" onClick={() => setExpanded(!expanded)} aria-expanded={expanded} aria-label={expanded ? '收起差异' : '展开差异'} title={expanded ? '收起差异' : '展开差异'}>详情{barIcon(expanded ? 'up' : 'down')}</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>
+    {detail && staleRegions.length > 0 ? <div className="edrv-review-notice" role="status">{staleRegions.length} 处历史差异无法定位，展开详情查看原始增删。</div> : null}
+    {props.reviewError ? <div className="edrv-review-notice edrv-review-error" role="alert">{props.reviewError}</div> : null}
+    {expanded ? <div className="edrv-review-body"><ReviewLedger key={`${official.sessionId}:${official.path}`} sessionId={official.sessionId} first={official.page} path={official.path} /></div> : null}
+  </div>
+}

package/src/client-primitives.d.ts

@@ -7,6 +7,28 @@
  * 作者 ddj 2026-09-10
  */
 declare module '@deepseek-ai/dsh-client-ui-primitives' {
+  /** Compact theme-backed button; mirrors official Button.d.ts. @author ddj 2026年10月27号 */
+  export const Button: import('react').ComponentType<import('react').ButtonHTMLAttributes<HTMLButtonElement> & {
+    variant?: 'primary' | 'ghost' | 'outline' | 'toolbar'
+    size?: 'md' | 'sm'
+    icon?: import('react').ReactNode
+  }>
+
+  /** Anchored selectable menu; mirrors the subset used from official Menu.d.ts. @author ddj 2026年10月27号 */
+  export const Menu: import('react').ComponentType<{
+    open: boolean
+    anchor: import('react').ReactNode
+    items: readonly { id: string; label: import('react').ReactNode; disabled?: boolean }[]
+    selectedId?: string
+    onSelect: (id: string) => void
+    onClose: () => void
+    side?: 'top' | 'bottom' | 'right'
+    align?: 'start' | 'end'
+    portal?: boolean
+    compact?: boolean
+    autoFocus?: boolean
+  }>
+
   /** 图标组件通用 props（官方 Icon* 组件与 FileTypeIcon 共用形状）。 */
   export interface EdrvIconProps {
     /** 图标边长（px）；省略时用图标自带尺寸。 */