dsh-vscode-mode 0.14.2 → 0.14.3

package/src/client/ui/DiffLauncher.ts

@@ -8,6 +8,35 @@ import React from 'react'
 import { rpc } from '../rpc.js'
 import { MONO, btn } from './shared.js'
 
+/**
+ * 文件与批次共同标识归档卡片，避免同文件多批次共用展开状态。
+ * @author ddj 2026年09月30号
+ * @param entry 归档摘要或展开详情
+ * @returns 稳定卡片键
+ */
+export function archiveKey(entry) {
+  return JSON.stringify([entry.path, entry.batch])
+}
+
+/**
+ * 追加一页摘要并按文件/批次去重，保留已有卡片的顺序。
+ * @author ddj 2026年09月30号
+ * @param current 已加载页面
+ * @param next 下一页
+ * @returns 合并后的摘要列表
+ */
+export function mergeArchives(current, next) {
+  const merged = [...(current ?? [])]
+  const keys = new Set(merged.map(archiveKey))
+  for (const entry of next) {
+    const key = archiveKey(entry)
+    if (keys.has(key)) continue
+    keys.add(key)
+    merged.push(entry)
+  }
+  return merged
+}
+
 /**
  * 全局差异面板：待处理文件列表（点击打开并跳转）+ 归档浏览/批次回滚。
  * 由状态栏差异 chip / header 角标触发。
@@ -22,27 +51,50 @@ export function DiffLauncher(props) {
   const [archiveDetail, setArchiveDetail] = React.useState(null)
   const [archivePath, setArchivePath] = React.useState(null)
   const [archiveErr, setArchiveErr] = React.useState(null)
+  const [nextCursor, setNextCursor] = React.useState(null)
+  const [moreBusy, setMoreBusy] = React.useState(false)
+  const requestRef = React.useRef(0)
+  const detailRef = React.useRef(0)
+  const moreRef = React.useRef(false)
   const [error, setError] = React.useState(null)
 
-  const loadArchives = () => {
+  /** @author ddj 2026年09月30号 @description 仅加载一个归档摘要页并丢弃失效响应。 */
+  const loadArchives = (cursor = null) => {
     if (!sessionId) { setArchiveErr('会话不存在'); return }
-    rpc('edrv.archiveList', { sessionId }).then((res) => {
-      if (res && res.ok && Array.isArray(res.entries)) { setArchives(res.entries); setArchiveErr(null) }
-      else setArchiveErr(res?.error ? String(res.error) : '归档列表读取失败')
-    }).catch((e) => setArchiveErr('归档异常:' + String(e)))
+    if (cursor && moreRef.current) return
+    if (cursor) { moreRef.current = true; setMoreBusy(true); setArchiveErr(null) }
+    else { requestRef.current++; setArchives(null); setNextCursor(null); setArchiveErr(null) }
+    const generation = requestRef.current
+    rpc('edrv.archivePage', { sessionId, ...(cursor ? { cursor } : {}) }).then((res) => {
+      if (generation !== requestRef.current) return
+      if (res && res.ok && Array.isArray(res.entries)) {
+        setArchives((current) => cursor ? mergeArchives(current, res.entries) : res.entries)
+        setNextCursor(res.nextCursor ?? null)
+        setArchiveErr(null)
+      } else setArchiveErr(res?.error ? String(res.error) : '归档分页读取失败')
+    }).catch((e) => { if (generation === requestRef.current) setArchiveErr('归档异常:' + String(e)) })
+      .finally(() => { if (generation === requestRef.current) { moreRef.current = false; setMoreBusy(false) } })
   }
