dsh-vscode-mode 0.21.4 → 0.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.21.4",
+  "version": "0.22.0",
   "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/state/diffSummary.ts

@@ -1,10 +1,17 @@
 /** Source-aware metadata projection; official patches never become legacy hunks. @author ddj 2026年10月26号 */
+import { PENDING_PREFIX } from '../../shared/pendingReview.js'
 import type { ReviewPage } from '../../shared/review.js'
 import type { RecordView } from '../../shared/types.js'
 import type { FileSummary, Summary } from './records.js'
 import { summarize } from './records.js'
 
-export interface DiffFile extends FileSummary { sourceKind: 'official' | 'legacy' }
+export interface DiffFile extends FileSummary {
+  sourceKind: 'official' | 'legacy' | 'pending'
+  /** 待审行的增删行数；官方汇总行可能缺省。 */
+  added?: number
+  /** 待审行的删除行数。 */
+  deleted?: number
+}
 export interface DiffSummary extends Summary { files: DiffFile[]; pendingFiles: DiffFile[] }
 
 /** @public @author ddj 2026年10月26号 @param path Functional local or remote identity. @returns Comparison key without rewriting remote case. */
@@ -20,10 +27,42 @@ export function officialPath(path: string, page: ReviewPage | null): boolean {
   return !!page?.overview?.coveredPaths.some((candidate) => diffPathKey(candidate) === key)
 }
 
-/** @public @author ddj 2026年10月26号 @param records Tool-call history. @param page Official file navigation, never only its first 50 rows. @returns Official-first file counts; legacy paths remain explicitly labelled. */
+/**
+ * @author ddj 2026年10月30号
+ * @description: 取出本页待审条目（id 带待审前缀）并折算成文件行。
+ * @param page 审查页
+ * @returns 待审文件行与它们覆盖的路径键
+ */
+function pendingRowsOf(page: ReviewPage | null): { rows: DiffFile[]; covered: Set<string> } {
+  const rows: DiffFile[] = []
+  const covered = new Set<string>()
+  for (const item of page?.items ?? []) {
+    if (!item.id.startsWith(PENDING_PREFIX)) continue
+    const path = item.currentPath || item.path
+    covered.add(diffPathKey(path))
+    rows.push({
+      path,
+      label: item.display || path,
+      recs: [],
+      pending: item.decision === 'pending' ? 1 : 0,
+      added: item.added,
+      deleted: item.deleted,
+      sourceKind: 'pending',
+    })
+  }
+  return { rows, covered }
+}
+
+/** @public @author ddj 2026年10月26号 @param records Tool-call history. @param page Official file navigation, never only its first 50 rows. @returns Pending first, then official; legacy paths remain explicitly labelled. */
 export function diffSummary(records: RecordView[], page: ReviewPage | null): DiffSummary {
-  const legacy = summarize(records.filter((record) => !officialPath(record.path, page)))
-  const files: DiffFile[] = (page?.overview?.files ?? []).map((file) => ({ ...file, recs: [] }))
+  const pending = pendingRowsOf(page)
+  // 同一路径只留一个权威：待审接管后，官方汇总行与历史留痕行都让位。
+  const legacy = summarize(records.filter((record) => !pending.covered.has(diffPathKey(record.path)) && !officialPath(record.path, page)))
+  const files: DiffFile[] = [...pending.rows]
+  for (const file of page?.overview?.files ?? []) {
+    if (pending.covered.has(diffPathKey(file.path))) continue
+    files.push({ ...file, recs: [] })
+  }
   for (const file of legacy.files) files.push({ ...file, sourceKind: 'legacy' })
   const pendingFiles = files.filter((file) => file.pending > 0)
   return { files, pendingFiles, totalFiles: pendingFiles.length }

package/src/client/ui/DiffLauncher.ts

@@ -106,7 +106,7 @@ export function DiffLauncher(props) {
   }, [tab, sessionId, source])
 
   let body
