dsh-vscode-mode 0.14.2 → 0.14.4

package/src/client/mcpForm.ts

@@ -0,0 +1,79 @@
+import type { MpcConfig } from '../shared/mcp.js'
+
+export interface McpDraft {
+  serverName: string
+  transport: 'stdio' | 'streamable-http'
+  command: string
+  args: string
+  cwd: string
+  url: string
+  headers: string
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月08号
+ * @description Parse lossless JSON string[] or one literal argument per nonempty line; no shell splitting.
+ * @param text Argument field.
+ * @returns Literal argument vector.
+ * @throws Invalid JSON or a non-string array element.
+ */
+export function parseArgs(text: string): string[] {
+  if (text.trimStart().startsWith('[')) {
+    let value: unknown
+    try { value = JSON.parse(text) } catch { throw new Error('参数 JSON 无效，请输入 string[] 或每行一个参数') }
+    if (!Array.isArray(value) || !value.every((item) => typeof item === 'string')) {
+      throw new Error('参数 JSON 必须是 string[]')
+    }
+    return value
+  }
+  return text.split(/\r?\n/).filter((line) => line.length > 0)
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月08号
+ * @description Validate HTTP headers; duplicates are case-insensitive and values retain embedded equals.
+ * @param text One key=value header per line.
+ * @returns Validated header dictionary.
+ * @throws Missing separator, invalid/empty key, duplicate key, or illegal control characters.
+ */
+export function parsePairs(text: string): Record<string, string> {
+  const pairs: Array<[string, string]> = []
+  const keys = new Set<string>()
+  for (const [index, raw] of text.split(/\r?\n/).entries()) {
+    if (!raw.trim()) continue
+    const separator = raw.indexOf('=')
+    const key = raw.slice(0, separator).trim()
+    const value = raw.slice(separator + 1).trim()
+    if (separator < 1 || !/^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/.test(key) || /[\x00-\x08\x0a-\x1f\x7f]/.test(value)) {
+      throw new Error('请求头第 ' + (index + 1) + ' 行格式错误，应为有效 key=value')
+    }
+    const normalized = key.toLowerCase()
+    if (keys.has(normalized)) throw new Error('请求头重复：' + key)
+    keys.add(normalized)
+    pairs.push([key, value])
+  }
+  return Object.fromEntries(pairs)
+}
+
+/**
+ * @public
+ * @author ddj 2026年10月08号
+ * @description Convert a form draft without losing argument boundaries or silently accepting malformed headers.
+ * @param draft Current editable fields.
+ * @returns Host MCP configuration.
+ * @throws Argument/header validation errors; callers must keep the form open.
+ */
+export function configOf(draft: McpDraft): MpcConfig {
+  const config: MpcConfig = { serverName: draft.serverName.trim(), transport: draft.transport }
+  if (draft.transport === 'stdio') {
+    config.command = draft.command.trim()
+    config.args = parseArgs(draft.args)
+    if (draft.cwd.trim()) config.cwd = draft.cwd.trim()
+  } else {
+    config.url = draft.url.trim()
+    config.headers = parsePairs(draft.headers)
+  }
+  return config
+}

package/src/client/mcpState.ts

@@ -0,0 +1,179 @@
+import type { MpcProject, MpcServer } from '../shared/mcp.js'
+import type { rpc } from './rpc.js'
+
+export interface McpView {
+  servers: MpcServer[]
+  projects: MpcProject[]
+  loading: boolean
+  busy: string
+  error: string
+}
+interface McpTiming { interval?: number; timeout?: number }
+interface ReadToken { controller: AbortController; version: number; timer: ReturnType<typeof setTimeout> }
+type Result = { ok: boolean; error?: string }
+
+/** Owns MCP read lifetimes and one synchronous mutation lock for the entire management page. */
+export class McpState {
+  readonly view: McpView = { servers: [], projects: [], loading: true, busy: '', error: '' }
+  private active = false
+  private visible = true
+  private disposed = false
+  private version = 0
+  private reading: ReadToken | null = null
+  private timer: ReturnType<typeof setTimeout> | null = null
+  private readonly interval: number
+  private readonly timeout: number
+
+  /** @public @author ddj 2026年10月08号 @param request Typed RPC transport. @param changed View notification. @param timing Bounded read and polling timings. */
+  constructor(private readonly request: typeof rpc, private readonly changed: (view: McpView) => void, timing: McpTiming = {}) {
+    this.interval = Math.max(100, timing.interval ?? 2500)
+    this.timeout = Math.max(50, timing.timeout ?? 10000)
+  }
+
+  //region Read lifecycle
+  /** @private @author ddj 2026年10月08号 @description Publish a copied view only while mounted. */
+  private emit(): void {
+    if (!this.disposed) this.changed({ ...this.view })
+  }
+
+  /** @private @author ddj 2026年10月08号 @description Cancel scheduled reads and invalidate every older response. */
+  private invalidate(): void {
+    this.version++
+    if (this.timer !== null) clearTimeout(this.timer)
+    this.timer = null
+    this.reading?.controller.abort()
+  }
+
+  /** @private @author ddj 2026年10月08号 @description Schedule a single read only after the preceding transport settled. */
+  private schedule(): void {
+    if (this.disposed || !this.active || !this.visible || this.reading || this.view.loading || this.view.busy || this.timer !== null) return
+    this.timer = setTimeout(this.poll, this.interval)
+  }
+
+  /** @private @author ddj 2026年10月08号 @description Timer entry, with failures handled in read. */
+  private poll = (): void => {
+    this.timer = null
+    void this.read(false)
+  }
+
+  /** @private @author ddj 2026年10月08号 @returns Versioned read token with an abort deadline. */
+  private beginRead(): ReadToken {
+    const controller = new AbortController()
+    const version = this.version
+    /** @author ddj 2026年10月08号 @description Abort timed-out transport and invalidate its eventual response. */
+    const expire = (): void => {
+      controller.abort()
+      if (this.disposed || version !== this.version) return
+      this.version++
+      this.view.loading = false
+      this.view.error = '读取 MCP 状态超时'
+      this.emit()
+    }
+    const token = { controller, version, timer: setTimeout(expire, this.timeout) }
+    this.reading = token
+    return token
+  }
+
+  /** @private @author ddj 2026年10月08号 @param initial Initialization versus read-only polling. @param signal Abort deadline. @returns Complete settled data, never an early half-settled initial read. @throws Transport or host failures. */
+  private async fetchData(initial: boolean, signal: AbortSignal): Promise<Pick<McpView, 'servers' | 'projects'>> {
+    if (!initial) {
+      const snapshot = await this.request('mcp.snapshot', {}, signal)
+      if (!snapshot.ok) throw new Error(snapshot.error)
+      return snapshot
+    }
+    const [list, groups] = await Promise.allSettled([this.request('mcp.list', {}, signal), this.request('mcp.projects', {}, signal)])
+    if (list.status === 'rejected') throw list.reason
+    if (groups.status === 'rejected') throw groups.reason
+    if (!list.value.ok) throw new Error(list.value.error)
+    if (!groups.value.ok) throw new Error(groups.value.error)
+    return { servers: list.value.servers, projects: groups.value.projects }
+  }
+
+  /** @private @author ddj 2026年10月08号 @param initial Use legacy initialization RPCs once; later polls are read-only snapshots. @returns Completion after transport settles; aborted results never publish. */
+  private async read(initial: boolean): Promise<void> {
+    if (this.disposed || this.reading || this.view.busy) return
+    if (!initial && (!this.active || !this.visible)) return
+    const token = this.beginRead()
+    try {
+      const signal = token.controller.signal
+      const { servers, projects } = await this.fetchData(initial, signal)
+      if (!this.disposed && token.version === this.version && !signal.aborted) {
+        this.view.servers = servers
+        this.view.projects = projects
+        this.view.error = ''
+      }
+    } catch (error) {
+      if (!this.disposed && token.version === this.version && !token.controller.signal.aborted) this.view.error = String(error)
+    } finally {
+      clearTimeout(token.timer)
+      this.reading = null
+      if (!this.disposed) {
+        this.view.loading = false
+        this.emit()
+        this.schedule()
+      }
+    }
+  }
+
+  /** @public @author ddj 2026年10月08号 @description Initialize list/projects once per mounted page. @returns Load completion. */
+  load(): Promise<void> { return this.read(true) }
+
+  /** @public @author ddj 2026年10月08号 @param active Whether the top-level MCP tab is selected. */
+  setActive(active: boolean): void {
+    if (this.active === active) return
+    this.active = active
+    if (!active) this.invalidate()
+    this.schedule()
+  }
+
+  /** @public @author ddj 2026年10月08号 @param visible Whether document visibility permits background requests. */
+  setVisible(visible: boolean): void {
+    if (this.visible === visible) return
+    this.visible = visible
+    if (!visible) this.invalidate()
+    this.schedule()
+  }
+
+  /** @public @author ddj 2026年10月08号 @description Stop timers and invalidate all responses on unmount. */
+  dispose(): void {
+    this.disposed = true
+    this.invalidate()
+    if (this.reading) clearTimeout(this.reading.timer)
+  }
+  //endregion
+
+  //region Serialized mutations
+  /**
+   * @public
+   * @author ddj 2026年10月08号
+   * @description Acquire a synchronous page-wide lock before validation/RPC. Duplicate actions are rejected; failed saves never call commit.
+   * @param label Busy indicator key.
+   * @param task Validation and RPC work, including synchronous configuration errors.
+   * @param commit Apply successful result; may reset and close a save form.
+   * @returns Whether this mutation committed successfully while mounted.
+   */
+  async mutate<T extends Result>(label: string, task: () => Promise<T>, commit: (result: T) => void): Promise<boolean> {
+    if (this.disposed || this.view.busy) return false
+    this.invalidate()
+    this.view.busy = label
+    this.view.error = ''
+    this.emit()
+    try {
+      const result = await task()
+      if (!result.ok) throw new Error(result.error)
+      if (this.disposed) return false
+      commit(result)
+      return true
+    } catch (error) {
+      if (!this.disposed) this.view.error = String(error)
+      return false
+    } finally {
+      if (!this.disposed) {
+        this.view.busy = ''
+        this.emit()
+        this.schedule()
+      }
+    }
+  }
+  //endregion
+}

package/src/client/monaco/diffRender.ts

@@ -175,6 +175,9 @@ export function createDiffRenderer(log) {
       const overlay = root && root.querySelector('.edrv-minus-overlay')
       if (overlay) overlay.innerHTML = ''
     }
+    // #region debug log
+    try { log(sessionId, '[DEBUG diffRender] regions=' + pendingRegions.length + ' zones=' + createdZones.length + ' ms=' + (Date.now() - renderT0)) } catch (e) { /* 诊断不可影响渲染 */ }
+    // #endregion
   }
 
   /** 卸载清理（EditorView unmount 时调用）。 */

package/src/client/state/regions.ts

@@ -29,6 +29,24 @@ export function countLinesBefore(text: string, index: number): number {
   return lineBefore(text, index)
 }
 
+/**
+ * 在预计算的换行位置中找出 offset 前的行数。
+ * @author ddj 2026年09月29号
+ * @param breaks 换行符位置（递增）
+ * @param offset 目标位置
+ * @returns 目标位置前的换行数
+ */
+function lineAt(breaks: number[], offset: number): number {
+  let left = 0
+  let right = breaks.length
+  while (left < right) {
+    const middle = (left + right) >>> 1
+    if (breaks[middle] < offset) left = middle + 1
+    else right = middle
+  }
+  return left
+}
+
 /**
  * 行级公共前缀/后缀裁剪：old/new 首尾相同的行视为未变化（上下文），只保留真正变更的中间段。
  * @author ddj 2026年08月20号
@@ -58,6 +76,8 @@ export function diffRegions(records: RecordView[], content: string | null): Regi
   if (content === null) return regions
   const normalized = normalizeForCompare(content)
   const lines = splitLines(normalized)
+  const breaks: number[] = []
+  for (let index = normalized.indexOf('\n'); index >= 0; index = normalized.indexOf('\n', index + 1)) breaks.push(index)
   for (const rec of records) {
     if (rec.create) {
       for (let i = 0; i < rec.hunks.length; i++) {
@@ -81,7 +101,7 @@ export function diffRegions(records: RecordView[], content: string | null): Regi
         regions.push({ callId: rec.callId, idx: entry.idx, stale: true, status, create: false, oldLines: entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n'), newLines: entry.hunk.newText ? entry.hunk.newText.split('\n') : [], rec, superseded: rec.superseded === true })
         continue
       }
-      const start = countLinesBefore(normalized, location.start) + 1
+      const start = lineAt(breaks, location.start) + 1
       const oldLines = entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n')
       const newLines = entry.hunk.newText.split('\n')
       const trimmed = trimCommonLines(oldLines, newLines)

package/src/client/styles/editor.css

@@ -248,6 +248,18 @@
   [data-edrv-diff-dock-shell] .edrv-diffbar-editor-content { width: max-content; }
   [data-edrv-diff-dock-shell] .edrv-diffbar-files .edrv-diffbar-file { max-width: 160px; }
 }
+/* 侧栏差异栏在编辑内容底部居中悬浮，按内容宽度收缩；窄栏只在工具条内横滚。@author ddj 2026年09月29号 */
+[data-edrv-view] .edrv-side-diff-dock[data-edrv-diff-dock-shell] { position: absolute; left: 50%; bottom: 28px; z-index: 25; width: max-content; max-width: calc(100% - 20px); max-height: min(300px, calc(100% - 38px)); margin: 0; transform: translateX(-50%); border-radius: 12px; background: var(--dsw-alias-bg-overlay, #fff); box-shadow: 0 6px 20px rgba(0,0,0,.18); overflow-x: hidden; overflow-y: auto; }
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-editor-row { padding-inline: 8px; }
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-editor-content { gap: 5px; width: max-content; }
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-nav,
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-files,
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-actions { gap: 3px; }
+[data-edrv-view] .edrv-side-diff-dock .edrv-pill { padding-inline: 5px; }
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-files .edrv-diffbar-file { min-width: 0; max-width: 72px; }
+[data-edrv-view] .edrv-side-diff-dock .edrv-diffbar-details-toggle { width: 26px; min-width: 26px; }
+[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; }
 
 /* ===== 侧边栏（活动栏 + 面板区 + 文件树） ===== */
 [data-edrv-view] .edrv-editor-row { display: flex; flex: 1 1 auto; min-width: 0; min-height: 0; overflow: hidden; }

package/src/client/styles/mcp.css

@@ -49,16 +49,19 @@
 .vsm-mcp-card-head{display:flex;justify-content:space-between;align-items:center;gap:12px}
 .vsm-mcp-title{display:flex;align-items:center;gap:9px;font-weight:600;font-size:14px;color:var(--dsw-alias-label-primary,#e6e6e6);min-width:0}
 .vsm-mcp-source{font-size:11px;font-weight:400;padding:2px 7px;border-radius:4px;background:var(--dsw-alias-bg-mask-2,#ffffff22);color:var(--dsw-alias-label-tertiary,#9aa5b1);flex-shrink:0}
-.vsm-mcp-dot{width:8px;height:8px;border-radius:50%;flex-shrink:0;background:var(--dsw-alias-state-error-primary,#e05252)}
+.vsm-mcp-dot{width:8px;height:8px;border-radius:50%;flex-shrink:0;background:var(--dsw-alias-label-tertiary,#9aa5b1)}
 .vsm-mcp-dot.connected{background:var(--dsw-alias-state-success-primary,#38bd75)}
 .vsm-mcp-dot.connecting{background:var(--dsw-alias-state-warn-primary,#e5b93f)}
-.vsm-mcp-dot.disabled{background:var(--dsw-alias-label-tertiary,#9aa5b1)}
+.vsm-mcp-dot.error{background:var(--dsw-alias-state-error-primary,#e05252)}
+.vsm-mcp-dot.disabled,.vsm-mcp-dot.neutral,.vsm-mcp-dot.configured,.vsm-mcp-dot.unverified{background:var(--dsw-alias-label-tertiary,#9aa5b1)}
 .vsm-mcp-actions{display:flex;align-items:center;gap:4px;flex-shrink:0}
 .vsm-mcp-actions button{border:0;background:none;color:var(--dsw-alias-label-tertiary,#9aa5b1);cursor:pointer;font-size:15px;width:28px;height:28px;border-radius:6px;line-height:1}
 .vsm-mcp-actions button:hover{color:var(--dsw-alias-label-primary,#fff);background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}
 .vsm-mcp-actions button.vsm-danger:hover{color:var(--dsw-alias-state-error-primary,#f07878);background:var(--dsw-alias-interactive-bg-hover-danger,#ff000014)}
 .vsm-switch{font-size:14px !important}
-.vsm-switch.on{color:var(--dsw-alias-state-success-primary,#38bd75)}
+/* 配置启用使用品牌色，不冒充在线状态；在线证据仅由 connected 圆点表达。 */
+.vsm-switch.on{color:var(--dsw-alias-brand-primary,#6d55ff)}
+.vsm-mcp-actions button:disabled,.vsm-mcp-dialog-actions button:disabled{opacity:.55;cursor:default}
 .vsm-mcp-meta{font-size:12px;color:var(--dsw-alias-label-tertiary,#9aa5b1);margin:9px 0}
 .vsm-mcp-error{color:var(--dsw-alias-state-error-primary,#f07878);font-size:12px;margin:8px 0}
 .vsm-mcp-banner{padding:9px 12px;border:1px solid var(--dsw-alias-state-error-secondary,#d9534f55);border-radius:6px;background:var(--dsw-alias-state-error-secondary,#d9534f1a);margin-bottom:10px}

package/src/client/ui/ConversationDiffDock.ts

@@ -9,7 +9,7 @@ import { rpc } from '../rpc.js'
 import { openDiffView } from '../events.js'
 import { summarize } from '../state/records.js'
 import { nextDiffPath } from '../diffDock.js'
-import { readDiffDock, subscribeDiffDock } from '../diffDockStore.js'
+import { dockInLayout, readDiffDock, subscribeDiffDock } from '../diffDockStore.js'
 import { DiffBox } from './DiffBox.js'
 import { CommandPalette } from './CommandPalette.js'
 
@@ -65,7 +65,7 @@ export function ConversationDiffDock(props) {
   // 与 EditorView 同时挂载时由 commandPaletteStore 的单实例认领保证只渲染一份。
   const palette = React.createElement(CommandPalette, { key: 'edrv-palette', sessionId })
   if (editorSnapshot) {
-    if (editorSnapshot.mode === 'editor-empty' && !editorSnapshot.fileTotal) return palette
+    if (!dockInLayout(editorSnapshot, 'tab')) return palette
     return React.createElement(React.Fragment, null,
       renderDock(React.createElement(DiffBox, Object.assign({}, editorSnapshot, { dock: true })), sessionId),
       palette)

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)
     }
   }