dsh-vscode-mode 0.21.0 → 0.21.2

package/package.json

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

@@ -206,7 +206,10 @@ export function refOf(mention: string, range: RefRange | undefined): string {
     : `${mention} L${range.startLine}-${range.endLine}`
 }
 
-/** 构造 DSH 文件引用插入载荷（source=reference，发送序列化为 mention(+range) 文本）。
+/** 构造 DSH 文件引用插入载荷，模型文本、剪贴板投影与降级文本共用完整行区间。
+ * @public
+ * @author ddj 2026年10月28号
+ * @returns 引用载荷与含可选行区间的完整引用文本
  * @param path 目标路径（相对 cwd 或绝对）
  * @param cwd 会话工作区目录（可选）
  * @param range 行区间（可选）
@@ -218,12 +221,13 @@ export function buildFileRef(
   range?: RefRange,
   appearance: RefAppearance = 'file',
 ): { reference: ReferenceInsertLike; mention: string } {
-  const mention = mentionOf(path, cwd)
+  const mention = refOf(mentionOf(path, cwd), range)
+
   return {
     mention,
     reference: {
       source: REF_SOURCE,
-      ref: refOf(mention, range),
+      ref: mention,
       label: labelOf(path, range),
       appearance,
       clipboardText: mention,
@@ -264,6 +268,41 @@ export interface TokenSpanLike {
 /** ctx 依赖的最小面（sessions.scope + conversation.input）。 */
 export interface CtxLike {
   get: (name: string) => unknown
+  effect?: (setup: () => () => void, label?: string) => (() => void)
+}
+
+/** Public Controller subset; old Hosts need not provide retain/binding. */
+interface SessionBridge {
+  retain?: (id: string, options: { source: 'controllerOperation'; signal: AbortSignal }) => {
+    ready: Promise<{ session: { prompt(content: { type: 'text'; text: string }[], mode: 'queue', signal: AbortSignal): Promise<{ ok: boolean }> } }>
+    release(): void
+  }
+  binding?: (id: string) => { ctx: unknown } | undefined
+  scope?: (id: string) => unknown
+}
+
+/** @private @author ddj 2026年10月28号 @param ctx Lifecycle owner. @param sessions Public Controller. @param id Fixed target. @param text Task body. @returns Acceptance; failures never retry another transport. @sideEffects Retains one generation until completion or unload. */
+async function sendOwned(ctx: CtxLike, sessions: SessionBridge, id: string, text: string): Promise<boolean> {
+  const controller = new AbortController()
+  const reference = sessions.retain!(id, { source: 'controllerOperation', signal: controller.signal })
+  let released = false
+  /** @private @author ddj 2026年10月28号 Cancel pending admission and release this exact generation once. */
+  function release(): void {
+    if (released) return
+    released = true
+    controller.abort()
+    reference.release()
+  }
+  let remove: (() => void) | undefined
+  try {
+    remove = ctx.effect?.(() => release, 'vscode-mode: task session reference')
+    const binding = await reference.ready
+    if (controller.signal.aborted) return false
+    return (await binding.session.prompt([{ type: 'text', text }], 'queue', controller.signal)).ok === true
+  } finally {
+    release()
+    remove?.()
+  }
 }
 
 /** 新建会话结果（ok=false 供调用方降级回当前对话注入）。 */