-  const legacyFiles = sum.pendingFiles.filter((file) => file.sourceKind !== 'official')
+  const legacyFiles = sum.pendingFiles.filter((file) => file.sourceKind === 'legacy')
   if (source === 'official') {
     body = React.createElement(React.Fragment, null,
       React.createElement('div', { className: 'edrv-search-empty' }, '官方轮次净差异 · 原始历史只读；编辑按钮打开当前文件，保存不代表已审。'),

package/src/client/ui/EditorView.ts

@@ -26,6 +26,7 @@ import { subscribeReview, refreshReview } from '../state/reviewFeed.js'
 import { runReviewBatch } from '../reviewBatch.js'
 import { ReviewAllConfirm } from './ReviewAllConfirm.js'
 import { reviewRegions } from '../../shared/reviewRegions.js'
+import { PENDING_PREFIX } from '../../shared/pendingReview.js'
 import { diffSummary, officialPath } from '../state/diffSummary.js'
 import { emitFileChanged, emitRefresh } from '../events.js'
 import { langOf, loadMonaco, snippetLanguageOf } from '../monaco/loader.js'
@@ -579,7 +580,15 @@ export function EditorView(props) {
   }, [sessionId, active, selectedReview])
   React.useEffect(() => {
     const controller = new AbortController()
-    if (!active || !review.page?.overview?.coveredPaths.some((path) => sameFile(path, active))) {
+    // 待审条目也走同一条行内差异通道：它由累计基线投影而来，形状与官方条目一致，
+    // 因此编辑器里天然就能画行内差异与 Keep/Undo 药丸，不必另开一个窄面板。
+    const pendingPath = (review.page?.items ?? [])
+      .filter((item) => String(item.id).startsWith(PENDING_PREFIX))
+      .map((item) => item.currentPath || item.path)
+      .find((path) => sameFile(path, active))
+    const coveredPath = review.page?.overview?.coveredPaths.find((path) => sameFile(path, active))
+    const reviewPath = coveredPath ?? pendingPath
+    if (!active || !reviewPath) {
       setOfficialDetail(null)
       setOfficialRecords([])
       return () => controller.abort()
@@ -588,7 +597,6 @@ export function EditorView(props) {
     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)

package/src/client/ui/OfficialDiffBar.tsx

@@ -1,7 +1,6 @@
 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'
 import { reviewBarView } from '../reviewBar.js'
 import { ReviewAllRow } from './reviewAllRow.js'
 
@@ -55,11 +54,9 @@ export function barIcon(mark: Mark): React.ReactElement {
 /** @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 [menu, setMenu] = React.useState<'more' | null>(null)
   const name = String(props.activePath || '').split(/[\\/]/).pop() || '当前文件'
   const detail = official.detail
-  const records = official.records ?? []
   const count = pendingRegions.length
   const view = reviewBarView({ jumps: count, stale: staleRegions.length, index: diffIdx, ready: props.contentReady === true,
     pendingRecords: official.pending, canKeep: detail?.capability.keep === true,
@@ -67,8 +64,6 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
 
   /** @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. @param title Hover reason, defaults to the label. @returns Compact keyboard-focusable navigation control. */
@@ -76,9 +71,6 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
     return <Button size="sm" variant="ghost" className="edrv-review-icon" aria-label={label} title={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="文件差异审查">
@@ -99,7 +91,6 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
       <span className="edrv-review-filemark">{barIcon('file')}</span>
       <span className="edrv-review-filename" title={props.activePath}>{name}</span>
       <span className="edrv-review-pending" title={view.pendingTitle}>待审 <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="文件导航">
@@ -114,12 +105,10 @@ export function OfficialDiffBar(props: OfficialBarProps): React.ReactElement {
       <div className="edrv-review-actions">
         <Button size="sm" variant="ghost" className="edrv-review-undo" icon={barIcon('undo')} onClick={props.onUndoFile} disabled={props.reviewBatchBusy || !detail?.capability.undo} title={detail?.capability.reason}>Undo</Button>
         <Button size="sm" variant="primary" className="edrv-review-keep" icon={barIcon('check')} onClick={props.onAcceptFile} disabled={props.reviewBatchBusy || !detail?.capability.keep} title={detail?.capability.keep ? view.keepHint : detail?.capability.reason}>Keep</Button>
-        <Button size="sm" variant="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 && view.notice ? <div className={view.noticeTone === 'warn' ? 'edrv-review-notice edrv-review-notice-warn' : 'edrv-review-notice'} role="status">{view.notice}</div> : null}
     {props.reviewError ? <div className={props.reviewErrorTone === 'info' ? 'edrv-review-notice' : 'edrv-review-notice edrv-review-error'} role={props.reviewErrorTone === 'info' ? 'status' : '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/ui/OfficialReview.ts

@@ -3,6 +3,7 @@ import React from 'react'
 import { rpc } from '../rpc.js'
 import { openEditorView } from '../events.js'
 import { refreshReview } from '../state/reviewFeed.js'
+import { PENDING_PREFIX } from '../../shared/pendingReview.js'
 import type { ReviewDetail, ReviewItem, ReviewPage } from '../../shared/review.js'
 const h = React.createElement
 /** @private @author ddj 2026年10月26号 @param props Latest first-page metadata. @returns Paginated rows independent of expanded historical patch. */
@@ -37,18 +38,27 @@ export function ReviewLedger(props: { sessionId: string; first: ReviewPage | nul
       else setError(result.error)
     } catch (cause) { if (!controller.signal.aborted) setError(String(cause)) }
   }
+  const gaps = page?.gaps ?? []
   return h('div', { style: { marginTop: 8 } },
     h('label', null, h('input', { type: 'checkbox', checked: history, onChange: () => { setHistory(!history); setCursor(0) } }), '显示已处理及被替换的历史'),
-    page?.gaps.map((gap) => h('div', { key: `${gap.sessionId}:${gap.seq}`, role: 'status' }, `轮次 ${gap.turn} 采集不完整：${gap.error}`)),
     error ? h('div', { role: 'alert' }, error) : null,
     !page ? h('p', { role: 'status' }, '正在读取官方审查记录…') : null,
     page && !page.items.length ? h('p', null, history ? '暂无已落盘历史。' : '没有待处理的官方记录；可切换查看历史。') : null,
     h('div', { style: { maxHeight: 210, overflow: 'auto' } }, page?.items.map((item) => h('button', {
       key: item.id, type: 'button', onClick: () => { void select(item) },
-      style: { display: 'block', width: '100%', textAlign: 'left', padding: '6px 4px' },
-    }, `轮次 ${item.turn} · ${item.display}  +${item.added} −${item.deleted} · ${item.decision}${item.current ? '' : '（已被同轮新版本替换）'}`))),
+      title: item.currentPath || item.path,
+      style: { display: 'block', width: '100%', textAlign: 'left', padding: '6px 4px', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' },
+    }, item.id.startsWith(PENDING_PREFIX)
+      ? `【待审】${item.display}  +${item.added} −${item.deleted} · ${item.decision}${item.kind === 'oversized' ? ' · 过大' : ''}`
+      : `轮次 ${item.turn} · ${item.display}  +${item.added} −${item.deleted} · ${item.decision}${item.current ? '' : '（已被同轮新版本替换）'}`))),
     cursor > 0 ? h('button', { type: 'button', onClick: () => setCursor(Math.max(0, cursor - 50)) }, '上一页') : null,
     page?.nextCursor !== null && page?.nextCursor !== undefined ? h('button', { type: 'button', onClick: () => setCursor(page.nextCursor!) }, '下一页') : null,
+    // 采集缺口是诊断信息，排在条目之后折叠起来：放最前面会把真正要点的待审条目挤出可视区。
+    gaps.length
+      ? h('details', { key: 'gaps', style: { marginTop: 6 } },
+        h('summary', { style: { cursor: 'pointer', fontSize: 11 } }, `采集不完整 ${gaps.length} 条（诊断信息）`),
+        gaps.map((gap) => h('div', { key: `${gap.sessionId}:${gap.seq}`, role: 'status', style: { fontSize: 11 } }, `轮次 ${gap.turn} 采集不完整：${gap.error}`)))
+      : null,
     detail ? h(PatchDetail, { key: detail.item.id, sessionId: props.sessionId, detail, onChanged: () => { setDetail(null); refreshReview(props.sessionId) } }) : null)
 }
 

package/src/client/ui/SidecarDiffBar.tsx

@@ -62,7 +62,6 @@ export interface SidecarBarProps {
 export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
   const pendingRegions = props.pendingRegions ?? []
   const staleRegions = props.staleRegions ?? []
-  const [expanded, setExpanded] = React.useState(false)
   const [menu, setMenu] = React.useState<'more' | null>(null)
   const name = String(props.activePath || '').split(/[\\/]/).pop() || '当前文件'
   const count = pendingRegions.length
@@ -85,25 +84,6 @@ export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
 
   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>
 
-  const body = expanded
-    ? <div className="edrv-review-body">
-        {pendingRegions.map((region) => {
-          const key = callIdAttr(region.callId, region.idx)
-          return <div key={key} className="edrv-diffrow" data-edrv-hunk={key} title={'跳转到 L' + (region.start ?? '?')} onClick={() => props.onJump?.(region)}>
-            <span className="edrv-diffrow-l">{'L' + (region.start ?? '?') + '-' + (region.end ?? '?')}</span>
-            {(region.oldLines?.length ?? 0) > 0 ? <span className="edrv-diffrow-o">{'-' + (region.oldLines?.length ?? 0)}</span> : null}
-            {(region.newLines?.length ?? 0) > 0 ? <span className="edrv-diffrow-n">{'+' + (region.newLines?.length ?? 0)}</span> : null}
-            {region.create ? <span className="edrv-diffrow-tag">新建</span> : null}
-          </div>
-        })}
-        {staleRegions.map((region) => <div key={'stale' + callIdAttr(region.callId, region.idx)} className="edrv-diffrow edrv-diffrow-stale" title="差异无法定位（文件可能已被手动修改）">
-          <span className="edrv-diffrow-l">{'L' + (region.start ?? '?') + ' 无法定位'}</span>
-          <span className="edrv-diffrow-tag">冲突/需刷新</span>
-          <span className="edrv-diffrow-tag">{badgeOf(region.status ?? '')}</span>
-        </div>)}
-      </div>
-    : null
-
   return <div className="edrv-diffbar edrv-diffbar-dock edrv-reviewbar" data-edrv-diffbox="1" data-edrv-diff-source="sidecar" role="region" aria-label="文件差异审查">
     <ReviewAllRow
       total={props.fileTotal ?? 0}
@@ -141,7 +121,6 @@ export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
       <div className="edrv-review-actions">
         <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 }
           if (id === 'refresh') { setMenu(null); props.onRefresh?.(); return }
@@ -151,6 +130,5 @@ export function SidecarDiffBar(props: SidecarBarProps): React.ReactElement {
     </div>
     {view.notice ? <div className={view.noticeTone === 'warn' ? 'edrv-review-notice edrv-review-notice-warn' : 'edrv-review-notice'} role="status">{view.notice}</div> : null}
     {props.reviewError ? <div className={props.reviewErrorTone === 'info' ? 'edrv-review-notice' : 'edrv-review-notice edrv-review-error'} role={props.reviewErrorTone === 'info' ? 'status' : 'alert'}>{props.reviewError}</div> : null}
-    {body}
   </div>
 }

package/src/index.ts

@@ -3,6 +3,9 @@ import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { installCapture } from './officialCapture.js'
 import { installEvidence } from './reviewCapture.js'
+import { installPendingCapture } from './pending/capture.js'
+import { recordWrite } from './pending/store.js'
+import { trackPendingCover } from './pendingCompat.js'
 import { closeArchiveDbs } from './archiveDb.js'
 import { handleRpc, integrationBaseUrlOf } from './rpc.js'
 import { newSearcher } from './search/orchestrator.js'
@@ -71,6 +74,11 @@ function createRuntime(ctx: Ctx, config: unknown) {
 function attachRuntime(ctx: Ctx, runtime: Runtime): void {
   const evidence = installEvidence(ctx)
   const stopCapture = installCapture(ctx, (cwd, snapshot) => { evidence.persist(cwd, snapshot); return true })
+  // 待审累计基线：只有写后内容确实变化才落库，异常一律不打断用户工具调用
+  const pending = installPendingCapture(ctx, (write) => {
+    try { trackPendingCover(write.cwd, write.path, true) } catch { /* 内存登记失败不阻断采集 */ }
+    try { recordWrite(write) } catch (error) { log.warn('待审差异落库失败：' + String(error)) }
+  })
   /** @author ddj 2026年09月28号 @param exec Tool execution. @param result Tool result. */
   function onResult(exec: unknown, result: unknown): void {
     void captureToolResult(ctx, runtime.registry, exec, result)
@@ -90,6 +98,7 @@ function attachRuntime(ctx: Ctx, runtime: Runtime): void {
   async function cleanup(): Promise<void> {
     await stopCapture()
     evidence.dispose()
+    pending.dispose()
     runtime.fileVersions.dispose()
     closeArchiveDbs()
     disposeAllServers()

package/src/missingReview.ts

@@ -3,7 +3,7 @@ import { createHash, randomUUID } from 'node:crypto'
 import { resolve } from 'node:path'
 import type { DiffRecord, MissingReview } from './shared/types.js'
 import type { Ctx, Session } from './store.js'
-import { archiveRecords, policyOf, READ_CAP, resolveTargetIn } from './store.js'
+import { archiveRecords, policyOf, READ_CAP, resolveTargetIn, targetPathOf } from './store.js'
 import { hasOfficial } from './reviewDb.js'
 import { recordResolved } from './model.js'
 
@@ -31,13 +31,20 @@ function revisionOf(records: DiffRecord[]): string {
   return createHash('sha256').update(JSON.stringify(evidence)).digest('hex')
 }
 
+/** @private @author ddj 2026年10月30号 @param ctx Host capability. @param target Resolve 结果：宿主路径字符串或不透明 FsTarget。 @returns 平台一致的物理身份；无法还原时返回空串。 */
+function fileKeyOf(ctx: Ctx, target: unknown): string {
+  const path = targetPathOf(ctx, target)
+  return path ? fileKey(path) : ''
+}
+
 /** @private @author ddj 2026年10月28号 @param ctx Host capability. @param cwd Workspace. @param bucket Records. @param target Resolved file. @returns Records for the same physical path spelling, oldest first. */
 async function fileRecords(ctx: Ctx, cwd: string, bucket: Map<string, DiffRecord>, target: string): Promise<DiffRecord[]> {
   const matches: DiffRecord[] = []
-  const identity = fileKey(target)
+  // 解析结果可能是不透明对象，比较前必须先统一还原成宿主路径。
+  const identity = fileKeyOf(ctx, target)
   for (const record of bucket.values()) {
     if (record.superseded) continue
-    if (fileKey(await resolveTargetIn(ctx, cwd, record.path)) === identity) matches.push(record)
+    if (fileKeyOf(ctx, await resolveTargetIn(ctx, cwd, record.path)) === identity) matches.push(record)
   }
   return matches.sort((left, right) => left.at.localeCompare(right.at))
 }
@@ -57,9 +64,12 @@ export async function fileAbsent(ctx: Ctx, cwd: string, path: string): Promise<b
 /** @public @author ddj 2026年10月28号 @param ctx Host. @param session Live session. @param cwd Workspace. @param bucket Records. @param path Requested file. @returns Frozen complete snapshot; never constructs text from hunks or writes files. @throws Missing evidence or nonmissing target. */
 export async function missingReview(ctx: Ctx, session: Session, cwd: string, bucket: Map<string, DiffRecord>, path: string): Promise<MissingReview> {
   const target = await resolveTargetIn(ctx, cwd, path)
-  if (hasOfficial(cwd, path) || hasOfficial(cwd, target)) throw new Error('该文件已有官方审查记录，请使用官方审查入口')
-  if (!await fileAbsent(ctx, cwd, target)) throw new Error('文件已重新出现，请刷新')
-  const records = await fileRecords(ctx, cwd, bucket, target)
+  // 解析结果可能是不透明 FsTarget，凡按路径字符串使用的分支都必须先还原。
+  const abs = targetPathOf(ctx, target)
+  if (!abs) throw new Error('无法解析目标文件路径')
+  if (hasOfficial(cwd, path) || hasOfficial(cwd, abs)) throw new Error('该文件已有官方审查记录，请使用官方审查入口')
+  if (!await fileAbsent(ctx, cwd, abs)) throw new Error('文件已重新出现，请刷新')
+  const records = await fileRecords(ctx, cwd, bucket, abs)
   const latest = records.at(-1)
   if (!records.some((record) => !record.archived && !recordResolved(record))) throw new Error('没有待审历史记录')
   if (!latest || typeof latest.after !== 'string') throw new Error('缺少可靠的完整历史快照，无法展示或恢复；不会用局部差异拼接文件')
@@ -88,33 +98,45 @@ async function applyDisk(ctx: Ctx, item: FrozenReview, target: string, undo: boo
   if (await fs.readText(target) !== item.view.content) throw new Error('恢复内容校验失败，未结清记录')
 }
 
+/**
+ * @author ddj 2026年10月29号
+ * @description: 取删除预览对应的文件路径，供服务端判定该路径是否已由待审投影接管。
+ * @param token 冻结预览 token
+ * @returns 文件路径，token 无效时为 undefined
+ */
+export function missingPath(token: string): string | undefined {
+  return frozen.get(token)?.view.path
+}
+
 /** @public @author ddj 2026年10月28号 @param ctx Host. @param session Requesting session. @param cwd Workspace. @param bucket Records. @param token Frozen preview token. @param operationId Stable retry ID. @param undo True restores shown snapshot; false keeps deletion. @returns Covered call IDs. @throws Changed evidence, concurrent action or sandbox/IO failure. */
 export async function missingDecide(ctx: Ctx, session: Session, cwd: string, bucket: Map<string, DiffRecord>, token: string, operationId: string, undo: boolean): Promise<string[]> {
   const item = frozen.get(token)
   if (!item || item.expires < Date.now() || item.cwd !== cwd || item.session.id !== session.id) throw new Error('删除预览已过期，请刷新后重试')
   if (!operationId || operationId.length > 128) throw new Error('缺少有效操作 ID')
   const target = await resolveTargetIn(ctx, cwd, item.view.path)
-  const key = JSON.stringify([cwd, fileKey(target)])
+  const abs = targetPathOf(ctx, target)
+  if (!abs) throw new Error('无法解析目标文件路径')
+  const key = JSON.stringify([cwd, fileKey(abs)])
   if (locks.has(key)) throw new Error('该文件正在处理，请稍后重试')
   locks.add(key)
   item.session = session
-  try { return await commitMissing(ctx, item, bucket, target, operationId, undo) }
+  try { return await commitMissing(ctx, item, bucket, target, abs, operationId, undo) }
   finally { locks.delete(key) }
 }
 
-/** @private @author ddj 2026年10月28号 @param ctx Host. @param item Frozen preview. @param bucket Live records. @param target Resolved target. @param operationId Retry identity. @param undo Restore action. @returns Archived pending call IDs; disk success survives bookkeeping failure in the same Host lifetime. */
-async function commitMissing(ctx: Ctx, item: FrozenReview, bucket: Map<string, DiffRecord>, target: string, operationId: string, undo: boolean): Promise<string[]> {
+/** @private @author ddj 2026年10月28号 @param ctx Host. @param item Frozen preview. @param bucket Live records. @param target Resolved target. @param abs Host path of the target. @param operationId Retry identity. @param undo Restore action. @returns Archived pending call IDs; disk success survives bookkeeping failure in the same Host lifetime. */
+async function commitMissing(ctx: Ctx, item: FrozenReview, bucket: Map<string, DiffRecord>, target: string, abs: string, operationId: string, undo: boolean): Promise<string[]> {
   const previous = item.operation
   if (previous && (previous.id !== operationId || previous.undo !== undo)) throw new Error('已有不同操作，请刷新后重试')
   if (previous?.done) return item.view.callIds
-  if (hasOfficial(item.cwd, target) || hasOfficial(item.cwd, item.view.path)) throw new Error('该文件已有官方审查记录，请刷新')
-  const records = await fileRecords(ctx, item.cwd, bucket, target)
+  if (hasOfficial(item.cwd, abs) || hasOfficial(item.cwd, item.view.path)) throw new Error('该文件已有官方审查记录，请刷新')
+  const records = await fileRecords(ctx, item.cwd, bucket, abs)
   if (revisionOf(records) !== item.revision) throw new Error('历史记录已变化，请刷新删除预览')
   item.operation ??= { id: operationId, undo, restored: false, done: false }
-  await applyDisk(ctx, item, target, undo)
+  await applyDisk(ctx, item, abs, undo)
 
   // Recheck after awaited IO: capture/another review must not silently join this decision.
-  const current = await fileRecords(ctx, item.cwd, bucket, target)
+  const current = await fileRecords(ctx, item.cwd, bucket, abs)
   if (revisionOf(current) !== item.revision) throw new Error('历史记录已变化，未结清记录，请刷新')
   const pending = current.filter((record) => item.view.callIds.includes(record.callId))
   const decisions = pending.map((record) => record.decisions)

package/src/pending/capture.ts

@@ -0,0 +1,136 @@
+/**
+ * 待审差异采集：环绕一次文件写入读取真实前后内容，只有内容确实变化才落库。
+ * @author ddj 2026年10月29号
+ */
+import { cwdOf } from '../registry.js'
+import { resolveTarget } from '../store.js'
+import type { Ctx } from '../store.js'
+import { log } from '../log.js'
+
+/** 可被采信为待审来源的写文件工具。 */
+const WRITE_TOOLS = ['edit', 'write', 'str_replace_editor']
+/** 单文件文本上限：超过即标注 oversized，不静默截断。 */
+const MAX_TEXT = 1024 * 1024
+
+/** 一次已确认的写入。 */
+export interface PendingWrite {
+  cwd: string
+  sessionId: string
+  path: string
+  identity: string
+  before: string | null
+  after: string | null
+  now: number
+}
+
+/** 采集器。 */
+export interface PendingCapture {
+  /** 释放监听并丢弃暂存。 */
+  dispose(): void
+}
+
+/**
+ * @author ddj 2026年10月29号
+ * @description: 安装写文件采集；读写失败只影响待审来源，绝不影响用户工具本身。
+ * @param ctx Host 生命周期
+ * @param sink 已确认写入的接收方
+ * @returns 可释放的采集器
+ */
+export function installPendingCapture(ctx: Ctx, sink: (write: PendingWrite) => void): PendingCapture {
+  const busy = new Set<string>()
+  let stopped = false
+  ctx.on('tools/execute', aroundTool)
+  return { dispose }
+
+  /**
+   * @author ddj 2026年10月29号
+   * @description: 写工具执行前后各读一次，内容变化才上报。
+   * @param exec 工具分发上下文
+   * @param next 原始分发
+   * @returns 原始工具结果，永不因采集失败而改变
+   */
+  async function aroundTool(exec: any, next: () => Promise<any>): Promise<any> {
+    const session = exec.agent?.session
+    const path = exec.arguments?.file_path ?? exec.arguments?.path
+    if (stopped || !session?.id || typeof path !== 'string' || !WRITE_TOOLS.includes(exec.name)) return next()
+    const cwd = cwdOf(session)
+    if (!cwd) return next()
+    let before: string | null = null
+    let identity: string | null = null
+    try {
+      const fs = ctx.get('fs')
+      const target = await resolveTarget(ctx, session, path)
+      const key = fs.processPath(target)
+      if (typeof key !== 'string' || !key) return next()
+      if (busy.has(key)) return next()
+      before = await readText(fs, target)
+      if (before !== null && before.length > MAX_TEXT) return next()
+      identity = key
+      busy.add(key)
+    } catch (error) {
+      log.debug('待审采集跳过：' + String(error))
+      return next()
+    }
+    try {
+      return await next()
+    } finally {
+      if (identity !== null) {
+        const key: string = identity
+        try { report(String(cwd), String(session.id), String(path), key, before, exec) } catch (error) {
+          log.debug('待审上报失败：' + String(error))
+        }
+        busy.delete(key)
+      }
+    }
+  }
+
+  /**
+   * @author ddj 2026年10月29号
+   * @description: 写后读回并比较，内容一致视为无净变化不产生条目。
+   * @param cwd 工作区
+   * @param sessionId 会话
+   * @param path 展示路径
+   * @param identity 目标身份
+   * @param before 写前内容
+   * @param exec 工具分发上下文
+   * @returns 无
+   */
+  function report(
+    cwd: string, sessionId: string, path: string, identity: string, before: string | null, exec: any,
+  ): void {
+    const fs = ctx.get('fs')
+    void resolveTarget(ctx, exec.agent.session, path).then(async (target: any) => {
+      const after = await readText(fs, target)
+      if (after !== null && after.length > MAX_TEXT) return
+      if (before === after) return
+      sink({ cwd, sessionId, path, identity, before, after, now: Date.now() })
+    }).catch((error: unknown) => log.debug('待审读回失败：' + String(error)))
+  }
+
+  /**
+   * @author ddj 2026年10月29号
+   * @description: 释放监听。
+   * @returns 无
+   */
+  function dispose(): void {
+    stopped = true
+    busy.clear()
+  }
+}
+
+/**
+ * @author ddj 2026年10月29号
+ * @description: 读取全文；缺失或不可读按"无内容"处理，交由上层决定语义。
+ * @param fs 文件系统
+ * @param target 目标
+ * @returns 文本或 null
+ */
+export async function readText(fs: any, target: any): Promise<string | null> {
+  try {
+    return String(await fs.readText(target))
+  } catch (error) {
+    const code = (error as { code?: string }).code
+    if (code === 'ENOENT' || code === 'FS_NOT_FOUND' || code === 'FS_TOO_LARGE') return null
+    throw error
+  }
+}