-  const loadArchiveDetail = (path) => {
+  /** @author ddj 2026年09月30号 @description 仅加载目标文件和批次详情。 */
+  const loadArchiveDetail = (path, batch) => {
     if (!sessionId) return
+    const generation = ++detailRef.current
     setArchiveDetail(null)
-    rpc('edrv.archiveRead', { sessionId, path }).then((res) => {
+    rpc('edrv.archiveRead', { sessionId, path, batch }).then((res) => {
+      if (generation !== detailRef.current) return
       if (res && res.ok && Array.isArray(res.batches)) setArchiveDetail(res.batches)
       else setArchiveErr(res?.error ? String(res.error) : '归档详情读取失败')
-    }).catch((e) => setArchiveErr('归档异常:' + String(e)))
+    }).catch((e) => { if (generation === detailRef.current) setArchiveErr('归档异常:' + String(e)) })
   }
   React.useEffect(() => {
-    if (tab !== 'archive') return
-    setArchives(null); setArchiveDetail(null); setArchivePath(null); setArchiveErr(null)
-    loadArchives()
+    requestRef.current++
+    detailRef.current++
+    moreRef.current = false
+    setMoreBusy(false)
+    setArchiveDetail(null); setArchivePath(null); setArchiveErr(null)
+    if (tab === 'archive') loadArchives()
+    else { setArchives(null); setNextCursor(null) }
+    return () => { requestRef.current++; detailRef.current++ }
   }, [tab, sessionId])
 
   let body
@@ -54,17 +106,18 @@ export function DiffLauncher(props) {
           React.createElement('span', { className: 'edrv-launch-cnt' }, '待处理 ' + f.pending + ' 处'),
           React.createElement('button', { className: 'edrv-btn-mini edrv-btn-keep', onClick: (e) => { e.stopPropagation(); onOpenFile(f.path) } }, '打开'))))
   } else {
-    if (archiveErr) body = React.createElement('div', { className: 'edrv-search-empty', style: { color: 'var(--dsw-alias-state-error-primary,#d9534f)' } }, '错误：' + String(archiveErr))
+    if (archiveErr && archives === null) body = React.createElement('div', { className: 'edrv-search-empty', style: { color: 'var(--dsw-alias-state-error-primary,#d9534f)' } }, '错误：' + String(archiveErr), React.createElement('button', { onClick: () => loadArchives(), style: btn(false) }, '重试'))
     else if (archives === null) body = React.createElement('div', { className: 'edrv-search-empty' }, '加载中…')
     else if (archives.length === 0) body = React.createElement('div', { className: 'edrv-search-empty' }, '暂无归档记录')
     else {
       const inner = archives.map((e) => {
-        const open = archivePath === e.path
+        const entryKey = archiveKey(e)
+        const open = archivePath === entryKey
         let detailEl = null
         if (open) {
           if (archiveDetail === null) detailEl = React.createElement('div', { style: { padding: 8, fontSize: 11, color: 'var(--dsw-alias-label-tertiary,#888)' } }, '加载中…')
           else {
-            const batches = archiveDetail.filter((b) => b.path === e.path)
+            const batches = archiveDetail.filter((b) => b.path === e.path && b.batch === e.batch)
             detailEl = batches.map((b) => (Array.isArray(b.records) ? b.records : []).map((rec) => {
               const lines = []
               const hunks = Array.isArray(rec.hunks) ? rec.hunks : []
@@ -90,8 +143,8 @@ export function DiffLauncher(props) {
             }))
           }
         }
-        return React.createElement('div', { key: e.at + e.path, style: { border: '1px solid var(--dsw-alias-border-l1,#333)', borderRadius: 8, overflow: 'hidden' } },
-          React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', padding: '6px 8px', background: 'var(--dsw-alias-bg-layer-1,transparent)', cursor: 'pointer', flexWrap: 'wrap' }, onClick: () => { if (open) { setArchivePath(null); setArchiveDetail(null) } else { setArchivePath(e.path); loadArchiveDetail(e.path) } } },
+        return React.createElement('div', { key: entryKey, style: { border: '1px solid var(--dsw-alias-border-l1,#333)', borderRadius: 8, overflow: 'hidden' } },
+          React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', padding: '6px 8px', background: 'var(--dsw-alias-bg-layer-1,transparent)', cursor: 'pointer', flexWrap: 'wrap' }, onClick: () => { if (open) { detailRef.current++; setArchivePath(null); setArchiveDetail(null) } else { setArchivePath(entryKey); loadArchiveDetail(e.path, e.batch) } } },
             React.createElement('span', { style: { flex: 1, fontSize: 12, color: 'var(--dsw-alias-label-primary,#ddd)', wordBreak: 'break-all' } }, e.displayPath ?? e.path),
             (e.batch != null ? React.createElement('span', { style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary,#888)' } }, '批次 ' + e.batch) : null),
             (e.reason ? React.createElement('span', { style: { fontSize: 11, color: 'var(--dsw-alias-state-warn-primary,#b7791f)' } }, e.reason) : null),
@@ -110,7 +163,13 @@ export function DiffLauncher(props) {
             }, style: btn(false) }, '回滚')),
           detailEl)
       })
-      body = React.createElement('div', { className: 'edrv-launch-arch' }, inner)
+      body = React.createElement('div', { className: 'edrv-launch-arch' }, inner,
+        archiveErr ? React.createElement('div', { style: { color: 'var(--dsw-alias-state-error-primary,#d9534f)' } }, '归档异常：' + archiveErr,
+          React.createElement('button', { onClick: () => { if (nextCursor) loadArchives(nextCursor); else loadArchives() }, style: btn(false) }, '重试')) : null,
+        nextCursor || moreBusy ? React.createElement('button', {
+          className: 'edrv-btn-mini', disabled: moreBusy || !!archiveErr,
+          onClick: () => { if (nextCursor) loadArchives(nextCursor) },
+        }, moreBusy ? '加载中…' : '加载更多') : null)
     }
   }
 

package/src/client/ui/EditorView.ts

@@ -11,7 +11,7 @@ import React from 'react'
 import { useOpenReceipt } from '../useOpenReceipt.js'
 import { acceptsLoad, receiptErrorFor, receiptPath, receiptReadyFor, receiptTabPath } from '../receiptState.js'
 import { bindPanelCommand } from '../panelCommands.js'
-import { dbg, rpc } from '../rpc.js'
+import { dbg, isDebug, rpc } from '../rpc.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
 import { clampZoom, clearZoomMem, dataUrlOf, isImagePath, isSvgPath, recallZoom, rememberZoom, zoomKeyOf, zoomStepOf } from '../imagePreview.js'
@@ -44,7 +44,8 @@ import { CommandPalette } from './CommandPalette.js'
 import { closeCommandPalette } from '../commandPaletteStore.js'
 import { DiffLauncher } from './DiffLauncher.js'
 import { SidebarView } from '../sidebar/SidebarView.js'
-import { clearDiffDock, publishDiffDock } from '../diffDockStore.js'
+import { clearDiffDock, dockInLayout, publishDiffDock } from '../diffDockStore.js'
+import { DiffBox } from './DiffBox.js'
 import { displayDiffTotal, editorDockMode } from '../diffDock.js'
 import { editorHeight } from '../editorLayout.js'
 import { revealInExplorer as revealPathInExplorer } from '../fileReveal.js'
@@ -479,7 +480,19 @@ export function EditorView(props) {
   // 当前 tab 是否为可预览的 Markdown，以及是否正处于预览态（预览态替换 Monaco host，只读）
   const isMdActive = !!active && isMarkdownPath(active)
   const mdPreviewing = isMdActive && mdPreviewRef.current.has(active)
-  const regions = React.useMemo(() => diffRegions(currentRecords, contentReady ? content : null).filter((r) => !r.superseded), [currentRecords, content, contentPath, active])
+  const regions = React.useMemo(() => {
+    // #region debug log
+    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)
+    // #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])
   // 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])
@@ -802,14 +815,35 @@ export function EditorView(props) {
 
   const refreshRecords = (skipStale) => {
     if (!sessionId) return
+    // #region debug log
+    const trace = isDebug()
+    const start = trace ? performance.now() : 0
+    // #endregion
     rpc('edrv.list', { sessionId, ...(skipStale ? { skipStale: true } : {}) }).then((res) => {
+      // #region debug log
+      const received = trace ? performance.now() : 0
+      // #endregion
       if (!res || !res.ok || !Array.isArray(res.records)) return
       const map = {}
       for (const r of res.records) {
         if (r.archived === true) continue
         map[r.callId] = r
       }
-      setRecords((prev) => (sameRecords(prev, map) ? prev : map))
+      setRecords((prev) => {
+        // #region debug log
+        const compareStart = trace ? performance.now() : 0
+        // #endregion
+        const equal = sameRecords(prev, map)
+        // #region debug log
+        if (trace) {
+          try {
+            const compareMs = performance.now() - compareStart
+            if (compareMs > 20 || received - start > 100) dbg(sessionId, `[DEBUG diffList] count=${res.records.length} skipStale=${skipStale === true} rpcMs=${(received - start).toFixed(1)} compareMs=${compareMs.toFixed(1)} changed=${!equal}`)
+          } catch (e) { /* 诊断不可影响轮询 */ }
+        }
+        // #endregion
+        return equal ? prev : map
+      })
     }).catch((e) => setError('list异常:' + String(e)))
   }
 
@@ -942,7 +976,15 @@ export function EditorView(props) {
       return
     }
     setLoadStage({ progress: monaco ? 72 : 12, message: '读取文件内容…' })
+    // #region debug log
+    const readStart = isDebug() ? performance.now() : 0
+    // #endregion
     rpc('edrv.read', { sessionId: sid, path }).then((res) => {
+      // #region debug log
+      if (readStart) {
+        try { dbg(sid, `[DEBUG diffRead] force=${force === true} ok=${res?.ok === true} bytes=${typeof res?.content === 'string' ? res.content.length : 0} rpcMs=${(performance.now() - readStart).toFixed(1)}`) } catch (e) { /* 诊断不可影响文件读取 */ }
+      }
+      // #endregion
       if (!loadCurrent(path, seq)) return
       if (res && res.ok) {
         mark(res.version, true)
@@ -2704,7 +2746,20 @@ export function EditorView(props) {
    */
   const actHunk = (region, reject, silent) => {
     const method = reject ? 'edrv.reject' : 'edrv.accept'
+    // #region debug log
+    const trace = isDebug()
+    const start = trace ? performance.now() : 0
+    const traceId = trace ? `${Date.now()}-${Math.floor(Math.random() * 1000)}` : ''
+    if (trace) {
+      try { dbg(sessionId, `[DEBUG diffAction] stage=start trace=${traceId} method=${method} scope=${region.create ? 'call' : 'hunk'}`) } catch (e) { /* 诊断不可影响决策 */ }
+    }
+    // #endregion
     return rpc(method, { sessionId, callId: region.callId, scope: region.create ? 'call' : 'hunk', hunkIndex: region.idx }).then((res) => {
+      // #region debug log
+      if (trace) {
+        try { dbg(sessionId, `[DEBUG diffAction] stage=reply trace=${traceId} method=${method} ok=${res?.ok === true} rpcMs=${(performance.now() - start).toFixed(1)}`) } catch (e) { /* 诊断不可影响决策 */ }
+      }
+      // #endregion
       if (res && res.ok) {
         setRecords((prev) => Object.assign({}, prev, { [region.callId]: res.record }))
         if (!silent) { reloadFile(); emitRefresh() }
@@ -2727,7 +2782,21 @@ export function EditorView(props) {
    */
   const actMany = (items) => {
     if (!items.length) return Promise.resolve({ ok: 0, fail: 0, stale: 0 })
+    // #region debug log
+    const trace = isDebug()
+    const start = trace ? performance.now() : 0
+    const rejected = trace ? items.filter((item) => item.decision === 'rejected').length : 0
+    const traceId = trace ? `${Date.now()}-${Math.floor(Math.random() * 1000)}` : ''
+    if (trace) {
+      try { dbg(sessionId, `[DEBUG diffAction] stage=start trace=${traceId} method=decideBatch items=${items.length} rejected=${rejected}`) } catch (e) { /* 诊断不可影响决策 */ }
+    }
+    // #endregion
     return rpc('edrv.decideBatch', { sessionId, items }).then((res) => {
+      // #region debug log
+      if (trace) {
+        try { dbg(sessionId, `[DEBUG diffAction] stage=reply trace=${traceId} method=decideBatch items=${items.length} rpcMs=${(performance.now() - start).toFixed(1)} ok=${res?.ok === true}`) } catch (e) { /* 诊断不可影响决策 */ }
+      }
+      // #endregion
       if (!res || !res.ok || !Array.isArray(res.results)) {
         setError(res?.error ? String(res.error) : '批量处理失败')
         return { ok: 0, fail: items.length, stale: 0 }
@@ -3700,9 +3769,14 @@ export function EditorView(props) {
         React.createElement('button', { className: 'edrv-pill edrv-pill-undo', onClick: () => { dismissHover(); actHunk(hoverAct.region, true) } }, '↩ Undo'))
     : null
 
-  /** 组装差异 dock 快照（发布给 conversation.input.dock 的唯一 DiffBox 实例）。 */
+  /**
+   * 组装当前编辑器的差异上下文，供侧栏本地与会话 dock 共用。
+   * @author ddj 2026年09月29号
+   * @returns 含布局及操作回调的差异快照
+   */
   const buildDockSnapshot = () => ({
     mode: editorDockMode(active),
+    layout,
     pendingRegions,
     staleRegions,
     onAct: actHunk,
@@ -3729,9 +3803,10 @@ export function EditorView(props) {
     onOpenNextFile: openNextFile,
   })
 
+  const dockSnapshot = buildDockSnapshot()
   React.useEffect(() => {
     if (!sessionId) return
-    publishDiffDock(sessionId, buildDockSnapshot(), dockSourceRef.current)
+    publishDiffDock(sessionId, dockSnapshot, dockSourceRef.current)
     // 侧栏形态同步 Tab 角标计数（仅本形态写入；页签形态清零避免残留）
     if (layout === 'side') setSidePending(sessionId, sum.totalFiles)
     else setSidePending(sessionId, 0)
@@ -3930,12 +4005,20 @@ export function EditorView(props) {
       }, '添加配置…')
     : null
 
-  // 主编辑列（侧边栏右侧）：pathBar + tabRow + 编辑/差异区（底部整条留给 DSH 对话输入栏）
+  // 侧栏差异栏悬浮在编辑区底部；中央页签仍使用对话 dock。
+  const sideDock = dockInLayout(dockSnapshot, 'side')
+    ? React.createElement('div', {
+        className: 'edrv-side-diff-dock edrv-diff-dock-shell',
+        'data-edrv-diff-dock-shell': '1',
+      }, React.createElement(DiffBox, { ...dockSnapshot, dock: true }))
+    : null
+  // 主编辑列（侧边栏右侧）：pathBar + tabRow + 编辑/差异区。
   const editorArea = React.createElement('div', { className: 'edrv-editor-area' },
     dapBar,
     addCfgBtn,
     body,
     hoverEl,
+    sideDock,
     overlay)
   // 侧边栏引导条（仅旧页签形态且未装 betterSidebar 时显示；可复制安装命令、可关闭）
   const dismissHint = () => {

package/src/index.ts

@@ -1,6 +1,7 @@
 /** dsh-vscode-mode Host composition. @author ddj 2026年09月28号 */
 import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
+import { closeArchiveDbs } from './archiveDb.js'
 import { handleRpc } from './rpc.js'
 import { newSearcher } from './search/orchestrator.js'
 import { newContentSearcher } from './search/content.js'
@@ -83,6 +84,7 @@ function attachRuntime(ctx: Ctx, runtime: Runtime): void {
   /** @author ddj 2026年09月28号 Release every manager even if another cleanup rejects. */
   async function cleanup(): Promise<void> {
     runtime.fileVersions.dispose()
+    closeArchiveDbs()
     disposeAllServers()
     const tasks = [() => runtime.lspManager.disposeAll(), () => runtime.svnRpc.dispose(), () => runtime.dapRpc.dispose()]
     await Promise.allSettled(tasks.map((run) => Promise.resolve().then(run)))

package/src/paths.ts

@@ -193,6 +193,17 @@ export function debugLogFile(cwd: string, home = dshHome()): string {
   return join(pluginLogRoot(home), 'debug.' + hashOf(cwd) + '.log')
 }
 
+/**
+ * 每工作区归档数据库（用户数据，不受缓存清理预算约束）。
+ * @author ddj 2026年09月30号
+ * @param cwd 工作区绝对路径
+ * @param home DSH home
+ * @returns 归档数据库绝对路径
+ */
+export function archiveDbFile(cwd: string, home = dshHome()): string {
+  return join(home, PLUGIN_ID, 'data', 'archive', hashOf(cwd) + '.sqlite')
+}
+
 /** 插件包 assets 目录（import.meta.url 派生；config.imageDir 可覆盖，见 imageDirOf）。 */
 export function assetsDirOf(moduleUrl: string): string {
   return join(dirname(fileURLToPath(moduleUrl)), '..', 'assets')

package/src/perf.ts

@@ -10,10 +10,9 @@
  */
 import { mkdir, readdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises'
 import { dirname, join, resolve, sep } from 'node:path'
-import { parseSidecar } from './store.js'
-import { recSummary } from './model.js'
+import { activeSummary } from './archiveDb.js'
 import { log } from './log.js'
-import { SIDECAR, SIDECAR_ARCHIVE, dshHome, sessionIdSegment, sessionWorkspaceKey, sessionsRoot } from './paths.js'
+import { SIDECAR, SIDECAR_ARCHIVE, archiveDbFile, dshHome, sessionIdSegment, sessionWorkspaceKey, sessionsRoot } from './paths.js'
 import type { PerfMoveFailure, PerfMoveItem, PerfSession, PerfTotals, PerfWorkspace, SidecarPerfSummary } from './shared/rpc.js'
 import type { Ctx } from './store.js'
 
@@ -370,29 +369,23 @@ export async function sessionSizeOf(home: string, cwd: string, sessionId: string
  */
 export async function sidecarSummaryOf(ctx: Ctx, cwd: string | null): Promise<SidecarPerfSummary> {
   const fs = ctx.get('fs')
-  const summary: SidecarPerfSummary = { active: 0, pendingByFile: [], archiveBytes: 0 }
+  const summary: SidecarPerfSummary = { active: 0, pendingByFile: [], archiveBytes: 0, legacyArchiveBytes: 0, legacyActiveBytes: 0 }
   if (!fs || !cwd) return summary
+  const current = activeSummary(cwd)
+  summary.active = current.active
+  summary.pendingByFile = current.pendingByFile
   try {
-    const text = await fs.readText(await fs.resolve(SIDECAR, { cwd }))
-    const data = parseSidecar(text)
-    const recs = data?.workspaces?.[cwd]?.records
-    if (recs) {
-      const byFile = new Map<string, number>()
-      let active = 0
-      for (const rec of Object.values(recs)) {
-        if (rec.archived) continue
-        active += 1
-        const sm = recSummary(rec)
-        if (sm.pending > 0 && rec.path) byFile.set(rec.path, (byFile.get(rec.path) ?? 0) + sm.pending)
-      }
-      summary.active = active
-      summary.pendingByFile = [...byFile.entries()].map(([path, pending]) => ({ path, pending })).sort((a, b) => b.pending - a.pending)
-    }
-    try {
-      const info = await fs.stat(await fs.resolve(SIDECAR_ARCHIVE, { cwd }))
-      summary.archiveBytes = info?.size ?? 0
-    } catch (error) { /* 归档缺失忽略 */ }
-  } catch (error) { /* sidecar 不可读返回空摘要 */ }
+    const info = await fs.stat(await fs.resolve(SIDECAR_ARCHIVE, { cwd }))
+    summary.legacyArchiveBytes = info?.size ?? 0
+  } catch { /* 旧归档缺失忽略 */ }
+  try {
+    const info = await fs.stat(await fs.resolve(SIDECAR, { cwd }))
+    summary.legacyActiveBytes = info?.size ?? 0
+  } catch { /* 旧活跃文件缺失忽略 */ }
+  const dbPath = archiveDbFile(cwd)
+  for (const file of [dbPath, dbPath + '-wal', dbPath + '-shm']) {
+    try { summary.archiveBytes += (await stat(file)).size } catch { /* 数据库尚未创建 */ }
+  }
   return summary
 }
 

package/src/revert.ts

@@ -7,6 +7,7 @@ import type { DiffRecord } from './shared/types.js'
 import type { Ctx, Session } from './store.js'
 import { policyOf, resolveTarget } from './store.js'
 import { applyLocations, locateHunks, preciseHunk } from './shared/diff.js'
+import { debugRecord } from './debugLog.js'
 
 /** 回滚结果；stale=true 表示该 hunk 的新文本已不在文件中（无可回滚内容，不算失败）。 */
 export type Result = { ok: true } | { ok: false; error: string; stale?: boolean }
@@ -82,25 +83,116 @@ export async function revertCall(ctx: Ctx, session: Session, record: DiffRecord)
 }
 
 /** 单 hunk 回滚：用 callHunk（edit 单 hunk 精确串）经 fs.editText 反替换。 */
-export async function revertHunk(ctx: Ctx, session: Session, record: DiffRecord, idx: number): Promise<Result> {
+export async function revertHunk(ctx: Ctx, session: Session, record: DiffRecord, idx: number, traceId?: string): Promise<Result> {
   const fs = ctx.get('fs')
   if (!fs) return { ok: false, error: '回滚不可用：缺少 fs' }
   const precise = preciseHunk(record, idx)
   if (!precise) return { ok: false, error: '找不到该差异块' }
+  // #region debug log
+  const started = traceId ? performance.now() : 0
+  let readMs = 0
+  let locateMs = 0
+  let stage = 'resolve'
+  // #endregion
   try {
     const target = await resolveTarget(ctx, session, record.path)
+    stage = 'stat'
     const info = await fs.stat(target)
     if (!info || info.type !== 'file') return { ok: false, error: '回滚失败：文件不存在' }
     if ((info.size ?? 0) > 8 * 1024 * 1024) return { ok: false, error: '回滚失败：文件过大，无法安全定位' }
+    stage = 'read'
     const content = await fs.readText(target)
+    // #region debug log
+    if (traceId) readMs = performance.now() - started
+    const locateStart = traceId ? performance.now() : 0
+    // #endregion
+    stage = 'locate'
     const location = locateHunks(content, [precise])[0]
+    // #region debug log
+    if (traceId) locateMs = performance.now() - locateStart
+    // #endregion
     // 新文本已不在文件中（被后续修改覆盖/撤销）：不采纳的目标已达成，标记 stale 供调用方按"已回滚"记录决策
     if (!location?.matched) return { ok: false, stale: true, error: '回滚失败：该区域在文件中已不存在（可能已被后续修改覆盖）' }
     const result = applyLocations(content, [location], true)
+    stage = 'write'
     await fs.writeText(target, result.content, void 0, void 0, policyOf(ctx, session))
     return { ok: true }
   } catch (error) {
     return { ok: false, error: '回滚失败：该区域可能已被后续修改影响（' + String(error) + '）' }
+  } finally {
+    // #region debug log
+    if (traceId) {
+      try { debugRecord(ctx, session.header?.cwd ?? '', `[DEBUG diffRevert] trace=${traceId} mode=single stage=${stage} readMs=${readMs.toFixed(1)} locateMs=${locateMs.toFixed(1)} totalMs=${(performance.now() - started).toFixed(1)}`) } catch { /* 诊断不可影响回滚 */ }
+    }
+    // #endregion
+  }
+}
+
+/**
+ * 同一记录的连续 hunk 在内存里逐项回滚，只对文件读写各一次。
+ * 不替代单条回滚；调用方只传确定同路径且非远端的连续项。
+ * @author ddj 2026年09月29号
+ * @param ctx DSH 上下文
+ * @param session 会话
+ * @param record 差异记录
+ * @param indices 按决策顺序排列的 hunk 索引
+ * @param traceId 可选的诊断追踪号，仅开启诊断时传入
+ * @returns 每个 hunk 对应的独立执行结果
+ */
+export async function revertHunks(ctx: Ctx, session: Session, record: DiffRecord, indices: number[], traceId?: string): Promise<Result[]> {
+  const fs = ctx.get('fs')
+  if (!fs) return indices.map(() => ({ ok: false, error: '回滚不可用：缺少 fs' }))
+  const failAll = (error: string): Result[] => indices.map((idx) => preciseHunk(record, idx)
+    ? { ok: false, error } : { ok: false, error: '找不到该差异块' })
+  try {
+    // #region debug log
+    const started = traceId ? performance.now() : 0
+    // #endregion
+    const target = await resolveTarget(ctx, session, record.path)
+    const info = await fs.stat(target)
+    if (!info || info.type !== 'file') return failAll('回滚失败：文件不存在')
+    if ((info.size ?? 0) > 8 * 1024 * 1024) return failAll('回滚失败：文件过大，无法安全定位')
+    let content = await fs.readText(target)
+    // #region debug log
+    const readMs = traceId ? performance.now() - started : 0
+    const locateStart = traceId ? performance.now() : 0
+    // #endregion
+    let size = info.size ?? Buffer.byteLength(content)
+    const results: Result[] = []
+    for (const idx of indices) {
+      const hunk = preciseHunk(record, idx)
+      if (!hunk) { results.push({ ok: false, error: '找不到该差异块' }); continue }
+      if (size > 8 * 1024 * 1024) {
+        results.push({ ok: false, error: '回滚失败：文件过大，无法安全定位' })
+        continue
+      }
+      const location = locateHunks(content, [hunk])[0]
+      if (!location?.matched) {
+        results.push({ ok: false, stale: true, error: '回滚失败：该区域在文件中已不存在（可能已被后续修改覆盖）' })
+        continue
+      }
+      size += Buffer.byteLength(hunk.oldText ?? '') - Buffer.byteLength(content.slice(location.start, location.end))
+      content = applyLocations(content, [location], true).content
+      results.push({ ok: true })
+    }
+    // #region debug log
+    const locateMs = traceId ? performance.now() - locateStart : 0
+    const writeStart = traceId ? performance.now() : 0
+    // #endregion
+    if (results.some((result) => result.ok)) {
+      await fs.writeText(target, content, void 0, void 0, policyOf(ctx, session))
+    }
+    // #region debug log
+    try {
+      if (traceId) {
+        const totalMs = performance.now() - started
+        debugRecord(ctx, session.header?.cwd ?? '', `[DEBUG diffRevert] trace=${traceId} mode=batch hunks=${indices.length} bytes=${info.size ?? 0} readMs=${readMs.toFixed(1)} locateMs=${locateMs.toFixed(1)} writeMs=${(performance.now() - writeStart).toFixed(1)} totalMs=${totalMs.toFixed(1)}`)
+      }
+    } catch { /* 诊断不可影响回滚 */ }
+    // #endregion
+    return results
+  } catch (error) {
+    return failAll('回滚失败：该区域可能已被后续修改影响（' + String(error) + '）')
   }
 }