dsh-vscode-mode 0.20.0 → 0.20.1

package/src/index.ts

@@ -2,6 +2,7 @@
 import { registerRoutes } from './routes.js'
 import { captureToolResult } from './capture.js'
 import { installCapture } from './officialCapture.js'
+import { installEvidence } from './reviewCapture.js'
 import { closeArchiveDbs } from './archiveDb.js'
 import { handleRpc, integrationBaseUrlOf } from './rpc.js'
 import { newSearcher } from './search/orchestrator.js'
@@ -68,7 +69,8 @@ function createRuntime(ctx: Ctx, config: unknown) {
  * @param runtime Managers created by this instance.
  */
 function attachRuntime(ctx: Ctx, runtime: Runtime): void {
-  const stopCapture = installCapture(ctx)
+  const evidence = installEvidence(ctx)
+  const stopCapture = installCapture(ctx, (cwd, snapshot) => { evidence.persist(cwd, snapshot); return true })
   /** @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)
@@ -87,6 +89,7 @@ function attachRuntime(ctx: Ctx, runtime: Runtime): void {
   /** @author ddj 2026年09月28号 Release every manager even if another cleanup rejects. */
   async function cleanup(): Promise<void> {
     await stopCapture()
+    evidence.dispose()
     runtime.fileVersions.dispose()
     closeArchiveDbs()
     disposeAllServers()

package/src/officialCapture.ts

@@ -1,6 +1,6 @@
 /** Deferred official-event collection; no private snapshot access. @author ddj 2026年10月26号 */
 import { captureState, repairPaths, saveSnapshot } from './reviewDb.js'
-import type { OfficialDiff, OfficialSummary } from './shared/review.js'
+import type { OfficialDiff, OfficialSummary, ReviewSnapshot } from './shared/review.js'
 import type { Ctx } from './store.js'
 import { loadBucket } from './store.js'
 import { log } from './log.js'
@@ -148,12 +148,16 @@ async function readDiff(source: SourceService, task: CaptureTask, index: number,
 }
 
 /** @public @author ddj 2026年10月26号 @param ctx Host lifecycle owner; services remain optional for older Hosts. */
-export function installCapture(ctx: Ctx): () => Promise<void> {
+export function installCapture(ctx: Ctx, onSnapshot?: (cwd: string, snapshot: ReviewSnapshot) => void): () => Promise<void> {
   const collector = createCollector({
     source: () => ctx.get('workspaceChanges'),
     prepare: async (cwd) => { await loadBucket(ctx, cwd); await repairPaths(cwd, resolvePath) },
     identity: resolvePath,
-    persist: saveSnapshot, state: captureState, report: (message) => log.warn(message),
+    persist: (cwd, snapshot) => {
+      const saved = saveSnapshot(cwd, snapshot)
+      onSnapshot?.(cwd, snapshot)
+      return saved
+    }, state: captureState, report: (message) => log.warn(message),
   })
   // Subscribe first: seed reads must not create a live-event race window.
   ctx.on('session/event', collector.enqueue)

package/src/reviewCapture.ts

@@ -0,0 +1,112 @@
+/** Independent byte evidence; official diff remains the only display authority. @author ddj 2026年10月27号 */
+import { rawReviewFile, evidenceBlocks } from './reviewEvidence.js'
+import type { RawReviewFile } from './reviewEvidence.js'
+import type { ReviewSnapshot } from './shared/review.js'
+import { reviewDb } from './reviewDb.js'
+import { resolveTarget } from './store.js'
+import type { Ctx } from './store.js'
+import { log } from './log.js'
+
+interface ByteChain { before: RawReviewFile; after: RawReviewFile; busy: boolean; invalid: boolean }
+interface EvidenceCapture {
+  persist(cwd: string, snapshot: ReviewSnapshot): void
+  dispose(): void
+}
+
+/** @public @author ddj 2026年10月27号 @param ctx Host lifecycle owner. @returns Scoped byte recorder; failures disable undo evidence only, never tool execution. */
+export function installEvidence(ctx: Ctx): EvidenceCapture {
+  const chains = new Map<string, Map<string, ByteChain>>()
+  const staged = new Map<string, Map<string, ByteChain>>()
+  let stopped = false
+  ctx.on('tools/execute', aroundTool)
+  ctx.on('session/event', onEvent)
+  ctx.on('session/disposed', onDisposed)
+
+  /** @private @author ddj 2026年10月27号 @param session Disposed owner. Drops optional in-memory evidence, never persisted official facts. */
+  function onDisposed(session: { id: string }): void { chains.delete(session.id) }
+
+  /** @private @author ddj 2026年10月27号 @returns Current bounded capture footprint, excluding transient filesystem reads. */
+  function footprint(): number {
+    let bytes = 0
+    for (const group of [chains, staged]) {
+      for (const files of group.values()) {
+        for (const chain of files.values()) bytes += chain.before.bytes.length + chain.after.bytes.length
+      }
+    }
+    return bytes
+  }
+
+  /** @private @author ddj 2026年10月27号 @param exec Allowed tool dispatch. @param next Original dispatch. @returns Original result unchanged, regardless of capture failure. */
+  async function aroundTool(exec: any, next: () => Promise<any>): Promise<any> {
+    const session = exec.agent?.session
+    const path = exec.arguments?.file_path
+    if (stopped || !session?.id || !['edit', 'write'].includes(exec.name) || typeof path !== 'string') return next()
+    let fs: any
+    let chain: ByteChain | undefined
+    let target: any
+    try {
+      if ((chains.size >= 16 && !chains.has(session.id)) || footprint() >= 32 * 1024 * 1024) return next()
+      fs = ctx.get('fs')
+      target = await resolveTarget(ctx, session, path)
+      const identity = fs.processPath(target)
+      const before = await readRaw(fs, target, exec.signal)
+      let files = chains.get(session.id)
+      if (!files) { files = new Map(); chains.set(session.id, files) }
+      if (files.size >= 64 && !files.has(identity)) return next()
+      chain = files.get(identity)
+      if (!chain) { chain = { before, after: before, busy: false, invalid: false }; files.set(identity, chain) }
+      if (chain.busy || chain.after.hash !== before.hash) chain.invalid = true
+      chain.busy = true
+    } catch { /* No trustworthy read means no undo evidence, not a failed user tool. */ }
+    try { return await next() }
+    finally {
+      if (chain) {
+        try { chain.after = await readRaw(fs, target, exec.signal) } catch { chain.invalid = true }
+        chain.busy = false
+      }
+    }
+  }
+
+  /** @private @author ddj 2026年10月27号 @param session Source session. @param event Published official turn. Freezes the chain before the next turn can mutate it. */
+  function onEvent(session: any, event: any): void {
+    if (stopped || event.type !== 'workspace/changes') return
+    const files = chains.get(session.id)
+    chains.delete(session.id)
+    if (!files || staged.size >= 128) return
+    staged.set(JSON.stringify([session.id, event.seq]), structuredClone(files))
+  }
+
+  /** @public @author ddj 2026年10月27号 @param cwd Official workspace. @param snapshot Committed official facts. Persists only independently validated, exact-correspondence byte chains. */
+  function persist(cwd: string, snapshot: ReviewSnapshot): void {
+    const key = JSON.stringify([snapshot.sessionId, snapshot.seq])
+    const files = staged.get(key)
+    staged.delete(key)
+    if (!files || stopped) return
+    const db = reviewDb(cwd)
+    for (const file of snapshot.files) {
+      const chain = files.get(file.identity)
+      if (!chain || chain.invalid || chain.busy) continue
+      try {
+        const evidence = { before: chain.before, after: chain.after }
+        evidenceBlocks(file.diff, evidence)
+        db.prepare(`INSERT OR IGNORE INTO review_evidence(file_id,payload)
+          SELECT id,? FROM review_files WHERE session_id=? AND turn=? AND seq=? AND identity=?`)
+          .run(JSON.stringify(evidence), snapshot.sessionId, snapshot.turn, snapshot.seq, file.identity)
+      } catch (error) { log.warn('官方回滚证据不可用：' + String(error)) }
+    }
+  }
+
+  /** @public @author ddj 2026年10月27号 Release bounded in-memory images after capture has drained. */
+  function dispose(): void { stopped = true; chains.clear(); staged.clear() }
+  return { persist, dispose }
+}
+
+/** @private @author ddj 2026年10月27号 @param fs Public filesystem. @param target Backend identity. @returns Raw bounded file or confirmed missing. @throws Any non-missing read error. */
+async function readRaw(fs: any, target: any, signal?: AbortSignal): Promise<RawReviewFile> {
+  try { return rawReviewFile(await fs.readBytes(target, signal, 1024 * 1024)) }
+  catch (error) {
+    const code = (error as { code?: string }).code
+    if (code === 'ENOENT' || code === 'FS_NOT_FOUND') return rawReviewFile(null)
+    throw error
+  }
+}

package/src/reviewDb.ts

@@ -1,5 +1,9 @@
 /** Official history shares the archive connection, but never the legacy callId namespace. @author ddj 2026年10月26号 */
 import { createHash } from 'node:crypto'
+import { existsSync } from 'node:fs'
+import { archiveDbFile } from './paths.js'
+import { reviewBlocks } from './shared/reviewRegions.js'
+import type { ReviewBlockState } from './shared/reviewRegions.js'
 import type { DatabaseSync } from 'node:sqlite'
 import { activeReady, dbFor } from './archiveDb.js'
 import type { CaptureGap, DecideReview, OfficialDiff, ReviewDetail, ReviewItem, ReviewPage, ReviewSnapshot } from './shared/review.js'
@@ -11,7 +15,7 @@ export function reviewDb(cwd: string): DatabaseSync {
   if (!activeReady(cwd)) throw new Error('官方审查要求先完成活跃库迁移')
   const db = dbFor(cwd)
   const version = db.prepare("SELECT value FROM metadata WHERE name='schema'").get() as Row
-  if (version.value === '4') return db
+  if (version.value === '4') { migrateBlocks(cwd, db); return db }
   db.exec('BEGIN IMMEDIATE')
   try {
     db.exec(`CREATE TABLE review_snapshots (
@@ -37,9 +41,37 @@ export function reviewDb(cwd: string): DatabaseSync {
     if (db.isTransaction) db.exec('ROLLBACK')
     throw error
   }
+  migrateBlocks(cwd, db)
   return db
 }
 
+/** @private @author ddj 2026年10月27号 @param cwd Workspace backup identity. @param db Open schema4 database. Extends the official-review sub-schema without changing legacy archive schema. @throws Migration failure, leaving prior decisions intact. */
+function migrateBlocks(cwd: string, db: DatabaseSync): void {
+  if (db.prepare("SELECT value FROM metadata WHERE name='review_schema'").get()) return
+  const backup = archiveDbFile(cwd) + '.before-review-blocks.bak'
+  if (!existsSync(backup)) db.exec(`VACUUM INTO '${backup.replace(/'/g, "''")}'`)
+
+  db.exec('BEGIN IMMEDIATE')
+  try {
+    db.exec(`CREATE TABLE review_blocks (file_id TEXT NOT NULL, block_id TEXT NOT NULL,
+      decision TEXT NOT NULL, PRIMARY KEY(file_id,block_id));
+      CREATE TABLE review_evidence (file_id TEXT PRIMARY KEY, payload TEXT NOT NULL);
+      INSERT INTO metadata(name,value) VALUES('review_schema','2');`)
+    const files = db.prepare('SELECT id,diff,decision FROM review_files').all() as Row[]
+    for (const file of files) seedBlocks(db, String(file.id), JSON.parse(String(file.diff)), String(file.decision))
+    db.exec('COMMIT')
+  } catch (error) {
+    if (db.isTransaction) db.exec('ROLLBACK')
+    throw error
+  }
+}
+
+/** @private @author ddj 2026年10月27号 @param db Transaction connection. @param id File record. @param diff Immutable official source. @param decision Prior file decision. Seeds deterministic blocks without changing source facts. */
+function seedBlocks(db: DatabaseSync, id: string, diff: OfficialDiff, decision: string): void {
+  const insert = db.prepare('INSERT INTO review_blocks VALUES(?,?,?)')
+  for (const block of reviewBlocks(diff)) insert.run(id, block.id, decision)
+}
+
 /** @private @author ddj 2026年10月26号 @param text Canonical serialized input. @returns Collision-resistant identity. */
 function digest(text: string): string { return createHash('sha256').update(text).digest('hex') }
 
@@ -107,7 +139,7 @@ export async function repairPaths(cwd: string, resolvePath: (cwd: string, path:
 /** @private @author ddj 2026年10月26号 @param db Transaction. @param snapshot Source payload. @param hash Source digest. */
 function insertSnapshot(db: DatabaseSync, snapshot: ReviewSnapshot, hash: string): void {
   const { sessionId, turn, seq } = snapshot
-  const previous = db.prepare('SELECT identity,diff,decision FROM review_files WHERE session_id=? AND turn=? AND current=1').all(sessionId, turn) as Row[]
+  const previous = db.prepare('SELECT id,identity,diff,decision FROM review_files WHERE session_id=? AND turn=? AND current=1').all(sessionId, turn) as Row[]
   db.prepare('UPDATE review_snapshots SET current=0 WHERE session_id=? AND turn=?').run(sessionId, turn)
   db.prepare('UPDATE review_files SET current=0 WHERE session_id=? AND turn=?').run(sessionId, turn)
   db.prepare('INSERT INTO review_snapshots VALUES(?,?,?,?,?,1)').run(sessionId, turn, seq, JSON.stringify(snapshot), hash)
@@ -116,7 +148,17 @@ function insertSnapshot(db: DatabaseSync, snapshot: ReviewSnapshot, hash: string
     const encoded = JSON.stringify(file.diff)
     const unchanged = previous.find((item) => item.identity === file.identity && item.diff === encoded)
     const id = digest(JSON.stringify([sessionId, turn, seq, file.identity]))
-    insert.run(id, sessionId, turn, seq, file.identity, JSON.stringify(snapshot.summary.files[index]), encoded, unchanged?.decision ?? 'pending')
+    const decision = String(unchanged?.decision ?? 'pending')
+    insert.run(id, sessionId, turn, seq, file.identity, JSON.stringify(snapshot.summary.files[index]), encoded, decision)
+    seedBlocks(db, id, file.diff, decision)
+    if (unchanged) {
+      // A same-turn republish must preserve mixed per-block decisions, not seed all blocks as mixed.
+      db.prepare(`UPDATE review_blocks SET decision=(SELECT p.decision FROM review_blocks p
+        WHERE p.file_id=? AND p.block_id=review_blocks.block_id)
+        WHERE file_id=? AND EXISTS(SELECT 1 FROM review_blocks p WHERE p.file_id=? AND p.block_id=review_blocks.block_id)`)
+        .run(unchanged.id, id, unchanged.id)
+      db.prepare('INSERT INTO review_evidence SELECT ?,payload FROM review_evidence WHERE file_id=?').run(id, unchanged.id)
+    }
   }
 }
 
@@ -181,9 +223,33 @@ export function reviewDetail(cwd: string, id: string): ReviewDetail | null {
   const row = db.prepare(`SELECT f.*,json_extract(s.payload,'$.capturedAt') AS captured_at FROM review_files f JOIN review_snapshots s
     USING(session_id,turn,seq) WHERE f.id=?`).get(id) as Row | undefined
   if (!row) return null
-  return { item: itemOf(row), diff: JSON.parse(String(row.diff)), capturedAt: String(row.captured_at),
-    capability: { keep: row.current === 1 && row.decision === 'pending', undo: false,
-      reason: '官方仅提供差异块，缺少可验证的历史全文及原始字节；拒绝写回已禁用。可标记已审或打开当前文件继续编辑。' } }
+  const blocks = db.prepare('SELECT block_id AS id,decision FROM review_blocks WHERE file_id=? ORDER BY rowid').all(id) as unknown as ReviewBlockState[]
+  const diff = JSON.parse(String(row.diff)) as OfficialDiff
+  const evidence = db.prepare('SELECT 1 FROM review_evidence WHERE file_id=?').get(id)
+  const pending = row.current === 1 && row.decision === 'pending'
+  const undo = pending && !!evidence && diff.kind === 'text' && diff.before && diff.after && !diff.coarse
+  return { item: itemOf(row), diff, capturedAt: String(row.captured_at), blocks,
+    capability: { keep: pending, undo,
+      reason: undo ? 'Undo 将校验原始字节、当前文件版本及已处理差异块；文件变化会安全拒绝。'
+        : '该记录缺少可验证的原始字节或受控写回能力；仍可显示差异和 Keep，不能猜测历史全文执行 Undo。' } }
+}
+
+/** @public @author ddj 2026年10月27号 @param db Active decision transaction. @param request File or block action. Updates aggregate without losing mixed decisions. @throws Invalid or already-decided block. */
+export function changeBlocks(db: DatabaseSync, request: DecideReview): void {
+  if (request.scope === 'hunk') {
+    const changed = db.prepare("UPDATE review_blocks SET decision=? WHERE file_id=? AND block_id=? AND decision='pending'")
+      .run(request.decision, request.id, request.blockId ?? '')
+    if (changed.changes !== 1) throw new Error('差异块不存在或已处理')
+  } else {
+    db.prepare("UPDATE review_blocks SET decision=? WHERE file_id=? AND decision='pending'").run(request.decision, request.id)
+  }
+  const states = db.prepare('SELECT DISTINCT decision FROM review_blocks WHERE file_id=?').all(request.id) as Row[]
+  const decisions = states.map((row) => String(row.decision))
+  let aggregate = request.decision as string
+  if (decisions.includes('pending')) aggregate = 'pending'
+  else if (decisions.length > 1) aggregate = 'mixed'
+  else if (decisions.length === 1) aggregate = decisions[0]
+  db.prepare('UPDATE review_files SET decision=? WHERE id=?').run(aggregate, request.id)
 }
 
 /** @public @author ddj 2026年10月26号 @param cwd Workspace. @param request Frozen identity/revision. @returns Idempotent decision; rejection never guesses a target. */
@@ -196,13 +262,18 @@ export function decideReview(cwd: string, request: DecideReview): { revision: nu
     const previous = db.prepare('SELECT request,result FROM review_ops WHERE operation_id=?').get(request.operationId) as Row | undefined
     if (previous) {
       if (previous.request !== encoded) throw new Error('operationId 已用于其他请求')
+      if (!previous.result) throw new Error('Undo 尚待写后核对，请重试原操作')
       db.exec('COMMIT')
       return JSON.parse(String(previous.result))
     }
+    if (db.prepare("SELECT 1 FROM review_ops WHERE state='prepared' AND json_extract(request,'$.id')=?").get(request.id)) {
+      throw new Error('该文件有尚待核对的 Undo，暂不能 Keep')
+    }
     if (request.decision !== 'accepted') throw new Error('缺少可信全文证据，禁止拒绝写回')
     const change = db.prepare(`UPDATE review_files SET decision='accepted',revision=revision+1
       WHERE id=? AND seq=? AND revision=? AND current=1 AND decision='pending'`).run(request.id, request.seq, request.revision)
     if (change.changes !== 1) throw new Error('审查版本冲突，请刷新后重试')
+    changeBlocks(db, request)
     const result = { revision: request.revision + 1 }
     db.prepare("INSERT INTO review_ops VALUES(?,?,'committed',?,NULL)").run(request.operationId, encoded, JSON.stringify(result))
     db.exec('COMMIT')

package/src/reviewEvidence.ts

@@ -0,0 +1,70 @@
+/** Raw UTF-8 evidence and patch correspondence; never reconstructs a historical file from disk. @author ddj 2026年10月27号 */
+import { createHash } from 'node:crypto'
+import { reviewBlocks } from './shared/reviewRegions.js'
+import type { OfficialDiff } from './shared/review.js'
+
+export interface RawReviewFile { present: boolean; bytes: string; hash: string }
+export interface ReviewEvidence { before: RawReviewFile; after: RawReviewFile }
+export interface RawReviewBlock { id: string; before: string; after: string; offset: number }
+
+/** @public @author ddj 2026年10月27号 @param bytes File bytes, or null for confirmed absence. @returns Existence-sensitive immutable digest and base64. */
+export function rawReviewFile(bytes: Uint8Array | null): RawReviewFile {
+  const payload = bytes === null ? Buffer.alloc(0) : Buffer.from(bytes)
+  return { present: bytes !== null, bytes: payload.toString('base64'), hash: createHash('sha256')
+    .update(bytes === null ? 'absent:' : 'present:').update(payload).digest('hex') }
+}
+
+/** @private @author ddj 2026年10月27号 @param file Persisted raw image. @returns UTF-8 storage text preserving BOM and terminators. @throws Binary, invalid encoding or corrupt hash. */
+function rawText(file: RawReviewFile): string {
+  const bytes = Buffer.from(file.bytes, 'base64')
+  if (bytes.length > 8 * 1024 * 1024 || bytes.includes(0)) throw new Error('回滚证据不是受支持的 UTF-8 文本')
+  if (rawReviewFile(file.present ? bytes : null).hash !== file.hash) throw new Error('回滚证据哈希不匹配')
+  // ignoreBOM=true retains the BOM codepoint, allowing byte-identical writeText.
+  const text = new TextDecoder('utf-8', { fatal: true, ignoreBOM: true }).decode(bytes)
+  if (!Buffer.from(text, 'utf8').equals(bytes)) throw new Error('回滚证据无法字节往返')
+  return text
+}
+
+/** @private @author ddj 2026年10月27号 @param text Storage text. @returns Physical lines, retaining each original line ending and excluding BOM. */
+function rawLines(text: string): string[] {
+  const body = text.replace(/^\uFEFF/, '')
+  return body.match(/[^\r\n]*(?:\r\n|\n|\r|$)/g)?.filter((line, index, lines) => line !== '' || index !== lines.length - 1) ?? []
+}
+
+/** @private @author ddj 2026年10月27号 @param lines Physical storage lines. @returns Official logical-line comparison basis. */
+function logical(lines: string[]): string[] { return lines.map((line) => line.replace(/(?:\r\n|\r|\n)$/, '')) }
+
+/** @public @author ddj 2026年10月27号 @param diff Official source. @param evidence Independent raw captures. @returns Exact raw segments only when every official hunk reproduces the entire captured result. @throws Incomplete chain, coarse patch or mismatched context/content. */
+export function evidenceBlocks(diff: OfficialDiff, evidence: ReviewEvidence): RawReviewBlock[] {
+  if (diff.kind !== 'text' || diff.coarse) throw new Error('该官方差异没有可靠文本基线')
+  if (diff.before !== evidence.before.present || diff.after !== evidence.after.present) throw new Error('文件存在性证据不一致')
+  const beforeText = rawText(evidence.before), afterText = rawText(evidence.after)
+  const before = rawLines(beforeText), after = rawLines(afterText)
+  const expected = logical(before)
+  let delta = 0
+  for (const hunk of diff.hunks) {
+    const old = hunk.lines.filter((line) => line[0] === ' ' || line[0] === '-').map((line) => line.slice(1))
+    const next = hunk.lines.filter((line) => line[0] === ' ' || line[0] === '+').map((line) => line.slice(1))
+    if (old.length !== hunk.oldLines || next.length !== hunk.newLines) throw new Error('官方差异行数不一致')
+    const position = Math.max(0, hunk.oldStart - 1) + delta
+    if (JSON.stringify(expected.slice(position, position + old.length)) !== JSON.stringify(old)) throw new Error('原始基线与官方上下文不一致')
+    expected.splice(position, old.length, ...next)
+    delta += next.length - old.length
+  }
+  if (JSON.stringify(expected) !== JSON.stringify(logical(after))) throw new Error('采集链未覆盖全部官方变更')
+  if (!diff.hunks.length && beforeText !== afterText) throw new Error('官方没有提供可撤销的变更块')
+  const blocks = reviewBlocks(diff)
+  const segments = blocks.map((block) => ({ id: block.id,
+    before: before.slice(block.oldStart - 1, block.oldStart - 1 + block.oldLines.length).join(''),
+    after: after.slice(block.newStart - 1, block.newStart - 1 + block.newLines.length).join(''),
+    offset: (afterText.startsWith('\uFEFF') ? 1 : 0) + after.slice(0, block.newStart - 1).join('').length }))
+  let reversed = afterText
+  for (const segment of [...segments].reverse()) reversed = reversed.slice(0, segment.offset) + segment.before + reversed.slice(segment.offset + segment.after.length)
+  if (reversed !== beforeText) throw new Error('官方变更外的 BOM、行尾或末尾换行发生变化，证据不足')
+  return segments
+}
+
+/** @public @author ddj 2026年10月27号 @param evidence Raw original images. @returns Exact before and after UTF-8 storage text for guarded writes. */
+export function evidenceText(evidence: ReviewEvidence): { before: string; after: string } {
+  return { before: rawText(evidence.before), after: rawText(evidence.after) }
+}

package/src/reviewRpc.ts

@@ -1,6 +1,7 @@
 /** Session-scoped official review RPC. @author ddj 2026年10月26号 */
 import type { RpcHandlerMap } from './shared/rpc.js'
 import { decideReview, reviewDetail, reviewPage } from './reviewDb.js'
+import { undoReview } from './reviewUndo.js'
 import { bucketOf, cwdOfSession, sessionOf } from './registry.js'
 import type { Registry } from './registry.js'
 import type { Ctx } from './store.js'
@@ -27,7 +28,15 @@ export function reviewHandlers(ctx: Ctx, registry: Registry): Partial<RpcHandler
     },
     'edrv.review.decide': async (args) => {
       const cwd = await workspace(args.sessionId)
-      return { ok: true, ...decideReview(cwd, args) }
+      try {
+        const result = args.decision === 'rejected'
+          ? await undoReview(ctx, sessionOf(ctx, args.sessionId), cwd, args)
+          : decideReview(cwd, args)
+        return { ok: true, ...result }
+      } catch (error) {
+        // Guard failures are review results, not transport failures: preserve their reason.
+        return { ok: false, error: error instanceof Error ? error.message : String(error) }
+      }
     },
   }
 }

package/src/reviewUndo.ts

@@ -0,0 +1,104 @@
+/** Guarded official undo with a durable write-intent journal. @author ddj 2026年10月27号 */
+import { changeBlocks, reviewDb, reviewDetail } from './reviewDb.js'
+import { evidenceBlocks, evidenceText, rawReviewFile } from './reviewEvidence.js'
+import type { ReviewEvidence } from './reviewEvidence.js'
+import type { DecideReview } from './shared/review.js'
+import type { Ctx, Session } from './store.js'
+import { policyOf, resolveTarget } from './store.js'
+
+type OperationRow = { request: string; state: string; result: string | null; evidence: string }
+interface UndoJournal { before: string; after: string }
+const writes = new Map<string, Promise<unknown>>()
+
+/** @public @author ddj 2026年10月27号 @param ctx Host capability. @param session Authenticated caller. @param cwd Workspace. @param request Frozen file/block version. @returns Durable decision; retries reconcile disk hashes and never blindly repeat a write. @throws Missing evidence, stale state, policy or uncertain write failure. */
+export async function undoReview(ctx: Ctx, session: Session, cwd: string, request: DecideReview): Promise<{ revision: number }> {
+  const detail = reviewDetail(cwd, request.id)
+  const key = JSON.stringify([cwd, detail?.item.currentPath ?? request.id])
+  const prior = writes.get(key) ?? Promise.resolve()
+  const operation = prior.catch(() => undefined).then(() => runUndo(ctx, session, cwd, request))
+  writes.set(key, operation)
+  try { return await operation }
+  finally { if (writes.get(key) === operation) writes.delete(key) }
+}
+
+/** @private @author ddj 2026年10月27号 @param ctx Host. @param session Caller. @param cwd Workspace. @param request Frozen decision. @returns Serialized guarded mutation and journal reconciliation. @throws Conflicting bytes or decisions. */
+async function runUndo(ctx: Ctx, session: Session, cwd: string, request: DecideReview): Promise<{ revision: number }> {
+  const db = reviewDb(cwd)
+  const encoded = JSON.stringify(request)
+  if (!request.operationId || request.operationId.length > 128) throw new Error('operationId 无效')
+  const prior = db.prepare('SELECT * FROM review_ops WHERE operation_id=?').get(request.operationId) as OperationRow | undefined
+  if (prior && prior.request !== encoded) throw new Error('operationId 已用于其他请求')
+  if (prior?.state === 'committed') return JSON.parse(prior.result!)
+  const detail = reviewDetail(cwd, request.id)
+  if (!detail || !detail.item.current || detail.item.seq !== request.seq || detail.item.revision !== request.revision
+    || detail.item.decision !== 'pending') throw new Error('审查版本冲突，请刷新后重试')
+  const fs = ctx.get('fs')
+  if (!fs?.readBytes || !fs?.writeText || !fs?.stat) throw new Error('后端缺少受控回滚能力')
+  const target = await resolveTarget(ctx, session, detail.item.currentPath)
+  const info = await fs.stat(target)
+  if (!info || info.type !== 'file' || !info.version) throw new Error('文件不存在或缺少版本守卫，不能安全 Undo')
+  const bytes = await fs.readBytes(target, undefined, 8 * 1024 * 1024)
+  const current = rawReviewFile(bytes)
+  const observed = await fs.stat(target)
+  if (observed?.version !== info.version) throw new Error('文件在回滚读取期间变化，未修改文件')
+  if (prior) {
+    const journal = JSON.parse(prior.evidence) as UndoJournal
+    if (current.hash === journal.after) return finishUndo(cwd, request)
+    if (current.hash !== journal.before) throw new Error('上次 Undo 状态不确定：磁盘既非写前也非写后，禁止重复执行')
+  }
+  const unresolved = db.prepare("SELECT operation_id FROM review_ops WHERE state='prepared' AND json_extract(request,'$.id')=? AND operation_id<>?")
+    .get(request.id, request.operationId)
+  if (unresolved) throw new Error('存在未核对的 Undo，请使用原操作重试，不能创建另一项写入')
+  const row = db.prepare('SELECT payload FROM review_evidence WHERE file_id=?').get(request.id) as { payload: string } | undefined
+  if (!row) throw new Error('该历史记录缺少可信原始字节证据，不能 Undo；差异仍可展示和 Keep')
+  const evidence = JSON.parse(row.payload) as ReviewEvidence
+  const segments = evidenceBlocks(detail.diff, evidence)
+  const texts = evidenceText(evidence)
+  if (!evidence.before.present || !evidence.after.present) throw new Error('当前后端未提供受控原子删除/重建能力')
+  const selected = detail.blocks.filter((block) => block.decision === 'pending' && (request.scope !== 'hunk' || block.id === request.blockId))
+  if (!selected.length) throw new Error('差异块不存在或已处理')
+  // Build the expected disk version by removing only previously rejected blocks.
+  const rejected = new Set(detail.blocks.filter((block) => block.decision === 'rejected').map((block) => block.id))
+  const expected = reverseBlocks(texts.after, segments, rejected)
+  if (rawReviewFile(Buffer.from(expected)).hash !== current.hash) throw new Error('当前文件已被后续编辑，版本与回滚证据冲突，未修改文件')
+  const undo = new Set([...rejected, ...selected.map((block) => block.id)])
+  const next = reverseBlocks(texts.after, segments, undo)
+  const journal = { before: current.hash, after: rawReviewFile(Buffer.from(next)).hash }
+  const latest = reviewDetail(cwd, request.id)
+  if (!latest?.item.current || latest.item.revision !== request.revision || latest.item.decision !== 'pending') {
+    throw new Error('审查版本在回滚校验期间变化，未修改文件')
+  }
+  db.prepare("INSERT INTO review_ops VALUES(?,?,'prepared',NULL,?) ON CONFLICT(operation_id) DO NOTHING")
+    .run(request.operationId, encoded, JSON.stringify(journal))
+  // Provider checks the exact observation inside its atomic mutation critical section.
+  await fs.writeText(target, next, { kind: 'replaceIfVersion', version: info.version }, undefined, policyOf(ctx, session))
+  const written = rawReviewFile(await fs.readBytes(target, undefined, 8 * 1024 * 1024))
+  if (written.hash !== journal.after) throw new Error('Undo 写后内容不确定，请保留原操作重试核对')
+  return finishUndo(cwd, request)
+}
+
+/** @private @author ddj 2026年10月27号 @param text Captured result. @param segments Validated raw ranges. @param rejected Blocks to reverse. @returns Raw storage text preserving unselected blocks. */
+function reverseBlocks(text: string, segments: ReturnType<typeof evidenceBlocks>, rejected: Set<string>): string {
+  let result = text
+  for (const segment of [...segments].reverse()) {
+    if (!rejected.has(segment.id)) continue
+    result = result.slice(0, segment.offset) + segment.before + result.slice(segment.offset + segment.after.length)
+  }
+  return result
+}
+
+/** @private @author ddj 2026年10月27号 @param cwd Workspace. @param request Frozen action. @returns Transactionally committed status, or a retryable prepared journal if the database fails. */
+function finishUndo(cwd: string, request: DecideReview): { revision: number } {
+  const db = reviewDb(cwd)
+  db.exec('BEGIN IMMEDIATE')
+  try {
+    const updated = db.prepare("UPDATE review_files SET revision=revision+1 WHERE id=? AND seq=? AND revision=? AND current=1 AND decision='pending'")
+      .run(request.id, request.seq, request.revision)
+    if (updated.changes !== 1) throw new Error('审查版本冲突，请核对已执行 Undo')
+    changeBlocks(db, request)
+    const result = { revision: request.revision + 1 }
+    db.prepare("UPDATE review_ops SET state='committed',result=? WHERE operation_id=?").run(JSON.stringify(result), request.operationId)
+    db.exec('COMMIT')
+    return result
+  } catch (error) { if (db.isTransaction) db.exec('ROLLBACK'); throw error }
+}

package/src/shared/review.ts

@@ -35,6 +35,7 @@ export interface ReviewSnapshot {
   files: { identity: string; diff: OfficialDiff }[]
 }
 export type ReviewDecision = 'pending' | 'accepted' | 'rejected'
+export type ReviewFileDecision = ReviewDecision | 'mixed'
 export interface ReviewItem {
   id: string
   sessionId: string
@@ -46,7 +47,7 @@ export interface ReviewItem {
   added: number
   deleted: number
   kind: OfficialDiff['kind']
-  decision: ReviewDecision
+  decision: ReviewFileDecision
   revision: number
   current: boolean
 }
@@ -54,6 +55,7 @@ export interface ReviewDetail {
   item: ReviewItem
   diff: OfficialDiff
   capturedAt: string
+  blocks: import('./reviewRegions.js').ReviewBlockState[]
   capability: { keep: boolean; undo: boolean; reason: string }
 }
 export interface CaptureGap {
@@ -86,6 +88,8 @@ export interface DecideReview extends ReviewRequest {
   seq: number
   revision: number
   operationId: string
+  scope?: 'file' | 'hunk'
+  blockId?: string
   decision: 'accepted' | 'rejected'
 }
 export type ReviewResult<T> = ({ ok: true } & T) | { ok: false; error: string }

package/src/shared/reviewRegions.ts

@@ -0,0 +1,74 @@
+/** Official patch parsing shared by review decisions and editor display. @author ddj 2026年10月27号 */
+import type { OfficialDiff, ReviewDecision } from './review.js'
+
+export interface ReviewBlock {
+  id: string
+  hunkIndex: number
+  oldStart: number
+  newStart: number
+  oldLines: string[]
+  newLines: string[]
+  contextBefore: string[]
+  contextAfter: string[]
+}
+export interface ReviewBlockState { id: string; decision: ReviewDecision }
+export interface ReviewRegion extends ReviewBlock {
+  sourceKind: 'official'
+  recordId: string
+  idx: number
+  status: ReviewDecision
+  stale: boolean
+  start?: number
+  end?: number
+}
+
+/** @public @author ddj 2026年10月27号 @param diff Immutable official patch. @returns Contiguous change runs with stable source-coordinate identities. */
+export function reviewBlocks(diff: OfficialDiff): ReviewBlock[] {
+  if (diff.kind !== 'text') return []
+  const blocks: ReviewBlock[] = []
+  for (const [hunkIndex, hunk] of diff.hunks.entries()) {
+    let oldLine = hunk.oldStart, newLine = hunk.newStart
+    let before: string[] = []
+    let current: ReviewBlock | undefined
+    for (const line of hunk.lines) {
+      const marker = line[0], text = line.slice(1)
+      if (marker === ' ') {
+        if (current) { current.contextAfter.push(text); current = undefined }
+        else if (blocks.at(-1)?.hunkIndex === hunkIndex) blocks.at(-1)!.contextAfter.push(text)
+        before.push(text); oldLine++; newLine++
+        continue
+      }
+      if (marker !== '+' && marker !== '-') continue
+      if (!current) {
+        current = { id: `${hunkIndex}:${oldLine}:${newLine}`, hunkIndex, oldStart: oldLine, newStart: newLine,
+          oldLines: [], newLines: [], contextBefore: before.slice(-3), contextAfter: [] }
+        blocks.push(current); before = []
+      }
+      if (marker === '-') { current.oldLines.push(text); oldLine++ }
+      else { current.newLines.push(text); newLine++ }
+    }
+  }
+  return blocks
+}
+
+/** @public @author ddj 2026年10月27号 @param diff Source patch. @param recordId Official record, not a tool call. @param states Persisted per-block decisions. @param content Current editor text; null has no current-file location. @returns Regions only located by unique full contextual matches, never by guessed history line numbers. */
+export function reviewRegions(diff: OfficialDiff, recordId: string, states: ReviewBlockState[], content: string | null): ReviewRegion[] {
+  const lines = content === null ? null : content.replace(/^\uFEFF/, '').replace(/\r\n/g, '\n').split('\n')
+  return reviewBlocks(diff).map((block, idx) => {
+    const status = states.find((state) => state.id === block.id)?.decision ?? 'pending'
+    const region: ReviewRegion = { ...block, sourceKind: 'official', recordId, idx, status, stale: true }
+    if (!lines) return region
+    const pattern = [...block.contextBefore, ...block.newLines, ...block.contextAfter]
+    if (!pattern.length) return region
+    const matches: number[] = []
+    for (let offset = 0; offset + pattern.length <= lines.length; offset++) {
+      if (pattern.every((text, index) => lines[offset + index] === text)) matches.push(offset)
+      if (matches.length > 1) break
+    }
+    if (matches.length !== 1) return region
+    region.start = matches[0] + block.contextBefore.length + 1
+    region.end = region.start + block.newLines.length
+    region.stale = false
+    return region
+  })
+}