dsh-config-manager 0.1.76 → 0.1.78

package/src/core/rollback-point.test.ts

@@ -28,6 +28,8 @@ import fs from 'node:fs/promises'
 import os from 'node:os'
 import path from 'node:path'
 
+import { RollbackWriteAttribution } from './rollback-attribution.ts'
+
 import {
   ROLLBACK_ANCESTOR_MAX_DEPTH,
   ROLLBACK_DEFAULT_CAPTURE_INFLIGHT_BYTES,
@@ -3426,3 +3428,413 @@ test('R-41 回退期走查也有时间预算：中断只让候选变少（安全
 })
 
 
+
+/* ------------------------------------------------------------------ A+B（2026-10-17）：路径级选择性恢复 + 写入归属隔离 */
+
+test('A-1 路径级选择性恢复：只恢复点名的文件，其余原样保留并如实计数', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx)
+  const captured = await capturePoint(engine, fx)
+  const id = captured.point?.id
+  assert.ok(id !== undefined)
+  const a = path.join(fx.workspaceDir, 'a.txt')
+  const b = path.join(fx.workspaceDir, 'src', 'b.txt')
+  await fs.writeFile(a, 'A2')
+  await fs.writeFile(b, 'B2')
+  const result = await engine.rewind({ id, userConfirmed: true, mode: 'files', onlyPaths: [a] })
+  assert.equal(result.outcome, 'restored')
+  assert.equal(await readText(a), 'A1', '点名的文件被恢复')
+  assert.equal(await readText(b), 'B2', '没点名的文件一个字节都不动')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.selectionSkipped, 1, '跳过的条目数必须如实回传')
+})
+
+test('A-2 点名一个「既未记录、也不在删除候选」的路径 ⇒ fail-closed 零写入', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx)
+  const captured = await capturePoint(engine, fx)
+  const id = captured.point?.id
+  assert.ok(id !== undefined)
+  const a = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(a, 'A2')
+  const result = await engine.rewind({ id, userConfirmed: true, mode: 'files', onlyPaths: [path.join(fx.workspaceDir, 'nope.txt'), a] })
+  assert.equal(result.outcome, 'failed')
+  // 顶层 code 是既有口径（工作区段失败恒 restore-failed）—— 具体原因逐字在段里，可查
+  assert.equal(result.segments[0]?.reasonCode, 'invalid-input')
+  assert.equal(result.segments[0]?.detail.some((line) => line.includes('selection-unknown-path')), true)
+  assert.equal(result.segments[0]?.restored, 0)
+  assert.equal(await readText(a), 'A2', '拒绝时零写入（连点名的那条也不写）')
+})
+
+test('B-1 归属隔离：留点后被**别的会话**写过的文件，回退不动它（并如实计数）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr })
+  const captured = await capturePoint(engine, fx)
+  const id = captured.point?.id
+  assert.ok(id !== undefined)
+  const a = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(a, 'A2')
+  attr.noteToolCall('session-OTHER', { name: 'write', callId: 'c1', arguments: JSON.stringify({ file_path: a }) })
+  const result = await engine.rewind({ id, userConfirmed: true, mode: 'files' })
+  assert.equal(result.outcome, 'restored')
+  assert.equal(await readText(a), 'A2', '别的会话的改动不被这次回退撤销')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.foreignSkipped, 1)
+})
+
+test('B-2 归属是**本会话** / 未判定 ⇒ 照常恢复（未判定绝不当作别的会话写的）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr })
+  const captured = await capturePoint(engine, fx)
+  const id = captured.point?.id
+  assert.ok(id !== undefined)
+  const a = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(a, 'A2')
+  // 本会话写的 ⇒ 归属有、但不是「别的会话」⇒ 照常恢复
+  attr.noteToolCall('session-1111', { name: 'write', callId: 'c2', arguments: JSON.stringify({ file_path: a }) })
+  const result = await engine.rewind({ id, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(a), 'A1')
+  assert.equal(result.segments.find((s) => s.state === 'workspace')?.foreignSkipped, undefined)
+})
+
+test('B-3 显式点名压过归属隔离：用户明确要它，归属不再拦', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr })
+  const captured = await capturePoint(engine, fx)
+  const id = captured.point?.id
+  assert.ok(id !== undefined)
+  const a = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(a, 'A2')
+  attr.noteToolCall('session-OTHER', { name: 'write', callId: 'c3', arguments: JSON.stringify({ file_path: a }) })
+  const result = await engine.rewind({ id, userConfirmed: true, mode: 'files', onlyPaths: [a] })
+  assert.equal(await readText(a), 'A1', '显式点名 = 用户要它，归属隔离不再生效')
+  assert.equal(result.segments.find((s) => s.state === 'workspace')?.foreignSkipped, undefined)
+})
+
+/* ------------------------------------------------------------------ 跨对话三方合并（2026-10-17） */
+
+const V0_TEXT = 'line1\nline2\nline3\nline4\nline5\n'
+
+test('C-1 A、B 改同一文件的不同区域 ⇒ 撤销 A、保留 B（按最终内容断言）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  // 引擎时钟每次 +1ms ⇒ 三个时刻严格递增（同毫秒会让「目标点之后最早的点」找不到）
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  // A 改第 1 行 ⇒ V1
+  const v1 = 'A-changed\nline2\nline3\nline4\nline5\n'
+  await fs.writeFile(file, v1)
+  // B 的回合开始 ⇒ 它的点内容 = V1（三方合并的 base）
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  // B 改第 5 行 ⇒ V2
+  await fs.writeFile(file, 'A-changed\nline2\nline3\nline4\nB-changed\n')
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c1', arguments: JSON.stringify({ file_path: file }) })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), 'line1\nline2\nline3\nline4\nB-changed\n', 'A 的第 1 行被撤销、B 的第 5 行被保留')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.mergedCount, 1)
+  assert.equal(segment?.conflictCount, undefined)
+})
+
+test('C-2 A、B 改同一行 ⇒ 报冲突、文件保持 B 的版本（绝不自动选边）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'line1\nline2\nA-same\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  const v2 = 'line1\nline2\nB-same\nline4\nline5\n'
+  await fs.writeFile(file, v2)
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c2', arguments: JSON.stringify({ file_path: file }) })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), v2, '冲突时一个字节都不写')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.conflictCount, 1)
+  assert.deepEqual(segment?.conflictPaths, [file])
+})
+
+test('C-3 B 在留点后删除了文件 ⇒ 不重建（theirs-missing，如实报告）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A-changed\nline2\nline3\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.rm(file)
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c3', arguments: JSON.stringify({ file_path: file }) })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  await assert.rejects(fs.stat(file), '别人删掉的文件不得被这次回退悄悄重建')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.unavailableCount, 1)
+  assert.equal(segment?.mergedCount, undefined)
+})
+
+test('C-4 删除集保护：留点后由别的会话新建/写入的路径不被删', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  const created = path.join(fx.workspaceDir, 'other.txt')
+  await fs.writeFile(created, 'by B')
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c4', arguments: JSON.stringify({ file_path: created }) })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files', removeCreated: true })
+  assert.equal(await readText(created), 'by B', '别的会话新建的文件不得被删')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal((segment?.createdSkipped ?? []).includes(created), true)
+})
+
+test('C-5 合并之后、写入之前文件又被改过 ⇒ 放弃写入（并发保护）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A-changed\nline2\nline3\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'A-changed\nline2\nline3\nline4\nB-changed\n')
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c5', arguments: JSON.stringify({ file_path: file }) })
+  // 在「前像暂存」这一步模拟外部再改一次（它紧跟在合并与 needed 判定之后、真正写入之前）
+  const self = engine as unknown as { openUndoStager: () => Promise<unknown> }
+  const original = self.openUndoStager.bind(engine)
+  self.openUndoStager = async () => {
+    await fs.writeFile(file, 'EXTERNAL-TOUCH\n')
+    return await original()
+  }
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), 'EXTERNAL-TOUCH\n', '比我们更新的内容绝不被覆盖')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.concurrentCount, 1)
+})
+
+test('C-6 没有中间版本 ⇒ 不写、如实报告（no-base）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  const later = 'line1\nline2\nline3\nline4\nSOMEONE-ELSE\n'
+  await fs.writeFile(file, later)
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c6', arguments: JSON.stringify({ file_path: file }) })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), later, '拿不到共同祖先就不动它')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.unavailableCount, 1)
+})
+
+test('C-7 对方没改过（theirs==base）⇒ 照常恢复本会话的目标版本', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const attr = new RollbackWriteAttribution({ file: path.join(fx.dataDir, 'rollback-points', 'attribution.json'), flushDelayMs: 0 })
+  const engine = makeEngine(fx, { attribution: attr, now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  const v1 = 'A-changed\nline2\nline3\nline4\nline5\n'
+  await fs.writeFile(file, v1)
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  // 归属表明「别的会话碰过它」，但内容其实没变（= base）⇒ 合并结果 = ours ⇒ 照常回退
+  attr.noteToolCall('session-B', { name: 'write', callId: 'c7', arguments: JSON.stringify({ file_path: file }) })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), V0_TEXT, '对方没动过 ⇒ 回到目标版本')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.mergedCount, 1)
+})
+
+test('C-8 **无归属也要合并**：归属缺失不得退回整文件覆盖（真机 2026-10-17 回归）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  // 刻意**不传 attribution**：归属可能因为工具白名单 / 跨进程整体覆盖 / 采集时机而整条缺失
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nB-line\n')
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), 'line1\nline2\nline3\nline4\nB-line\n',
+    '没有归属证据时也必须三方合并：撤销 A、保留 B，绝不整文件覆盖')
+  assert.equal(result.segments[0]?.mergedCount, 1)
+  assert.equal(result.segments[0]?.conflictCount, undefined)
+})
+
+test('C-9 只有本会话的点 ⇒ 保持旧语义（整文件覆盖回目标版本）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A1\nline2\nline3\nline4\nline5\n')
+  // 同一个会话的第二个回合点：它**不是**别人的共同祖先，不得拿来当 base
+  await capturePoint(engine, fx, { sessionId: 'session-A' })
+  await fs.writeFile(file, 'A1\nline2\nline3\nline4\nA2\n')
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), V0_TEXT, '纯本会话回退仍是整文件回到目标版本')
+  assert.equal(result.segments[0]?.mergedCount, undefined)
+})
+
+test('C-10 删除保护不依赖归属：别的会话点里记录过的路径不删', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  const created = path.join(fx.workspaceDir, 'other.txt')
+  await fs.writeFile(created, 'by B')
+  // B 的回合点记到了这个文件（= 它确实在留点之后被别人的回合捕获过）
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files', removeCreated: true })
+  assert.equal(await readText(created), 'by B', '别人碰过的文件不得被删（不依赖归属台账）')
+  assert.equal((result.segments[0]?.createdSkipped ?? []).includes(created), true)
+})
+
+test('C-11 预览与执行同口径：别人的那行不得算成「会被删」', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nB-line\n')
+  const preview = await engine.preview(idA)
+  const row = (preview.workspace?.files ?? []).find((item) => item.path === file)
+  assert.ok(row !== undefined, '该文件必须出现在「会被改动」清单里')
+  assert.equal(row?.skipped, undefined, '能合并且确实要写 ⇒ 不是「不会改动」')
+  // 只涉及 A 的那一行：写回 line1（+1）、删掉 A-line（−1）；B 的 B-line 一个字都不算
+  assert.equal(row?.added, 1)
+  assert.equal(row?.removed, 1)
+})
+
+test('C-12 预览标注「不会改动」：冲突文件的差异不给数字（不谎报会被改）', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'line1\nline2\nA-same\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'line1\nline2\nB-same\nline4\nline5\n')
+  const preview = await engine.preview(idA)
+  const row = (preview.workspace?.files ?? []).find((item) => item.path === file)
+  assert.equal(row?.skipped, true, '冲突 ⇒ 预览必须标「不会改动」')
+  assert.equal(row?.added, null, '「不改动」不是「0 行变化」')
+  assert.equal(row?.removed, null)
+  assert.equal(typeof row?.mergeReason, 'string')
+})
+
+test('D-1 单文件差异与执行同口径：「回退后」一侧是合并结果，不是记录原文', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nB-line\n')
+  const diff = await engine.fileDiff(idA, file)
+  assert.equal(diff.ok, true)
+  assert.equal(diff.merged, true, '「回退后」必须标成合并结果')
+  assert.equal(diff.mergeSkipped, undefined)
+  assert.equal(diff.added, 1, '只涉及 A 那一行')
+  assert.equal(diff.removed, 1)
+  assert.equal(diff.after.lines, 5, '合并结果仍是 5 行（B 那一行还在）')
+})
+
+test('D-2 冲突时单文件差异说「不会改动」：两侧相同、不给假的覆盖差异', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'line1\nline2\nA-same\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'line1\nline2\nB-same\nline4\nline5\n')
+  const diff = await engine.fileDiff(idA, file)
+  assert.equal(diff.mergeSkipped, true, '冲突 ⇒ 必须说「不会改动」')
+  assert.equal(diff.merged, undefined)
+  assert.equal(diff.identical, true, '「回退后」= 现状 ⇒ 两侧一致（不是「覆盖成记录原文」）')
+  assert.equal(typeof diff.mergeReason, 'string')
+})
+
+test('E-1 合并结论若等于现状 ⇒ 报「无法安全撤销」，绝不静默当成「无需改动」', async (t) => {
+  const fx = await makeFixture()
+  t.after(fx.cleanup)
+  const engine = makeEngine(fx, { now: steppingClock(1_000_000, 1) })
+  const file = path.join(fx.workspaceDir, 'a.txt')
+  // V0（目标点）→ A 改动 → B 改动 → 之后又出现「两改动都在」的更晚快照（别的会话）
+  await fs.writeFile(file, V0_TEXT)
+  const pa = await capturePoint(engine, fx, { sessionId: 'session-A' })
+  const idA = pa.point?.id
+  assert.ok(idA !== undefined)
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nline5\n')
+  await capturePoint(engine, fx, { sessionId: 'session-B' })
+  await fs.writeFile(file, 'A-line\nline2\nline3\nline4\nB-line\n')
+  // 目标点之后、别的会话的一份**更晚**快照，其内容把两个改动都包含进去（真机里的 base 来源）
+  await capturePoint(engine, fx, { sessionId: 'session-C' })
+  // 现在磁盘上只剩 B 的改动（模拟「A 已被回退」之后的状态）
+  const theirs = 'line1\nline2\nline3\nline4\nB-line\n'
+  await fs.writeFile(file, theirs)
+  const preview = await engine.preview(idA)
+  const row = (preview.workspace?.files ?? []).find((item) => item.path === file)
+  assert.equal(row?.skipped, true, '必须如实标「不会改动」，而不是显示成 0 个文件')
+  assert.equal(row?.mergeReason, 'ambiguous')
+  const result = await engine.rewind({ id: idA, userConfirmed: true, mode: 'files' })
+  assert.equal(await readText(file), theirs, '无法安全撤销 ⇒ 一个字节都不写')
+  const segment = result.segments.find((s) => s.state === 'workspace')
+  assert.equal(segment?.unavailableCount, 1)
+})