@@ -368,8 +407,9 @@ export async function apiSessionPrompt(sessionId: string, text: string): Promise
 
 /**
  * 新建独立会话承载旁路任务（02-deep-session-prompt：深度分析不污染当前对话）。
- * 主路径 = apiproxy wire 直调（不依赖 service 面形态猜测）；回落 remote.session.create
- * 与旧 sessions.create 两代 service 面（宽松解析）。任一步不符返回 ok:false，调用方降级。
+ * 优先公开 sessions.create；旧 Host 按能力选择 remote 或 wire，调用后不换通道重试。
+ * 受理状态不明时返回 ok:false，不重复创建会话。
+ * @author ddj 2026年10月28号
  * @author ddj 2026年09月23号
  * @param ctx 客户端服务上下文（remote.session + sessions，仅回落用）
  * @param cwd 新会话工作区目录（与当前会话同工作区）
@@ -391,21 +431,20 @@ export async function newDraftSession(ctx: CtxLike, cwd: string | undefined): Pr
           : ''
       if (id) return { ok: true, id }
     }
-  } catch { /* 回落下一通道 */ }
+    // A create call may have succeeded remotely even when its receipt is unavailable.
+    if (typeof sessions?.create === 'function') return { ok: false }
+  } catch { return { ok: false } }
   try {
-    // 回落 1：api.sessions service 面（返回信封 {rpcId, result}，见 rpcOk；多形态容错）
+    // Legacy Hosts select one known transport; never retry a non-idempotent create.
     const remote = ctx.get('remote.session') as { create?: (req: unknown) => Promise<unknown> } | undefined
     if (typeof remote?.create === 'function') {
       const payload = cwd ? { cwd } : {}
-      for (const arg of [slotArg(payload), { request: { rpcId: mintRpcId(), payload } }, { rpcId: mintRpcId(), payload }, payload]) {
-        try {
-          const r = rpcOk(await remote.create(arg))
-          const id = r.value as { sessionId?: unknown } | undefined
-          if (r.ok && typeof id?.sessionId === 'string') return { ok: true, id: id.sessionId }
-        } catch { /* 单形态失败试下一形态 */ }
-      }
+      const receipt = rpcOk(await remote.create(slotArg(payload)))
+      const created = receipt.value as { sessionId?: unknown } | undefined
+      if (receipt.ok && typeof created?.sessionId === 'string') return { ok: true, id: created.sessionId }
+      return { ok: false }
     }
-  } catch { /* 回落 wire */ }
+  } catch { return { ok: false } }
   // 回落 2：wire 直调（创建成功但 store 无感，open 切换不保证；任务发送仍可用）
   try {
     const id = await apiSessionCreate(cwd)
@@ -441,9 +480,9 @@ export interface AddToConversation {
 export function inputFor(ctx: CtxLike, sessionId: string | undefined): InputLike | undefined {
   if (!sessionId) return undefined
   try {
-    const sessions = ctx.get('sessions') as { scope?: (id: string) => unknown } | undefined
+    const sessions = ctx.get('sessions') as SessionBridge | undefined
     const conversation = ctx.get('conversation') as { input?: { for: (actx: unknown) => unknown } } | undefined
-    const actx = sessions?.scope?.(sessionId)
+    const actx = typeof sessions?.binding === 'function' ? sessions.binding(sessionId)?.ctx : sessions?.scope?.(sessionId)
     const shell = actx && conversation?.input?.for?.(actx)
     // 探针须是我们的**实际依赖**（insertReference），而不是会被整篇重建的 setDraft
     return (shell && typeof (shell as InputLike).insertReference === 'function') ? shell as InputLike : undefined
@@ -569,13 +608,15 @@ export function createAddToConversation(ctx: CtxLike): AddToConversation {
   /**
    * 新建独立会话（02-deep-session-prompt：旁路任务不污染当前对话）。
    * 闭包持有真服务 ctx（面板 SidebarCtx 无 .get，会话操作必须经此门面）；
-   * 创建后尽力 `sessions.open(id)` 切换视图（缺失不致命，草稿仍可写入）。
+   * 新版仅返回已登记身份，视图选择由宿主负责；旧版保留可用的 open/select。
+   * @author ddj 2026年10月28号
    * @author ddj 2026年09月23号
    * @param cwd 新会话工作区目录（与当前会话同工作区）
    * @returns 新会话结果（失败供降级）
    */
   const startDraftSession: AddToConversation['startDraftSession'] = async (cwd) => {
     const result = await newDraftSession(ctx, cwd)
+    if (typeof (ctx.get('sessions') as SessionBridge | undefined)?.retain === 'function') return result
     if (result.ok && result.id) {
       try {
         // 主动铸造 scope（scope 对新会话惰性铸造，inputFor/composer 面依赖它）
@@ -598,48 +639,32 @@ export function createAddToConversation(ctx: CtxLike): AddToConversation {
 
   /**
    * 发送任务给目标会话 agent（点击即发送方案：任务落地会话即非 blank，列表可见）。
-   * 主路径 wire 直发 session/prompt；回落 remote.session.prompt service 面。
-   * @author ddj 2026年09月23号
+   * 新版持有目标 Controller 到 prompt 结束；旧版按能力选择唯一通道，不跨通道重发。
+   * @author ddj 2026年09月23号 / 2026年10月28号
    * @param sessionId 目标会话 id
    * @param text 任务文本
    * @returns 是否受理
    */
   const sendTask: AddToConversation['sendTask'] = async (sessionId, text) => {
     if (!sessionId) return false
-    // 主路径：**官方 composer 发送链路**（InputLike setDraft + submit —— UI「发送」的内部路径）。
-    // inputFor 依赖 sessions.scope(id)：新会话铸造有时延，重试 3 次后再降级。
-    const composerOnce = async (): Promise<boolean> => {
-      const input = inputFor(ctx, sessionId) as { setDraft?: (t: string) => void; submit?: (mode?: unknown) => void } | undefined
-      if (input && typeof input.setDraft === 'function' && typeof input.submit === 'function') {
+    try {
+      const sessions = ctx.get('sessions') as SessionBridge | undefined
+      if (typeof sessions?.retain === 'function') return await sendOwned(ctx, sessions, sessionId, text)
+
+      // Legacy composer remains an exclusive channel; never overwrite the draft and then retry elsewhere.
+      const input = inputFor(ctx, sessionId) as { setDraft?: (task: string) => void; submit?: () => void } | undefined
+      if (typeof input?.setDraft === 'function' && typeof input.submit === 'function') {
         input.setDraft(text)
         input.submit()
         return true
       }
-      return false
-    }
-    try {
-      for (let attempt = 3; attempt > 0; attempt--) {
-        if (await composerOnce()) return true
-        if (attempt > 1) await new Promise((resolve) => setTimeout(resolve, 500))
-      }
-    } catch { /* 降级下一通道 */ }
-    // 兜底 1：remote.session service 面（多形态容错）
-    try {
       const remote = ctx.get('remote.session') as { prompt?: (req: unknown) => Promise<unknown> } | undefined
       if (typeof remote?.prompt === 'function') {
         const payload = { sessionId, mode: 'queue', content: [{ type: 'text', text }] }
-        for (const arg of [slotArg(payload), { request: { rpcId: mintRpcId(), payload } }, { rpcId: mintRpcId(), payload }, payload]) {
-          try {
-            if (rpcOk(await remote.prompt(arg)).ok) return true
-          } catch { /* 单形态失败试下一形态 */ }
-        }
+        return rpcOk(await remote.prompt(slotArg(payload))).ok
       }
-    } catch { /* 降级下一通道 */ }
-    // 兜底 2：HTTP wire
-    try {
       return await apiSessionPrompt(sessionId, text)
-    } catch { /* 全失败 */ }
-    return false
+    } catch { return false }
   }
 
   return { appendReference, appendText, startDraftSession, sendTask }

package/src/client/missingReview.ts

@@ -0,0 +1,40 @@
+import type { MissingReview } from '../shared/types.js'
+import { splitLines } from '../shared/diff.js'
+
+/** @public @author ddj 2026年10月28号 @param review Frozen complete snapshot. @returns One whole-file deletion, including empty files; no invented current lines. */
+export function missingRegion(review: MissingReview) {
+  return {
+    callId: review.callIds[0], idx: 0, start: 1, end: 1, oldStart: 1,
+    oldLines: splitLines(review.content.replace(/\r\n/g, '\n')), newLines: [], whole: true,
+    status: 'pending', create: false, superseded: false, sourceKind: 'missing',
+  }
+}
+
+interface MissingBatchApi {
+  query(path: string): Promise<{ ok: true; review: MissingReview | null } | { ok: false; error: string }>
+  decide(review: MissingReview, operationId: string): Promise<{ ok: true; callIds: string[] } | { ok: false; error: string }>
+  guard(): void
+  operation(review: MissingReview): string
+  committed(review: MissingReview, callIds: string[]): void
+}
+
+/** @public @author ddj 2026年10月28号 @param paths Batch paths. @param api Guarded Host access. @returns Missing paths handled once; a partial failure stops before legacy hunk writes. @throws Missing evidence, changed lifecycle or Host decision failure. */
+export async function missingBatch(paths: string[], api: MissingBatchApi): Promise<Set<string>> {
+  const candidates: MissingReview[] = []
+  for (const path of new Set(paths)) {
+    api.guard()
+    const result = await api.query(path)
+    if (!result.ok) throw new Error(result.error)
+    if (result.review) candidates.push(result.review)
+  }
+
+  const completed = new Set<string>()
+  for (const review of candidates) {
+    api.guard()
+    const result = await api.decide(review, api.operation(review))
+    if (!result.ok) throw new Error(`已处理 ${completed.size} 个删除文件，其余未处理。${result.error}`)
+    completed.add(review.path)
+    api.committed(review, result.callIds)
+  }
+  return completed
+}

package/src/client/ui/EditorView.ts

@@ -61,6 +61,7 @@ import { applyOfficial, editorFont, registerThemes, themeNameOf } from '../monac
 import { createDiffRenderer } from '../monaco/diffRender.js'
 import { ST, callIdAttr, noopHunk, summarize } from '../state/records.js'
 import { diffRegions } from '../state/regions.js'
+import { missingBatch, missingRegion } from '../missingReview.js'
 import { QuickOpen } from './QuickOpen.js'
 import { attachHorizontalWheel } from './horizontalWheel.js'
 import { CommandPalette } from './CommandPalette.js'
@@ -319,6 +320,9 @@ export function EditorView(props) {
   const [dirtyMap, setDirtyMap] = React.useState({})
   const [content, setContent] = React.useState(null)
   const [contentPath, setContentPath] = React.useState(null)
+  const [missingPreview, setMissingPreview] = React.useState(null)
+  const missingRef = React.useRef(new Map())
+  const missingNow = missingPreview?.path === active && missingPreview?.sessionId === sessionId ? missingPreview : null
   const [receiptLoad, setReceiptLoad] = React.useState(null) // { sessionId, path, sequence, status, error }
   const [imageSrc, setImageSrc] = React.useState(null) // 图片预览 data URL（图片 tab 专用，文本 tab 恒为 null）
   const [imgSize, setImgSize] = React.useState(null) // 图片自然尺寸 { w, h }（路径栏 meta）
@@ -634,17 +638,25 @@ export function EditorView(props) {
     const trace = isDebug() && contentReady && currentRecords.length > 0
     const start = trace ? performance.now() : 0
     // #endregion
-    const next = officialDetail
-      ? reviewRegions(officialDetail.diff, officialDetail.item.id, officialDetail.blocks ?? [], contentReady ? content : null)
-      : diffRegions(currentRecords, contentReady ? content : null).filter((r) => !r.superseded)
+    let next
+    if (officialDetail) {
+      next = reviewRegions(officialDetail.diff, officialDetail.item.id, officialDetail.blocks ?? [], contentReady ? content : null)
+    } else if (missingNow && contentReady) {
+      next = missingNow.resolved ? [] : [missingRegion(missingNow)]
+    } else {
+      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, officialDetail])
+  }, [currentRecords, content, contentPath, active, officialDetail, missingNow])
   // useMemo 稳定引用：否则 hover 等重渲染会让 view zone effect 反复重建（- 号闪烁）
+  React.useEffect(() => {
+    editorRef.current?.updateOptions({ readOnly: !!missingNow })
+  }, [missingNow, active, content, monaco])
   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])
   const staleMissing = staleRegions.filter((region) => region.staleReason === 'missing').length
@@ -1109,7 +1121,10 @@ export function EditorView(props) {
     /** @author ddj 2026年09月28号 @param res Disk content for a still-clean cached model. */
     const accept = (res) => {
       if (!loadCurrent(path, sequence) || dirtyRef.current[path] || model.getValue() !== before) return
+      if (res?.code === 'file-missing') { void loadMissing(path, sid, sequence); return }
       if (!res?.ok) return
+      missingRef.current.delete(path)
+      setMissingPreview(null)
       mark(res.version)
       if (res.content === before) return
       saveViewState(path)
@@ -1130,6 +1145,27 @@ export function EditorView(props) {
    * @param force 强制走 RPC（reloadFile 用，跳过 model 复用）
    * @param version 已知磁盘版本（缺省走 RPC 返回值）
    */
+  /** @private @author ddj 2026年10月28号 @param path Missing text file. @param sid Owning session. @param seq Loader generation. @sideEffects Loads deletion evidence without creating or saving the file. */
+  async function loadMissing(path, sid, seq) {
+    try {
+      const result = await rpc('edrv.missingReview', { sessionId: sid, path })
+      if (!loadCurrent(path, seq)) return
+      if (!result.ok) { failLoad(path, sid, seq, result.error); return }
+      if (!result.review) { loadContent(path, sid, true); return }
+      if (dirtyRef.current[path] || savingRef.current.has(path)) { failLoad(path, sid, seq, '文件已删除，但有未保存编辑；请先处理本地缓冲'); return }
+      const preview = { ...result.review, sessionId: sid, keepId: crypto.randomUUID(), undoId: crypto.randomUUID() }
+      missingRef.current.set(path, preview)
+      setMissingPreview(preview)
+      setContent('')
+      setContentPath(path)
+      setLoadError(null)
+      setError(null)
+      stampLoad(path, sid, seq)
+      setLoadStage({ progress: 100, message: '文件已删除 · 展示最后记录快照' })
+      setStatus('文件已删除 · 展示最后记录快照（只读）')
+    } catch (cause) { if (loadCurrent(path, seq)) failLoad(path, sid, seq, String(cause)) }
+  }
+
   const loadContent = (path, sid, force, version) => {
     const seq = ++loadSeqRef.current
     setReceiptLoad({ path, cwd, sessionId: sid, sequence: seq, status: 'loading' })
@@ -1176,7 +1212,7 @@ export function EditorView(props) {
       loadPdf(path, sid, seq, force === true, version)
       return
     }
-    const cachedModel = force ? null : modelsRef.current.get(path)
+    const cachedModel = force || missingRef.current.has(path) ? null : modelsRef.current.get(path)
     if (cachedModel) {
       // model 命中：直接显示其内容（切 tab 零等待），后台静默校验
       setContent(cachedModel.getValue())
@@ -1199,6 +1235,8 @@ export function EditorView(props) {
       // #endregion
       if (!loadCurrent(path, seq)) return
       if (res && res.ok) {
+        missingRef.current.delete(path)
+        setMissingPreview(null)
         mark(res.version, true)
         setContent(res.content)
         setContentPath(path)
@@ -1206,6 +1244,7 @@ export function EditorView(props) {
         setLoadStage((prev) => ({ progress: Math.max(84, prev.progress), message: '文件已读取，准备创建编辑器…' }))
         setStatus('已加载')
       } else {
+        if (res?.code === 'file-missing') { void loadMissing(path, sid, seq); return }
         if (res?.code === 'file-too-large') setLargeCandidate(JSON.stringify([scope, sid, path]))
         const base = res?.error ? String(res.error) : '读取失败'
         dapTrace('read-failed', { path, error: base, resolvedPath: res?.resolvedPath, cwd })
@@ -1409,6 +1448,9 @@ export function EditorView(props) {
       emitRefresh({ scope, paths: [change.path], kind: 'text', eventId })
       return
     }
+    if (change.kind === 'deleted' && change.path === activeRef.current && !dirtyRef.current[change.path] && !savingRef.current.has(change.path)) {
+      loadContent(change.path, sessionId, true)
+    }
     const kind = change.kind === 'deleted' ? 'deleted' : 'conflict'
     markDiskFlag(readSync(scope, change.path) ?? { path: change.path, kind, at: Date.now() })
     setStatus(kind === 'deleted' ? '文件已被外部删除' : '外部已修改（未保存的编辑保留）')
@@ -2351,6 +2393,7 @@ export function EditorView(props) {
   /** @private @author ddj 2026年10月14号 @param path Canonical path. @param manual Explicit save. @returns Guarded save, never another pane's content. */
   function saveDocument(path, manual) {
     if (isExcelPath(path)) return Promise.resolve({ ok: false })
+    if (missingRef.current.has(path)) { setStatus('删除预览只读；请使用 Keep / Undo'); return Promise.resolve({ ok: false }) }
     const model = modelsRef.current.get(path)
     if (!model) return Promise.resolve({ ok: false })
     const store = documents()
@@ -2409,7 +2452,7 @@ export function EditorView(props) {
     const ed = editorRef.current
     const model = ed?.getModel()
     const path = [...modelsRef.current].find(([, item]) => item === model)?.[0]
-    if (!ed || !path) return
+    if (!ed || !path || missingRef.current.has(path)) return
     setDirtyMap((d) => Object.assign({}, d, { [path]: true }))
     // 编辑即「使用」：需求 2 的淘汰口径是「最近没有改动」，故有改动时刷新 LRU 序号，
     // 使长时间只在某文件里编辑的页签不会被其它文件的打开动作挤出。
@@ -2533,6 +2576,7 @@ export function EditorView(props) {
     const side = layoutRef.current === 'side'
     const ed = m.editor.create(node, {
       value: '',
+      readOnly: missingRef.current.has(activeRef.current),
       language: 'plaintext',
       theme: themeNameOf(),
       fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)',
@@ -3149,6 +3193,7 @@ export function EditorView(props) {
    * @returns Promise<boolean> 是否成功
    */
   const actHunk = (region, reject, silent) => {
+    if (region.sourceKind === 'missing') return decideMissing(reject)
     if (region.sourceKind === 'official') return decideOfficial(reject, region.id)
     const method = reject ? 'edrv.reject' : 'edrv.accept'
     // #region debug log
@@ -3280,7 +3325,35 @@ export function EditorView(props) {
     finally { batchBusyRef.current = false }
   }
 
+  /** @private @author ddj 2026年10月28号 @param reject Restore the shown snapshot instead of keeping absence. @returns Safe whole-file decision, never a hunk reversal. */
+  async function decideMissing(reject) {
+    if (batchBusyRef.current || !missingNow || missingNow.resolved) return false
+    const preview = missingNow
+    const lifetime = reviewLifeRef.current
+    batchBusyRef.current = true
+    setReviewBatchBusy(true)
+    try {
+      guardReviewAll(reject, lifetime)
+      const result = await rpc('edrv.missingDecide', { sessionId, token: preview.token, operationId: reject ? preview.undoId : preview.keepId, undo: reject })
+      if (!lifetime?.live) return false
+      if (!result.ok) { setError(result.error); return false }
+      setRecords((previous) => Object.fromEntries(Object.entries(previous).filter(([id]) => !result.callIds.includes(id))))
+      missingRef.current.set(preview.path, { ...preview, resolved: true })
+      if (activeRef.current === preview.path) {
+        if (reject) loadContent(preview.path, sessionId, true)
+        else setMissingPreview({ ...preview, resolved: true })
+      }
+      refreshRecords()
+      emitRefresh({ scope, paths: [preview.path], kind: 'structure' })
+      setStatus(reject ? '已恢复展示的完整历史快照' : '已保留文件删除')
+      setError(null)
+      return true
+    } catch (cause) { if (lifetime?.live) setError(String(cause)); return false }
+    finally { batchBusyRef.current = false; if (lifetime?.live) setReviewBatchBusy(false) }
+  }
+
   const acceptFile = () => {
+    if (missingNow && !officialDetail) return decideMissing(false)
     if (officialDetail) return decideOfficial(false)
     if (batchBusyRef.current || !decideRegions.length) return
     batchBusyRef.current = true
@@ -3293,6 +3366,7 @@ export function EditorView(props) {
     }).catch(() => { batchBusyRef.current = false })
   }
   const undoFile = () => {
+    if (missingNow && !officialDetail) return decideMissing(true)
     if (officialDetail) return decideOfficial(true)
     if (batchBusyRef.current || !decideRegions.length) return
     batchBusyRef.current = true
@@ -3325,18 +3399,47 @@ export function EditorView(props) {
    * @author ddj 2026年08月20号
    * @param reject true=全部不采纳（回滚），false=全部采纳
    */
-  const actAllPending = (reject) => {
+  const actAllPending = async (reject) => {
     if (batchBusyRef.current || !allPending.length) return
+    const lifetime = reviewLifeRef.current
     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))]
-    return actMany(list.map((r) => itemOf(r, reject))).then((result) => {
-      batchBusyRef.current = false
-      reloadFile(true)
-      emitRefresh({ scope, paths: paths.length ? paths : undefined, kind: 'structure' })
-      setStatus(decideStatus(reject ? '已不采纳 ' : '已采纳 ', result))
-      if (result.fail) setError(result.fail + ' 处差异处理失败（可能已被后续修改影响），可刷新后重试')
-    }).catch(() => { batchBusyRef.current = false })
+    try {
+      const handled = await missingBatch(paths, {
+        query: async (path) => {
+          // The active deletion must use exactly the evidence the user saw.
+          const cached = missingRef.current.get(path)
+          if (cached?.sessionId === sessionId && !cached.resolved) return { ok: true, review: cached }
+          const result = await rpc('edrv.missingReview', { sessionId, path })
+          if (result.ok && result.review) {
+            const preview = { ...result.review, sessionId, keepId: crypto.randomUUID(), undoId: crypto.randomUUID() }
+            missingRef.current.set(path, preview)
+            return { ok: true, review: preview }
+          }
+          return result
+        },
+        decide: (preview, operationId) => rpc('edrv.missingDecide', { sessionId, token: preview.token, operationId, undo: reject }),
+        guard: () => guardReviewAll(reject, lifetime),
+        operation: (preview) => reject ? preview.undoId : preview.keepId,
+        committed: (preview, callIds) => {
+          if (!lifetime?.live) return
+          missingRef.current.set(preview.path, { ...preview, resolved: true })
+          setRecords((previous) => Object.fromEntries(Object.entries(previous).filter(([id]) => !callIds.includes(id))))
+          if (!reject && sameFile(activeRef.current, preview.path)) setMissingPreview({ ...preview, path: activeRef.current, sessionId, resolved: true })
+          emitRefresh({ scope, paths: [preview.path], kind: 'structure' })
+        },
+      })
+      guardReviewAll(reject, lifetime)
+      const remaining = list.filter((item) => !handled.has(records[item.callId]?.path))
+      const result = await actMany(remaining.map((item) => itemOf(item, reject)))
+      if (!lifetime?.live) return
+      if (reject || !missingNow) reloadFile(true)
+      emitRefresh({ scope, paths, kind: 'structure' })
+      setStatus(decideStatus(reject ? '已不采纳 ' : '已采纳 ', result) + `；删除文件 ${handled.size} 个`)
+      if (result.fail) setError(result.fail + ' 处差异处理失败，可刷新后重试')
+    } catch (cause) { if (lifetime?.live) setError(String(cause)) }
+    finally { batchBusyRef.current = false; if (lifetime?.live) refreshRecords() }
   }
   /** @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) {
@@ -4584,6 +4687,7 @@ export function EditorView(props) {
   const reviewErrorText = !rawReviewError ? undefined : sessionDown ? SESSION_DOWN_NOTICE : sessionErrorText(rawReviewError)
   const buildDockSnapshot = () => ({
     mode: editorDockMode(active),
+    missingDeletion: !!missingNow,
     official: officialFile ? { sessionId, page: review.page, path: officialFile,
       pending: sum.files.find((file) => sameFile(file.path, active))?.pending ?? 0,
       detail: officialDetail, records: officialRecords, onSelect: setSelectedReview } : null,

package/src/client/ui/SidecarDiffBar.tsx

@@ -22,6 +22,7 @@ export interface SidecarRegion {
 /** 侧车栏输入：字段与官方栏对齐，缺的是官方记录元数据，多的是侧车区域的 keep/undo 能力。 */
 export interface SidecarBarProps {
   activePath?: string
+  missingDeletion?: boolean
   pendingRegions?: SidecarRegion[]
   staleRegions?: SidecarRegion[]
   diffIdx?: number
@@ -115,6 +116,7 @@ export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
       keepTitle="把这批历史改动全部标记为已看过（只改记录，不动磁盘文件）"
       undoTitle="逐项撤销这些历史改动；缺少证据或遇到冲突即停止"
     />
+    {props.missingDeletion ? <div className="edrv-review-notice" role="status">文件已删除 · 展示最后记录快照。Keep 保留删除；Undo 恢复展示的完整快照。</div> : null}
     {busy ? <div className="edrv-review-notice" role="status">正在处理历史改动…</div> : null}
     {down ? <div className="edrv-review-notice edrv-review-notice-warn edrv-sidecar-down" role="status">
       <span className="edrv-sidecar-down-text">{down.text}</span>
@@ -137,8 +139,8 @@ export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
         {navButton('down', '下一个差异', props.onNextDiff, !count, view.navNextTitle)}
       </div>
       <div className="edrv-review-actions">
-        <Button size="sm" variant="ghost" className="edrv-review-undo" icon={barIcon('undo')} onClick={props.onUndoFile} disabled={!canDecide} title={SIDECAR_UNDO_TITLE}>Undo</Button>
-        <Button size="sm" variant="primary" className="edrv-review-keep" icon={barIcon('check')} onClick={props.onAcceptFile} disabled={!canDecide} title={SIDECAR_KEEP_TITLE}>Keep</Button>
+        <Button size="sm" variant="ghost" className="edrv-review-undo" icon={barIcon('undo')} onClick={props.onUndoFile} disabled={!canDecide} title={props.missingDeletion ? '恢复展示的完整历史快照（不会覆盖重新出现的文件）' : SIDECAR_UNDO_TITLE}>Undo</Button>
+        <Button size="sm" variant="primary" className="edrv-review-keep" icon={barIcon('check')} onClick={props.onAcceptFile} disabled={!canDecide} title={props.missingDeletion ? '保持文件删除并结清覆盖的待审历史记录，不写文件' : SIDECAR_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: '归档 / 历史' }, { id: 'rollback', label: '回滚当前文件' }, { id: 'refresh', label: '刷新' }]} onSelect={(id: string) => {
           if (id === 'rollback') { setMenu(null); props.onRollback?.(); return }

package/src/mcpDiagnostic.ts

@@ -0,0 +1,42 @@
+/** Bounded credential-safe MCP failure diagnostics. @author ddj 2026年10月28号 */
+import type { MpcConfig } from './shared/mcp.js'
+
+/**
+ * Format an initialization failure without serializing the MCP configuration.
+ * @public @author ddj 2026年10月28号
+ * @param error Original failure and optional cause chain.
+ * @param config Effective configuration, used only to remove known secret values.
+ * @returns Bounded single-line diagnostic; URLs and explicit credentials are removed.
+ */
+export function mcpErrorText(error: unknown, config: MpcConfig): string {
+  const messages: string[] = []
+  const seen = new Set<unknown>()
+  let cause = error
+  while (cause !== undefined && !seen.has(cause) && messages.length < 4) {
+    seen.add(cause)
+    if (cause instanceof Error) {
+      const code = (cause as Error & { code?: unknown }).code
+      messages.push(cause.name + ': ' + cause.message + (typeof code === 'string' ? ' [' + code + ']' : ''))
+      cause = cause.cause
+    } else {
+      messages.push(typeof cause === 'string' ? cause : 'Unknown MCP failure')
+      break
+    }
+  }
+
+  let text = messages.join(' <- ')
+  const secrets = [...Object.values(config.env ?? {}), ...Object.values(config.headers ?? {})]
+  // Arguments may contain credentials; never reproduce their non-option values in an error.
+  for (const argument of config.args ?? []) {
+    if (!argument.startsWith('-')) secrets.push(argument)
+  }
+  secrets.sort((left, right) => right.length - left.length)
+  for (const secret of secrets) {
+    if (secret) text = text.split(secret).join('[REDACTED]')
+  }
+
+  text = text.replace(/https?:\/\/[^\s"'<>]+/gi, '[URL]')
+    .replace(/\b(authorization|api[-_]?key|token|password|secret)\s*[:=]\s*[^\s,;]+/gi, '$1=[REDACTED]')
+    .replace(/[\r\n\x00-\x1f\x7f]+/g, ' ')
+  return text.slice(0, 2048)
+}

package/src/mcpPool.ts

@@ -1,6 +1,8 @@
 /** Connection ownership, bounded cold starts and workspace leases. @author ddj 2026年10月20号 */
 import { createHash } from 'node:crypto'
 import { McpBridge } from './mcpBridge.js'
+import { debugRecord } from './debugLog.js'
+import { mcpErrorText } from './mcpDiagnostic.js'
 import type { McpPolicy, McpPhase, MpcConfig } from './shared/mcp.js'
 import type { Ctx } from './store.js'
 
@@ -155,7 +157,9 @@ export class McpPool {
       entry.connectedAt = entry.finishedAt
     } catch (error) {
       entry.error = 'MCP 初始化失败或超时，请查看 Host 日志'
-      this.ctx.logger?.warn?.('MCP initialization failed: ' + String(error))
+      const diagnostic = 'MCP initialization failed; phase=' + entry.phase + '; transport=' + entry.spec.config.transport
+        + '; elapsedMs=' + (Date.now() - entry.startAt) + '; ' + mcpErrorText(error, entry.spec.config)
+      debugRecord(this.ctx, entry.spec.workspace, diagnostic, 'warn')
       // Invalidation precedes disposal; neither late module load nor callbacks may publish.
       entry.live = false
       entry.phase = 'stopping'

package/src/mcpRuntime.ts

@@ -265,8 +265,17 @@ export class McpRuntime {
     instance ??= this.reserve(agent, record, path, name, def)
     await waitMcp(instance.ready, signal)
     if (!this.valid(agent, record, name, instance)) throw new Error('项目 MCP 配置已失效')
-    const visible = agent.ctx.get('tools')?.view?.(agent)?.visible
-    const tools = [...instance.lease.entry.bridge!.tools.values()].filter((tool) => visible?.has(tool.name))
+    const registry = agent.ctx.get('tools')
+    // Discovery is not step admission; the official executor still owns execution permission.
+    let visible: ReadonlySet<string>
+    if (typeof registry?.definitions === 'function') {
+      visible = new Set(registry.definitions(agent).map((tool: { name: string }) => tool.name))
+    } else if (typeof registry?.view === 'function') {
+      visible = new Set(registry.view(agent).visible.keys())
+    } else {
+      throw new Error('项目 MCP 工具目录不可用：缺少公开 definitions 或旧版 view 接口')
+    }
+    const tools = [...instance.lease.entry.bridge!.tools.values()].filter((tool) => visible.has(tool.name))
       .map((tool) => ({ name: tool.name, description: tool.description, parameters: tool.parameters }))
     return { serverName: name, tools, resources: instance.lease.entry.bridge!.resources.has(name), nextRequest: 'Use these tools in the next model request; PTC must start a new program to refresh its SDK.' }
   }