JOJO
26f31a09ec
根因：state.jsonl 采用只追加日志，track_edit 的中间半成品快照与 make_snapshot 的完整快照各自成行；加载时每行都被回放为独立快照， _find_snapshot_pair 简单取下标-1 作为上一快照，导致 diff 基准落在 同一条消息自己的半成品行上——半成品中缺失的已跟踪文件被全部判为 added 并按全文件计新增（如 +1928 -0）。 彻底修复（非补丁）： - 持久化改为原子全量重写（temp + os.replace），结构性保证磁盘上 一条 message_id 永远只有一行 - _load_state 幂等重载并在加载时折叠历史重复行（保留每消息最后一行）， 旧脏数据无需迁移即可透明愈合 - track_edit / make_snapshot 在按 state 文件加锁的临界区内执行 重载->变更->保存，避免短生命周期实例间丢行 - _find_snapshot_pair 防御性跳过同 message_id 行 - 新增 6 个回归测试（test/test_shallow_versioning.py） 验证：新测试 6/6 通过；test_server_refactor_smoke 6/6 通过； 用 conv_20260721_175016_796 真实数据只读复算，seq8 由 +1295/-0 修正为 +796/-7（3 文件），seq10 由 +1928/-0 修正为 +592/-3（4 文件）， seq31 与历史正确记录 +482/-1 完全一致。
206 lines
10 KiB
Python
206 lines
10 KiB
Python
"""Regression tests for shallow versioning snapshot pairing.
|
|
|
|
Covers the bug where intermediate track_edit journal rows persisted to
|
|
state.jsonl were replayed as independent snapshots, causing diffs to be
|
|
computed against a partial snapshot of the *same* message (every tracked
|
|
file showed as "added" with full insertions, e.g. +1928 -0).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import shutil
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from modules.shallow_versioning import ShallowVersioningManager
|
|
|
|
|
|
def _new_manager(project: Path, data: Path, conv: str = "conv_test") -> ShallowVersioningManager:
|
|
"""Mirror production usage: a fresh short-lived instance per operation."""
|
|
return ShallowVersioningManager(project_path=project, data_dir=data, conversation_id=conv)
|
|
|
|
|
|
def _read_state_rows(data: Path, conv: str = "conv_test"):
|
|
state_file = data / "save" / conv / "shallow_backups" / "state.jsonl"
|
|
if not state_file.exists():
|
|
return []
|
|
return [json.loads(line) for line in state_file.read_text(encoding="utf-8").splitlines() if line.strip()]
|
|
|
|
|
|
class ShallowVersioningPairingTest(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self.tmp = Path(tempfile.mkdtemp(prefix="shallow_ver_test_"))
|
|
self.project = self.tmp / "project"
|
|
self.data = self.tmp / "data"
|
|
self.project.mkdir(parents=True)
|
|
self.data.mkdir(parents=True)
|
|
|
|
def tearDown(self) -> None:
|
|
shutil.rmtree(self.tmp, ignore_errors=True)
|
|
|
|
def _write(self, rel: str, content: str) -> None:
|
|
path = self.project / rel
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
path.write_text(content, encoding="utf-8")
|
|
|
|
# ------------------------------------------------------------------
|
|
# realistic multi-instance flow (the original bug scenario)
|
|
# ------------------------------------------------------------------
|
|
def test_diff_pairs_with_previous_message_across_instances(self) -> None:
|
|
# message 1: AI creates two new files (each track_edit runs in its own instance)
|
|
self._write("a.txt", "a1\na2\n")
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_1")
|
|
self._write("b.txt", "b1\nb2\n")
|
|
_new_manager(self.project, self.data).track_edit("b.txt", "msg_1")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_1")
|
|
|
|
# message 2: modify a.txt, create c.txt
|
|
self._write("a.txt", "a1\na2 changed\na3\n")
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_2")
|
|
self._write("c.txt", "c1\n")
|
|
_new_manager(self.project, self.data).track_edit("c.txt", "msg_2")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_2")
|
|
|
|
# state file must hold exactly one row per message
|
|
rows = _read_state_rows(self.data)
|
|
msg_ids = [r["message_id"] for r in rows]
|
|
self.assertEqual(msg_ids.count("msg_1"), 1, f"duplicate msg_1 rows: {msg_ids}")
|
|
self.assertEqual(msg_ids.count("msg_2"), 1, f"duplicate msg_2 rows: {msg_ids}")
|
|
|
|
# lazy reader (fresh instance, like the HTTP endpoints)
|
|
reader = _new_manager(self.project, self.data)
|
|
stats = reader.get_diff_stats("msg_2") or {}
|
|
files = {f["path"]: f for f in reader.get_file_diff_stats("msg_2")}
|
|
|
|
# a.txt modified (+2 -1), c.txt added (+1 -0), b.txt untouched
|
|
self.assertEqual(set(files), {"a.txt", "c.txt"}, f"unexpected diff set: {files}")
|
|
self.assertEqual(files["a.txt"]["status"], "modified")
|
|
self.assertEqual((files["a.txt"]["insertions"], files["a.txt"]["deletions"]), (2, 1))
|
|
self.assertEqual(files["c.txt"]["status"], "added")
|
|
self.assertEqual((files["c.txt"]["insertions"], files["c.txt"]["deletions"]), (1, 0))
|
|
self.assertEqual(stats.get("insertions"), 3)
|
|
self.assertEqual(stats.get("deletions"), 1)
|
|
|
|
# ------------------------------------------------------------------
|
|
# legacy dirty logs: duplicates collapsed at load, healed on next save
|
|
# ------------------------------------------------------------------
|
|
def test_legacy_duplicate_rows_healed_on_load(self) -> None:
|
|
conv = "conv_legacy"
|
|
backup_dir = self.data / "save" / conv / "shallow_backups"
|
|
backup_dir.mkdir(parents=True)
|
|
|
|
# real backup files for a.txt v1/v2 and b.txt v1
|
|
(backup_dir / "a@v1").write_text("a1\na2\n", encoding="utf-8")
|
|
(backup_dir / "a@v2").write_text("a1\na2 changed\na3\n", encoding="utf-8")
|
|
(backup_dir / "b@v1").write_text("b1\n", encoding="utf-8")
|
|
|
|
def backup(name, version):
|
|
return {"backup_file_name": name, "version": version, "backup_time": "t"}
|
|
|
|
# hand-craft the legacy append-only pattern: partials + full per message
|
|
legacy_rows = [
|
|
{"message_id": "msg_1", "timestamp": "t", "tracked_file_backups": {"a.txt": backup("a@v1", 1)}},
|
|
{"message_id": "msg_1", "timestamp": "t", "tracked_file_backups": {"a.txt": backup("a@v1", 1), "b.txt": backup("b@v1", 1)}},
|
|
{"message_id": "msg_2", "timestamp": "t", "tracked_file_backups": {"a.txt": backup("a@v2", 2), "b.txt": backup("b@v1", 1)}},
|
|
]
|
|
state_file = backup_dir / "state.jsonl"
|
|
state_file.write_text("".join(json.dumps(r) + "\n" for r in legacy_rows), encoding="utf-8")
|
|
|
|
manager = _new_manager(self.project, self.data, conv)
|
|
# load collapses duplicates: one snapshot per message
|
|
self.assertEqual(len(manager.list_snapshots()), 2)
|
|
# diff for msg_2 pairs against msg_1 full: only a.txt modified, NOT both added
|
|
files = {f["path"]: f for f in manager.get_file_diff_stats("msg_2")}
|
|
self.assertEqual(set(files), {"a.txt"}, f"unexpected diff set: {files}")
|
|
self.assertEqual(files["a.txt"]["status"], "modified")
|
|
self.assertEqual((files["a.txt"]["insertions"], files["a.txt"]["deletions"]), (2, 1))
|
|
|
|
# next mutation rewrites the file clean (one row per message)
|
|
self._write("a.txt", "a1\na2 changed\na3\na4\n")
|
|
_new_manager(self.project, self.data, conv).track_edit("a.txt", "msg_3")
|
|
_new_manager(self.project, self.data, conv).make_snapshot("msg_3")
|
|
rows = _read_state_rows(self.data, conv)
|
|
msg_ids = [r["message_id"] for r in rows]
|
|
self.assertEqual(len(msg_ids), len(set(msg_ids)), f"duplicates remain: {msg_ids}")
|
|
|
|
# ------------------------------------------------------------------
|
|
# message with exactly one newly tracked file (recorded stats were
|
|
# accidentally correct pre-fix; lazy view was not)
|
|
# ------------------------------------------------------------------
|
|
def test_single_new_file_message(self) -> None:
|
|
self._write("a.txt", "a1\n")
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_1")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_1")
|
|
|
|
# msg_2 edits a.txt and tracks one new file b.txt
|
|
self._write("a.txt", "a1\na2\n")
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_2")
|
|
self._write("b.txt", "b1\nb2\nb3\n")
|
|
_new_manager(self.project, self.data).track_edit("b.txt", "msg_2")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_2")
|
|
|
|
reader = _new_manager(self.project, self.data)
|
|
files = {f["path"]: f for f in reader.get_file_diff_stats("msg_2")}
|
|
self.assertEqual(set(files), {"a.txt", "b.txt"})
|
|
self.assertEqual(files["a.txt"]["status"], "modified")
|
|
self.assertEqual((files["a.txt"]["insertions"], files["a.txt"]["deletions"]), (1, 0))
|
|
self.assertEqual(files["b.txt"]["status"], "added")
|
|
self.assertEqual((files["b.txt"]["insertions"], files["b.txt"]["deletions"]), (3, 0))
|
|
|
|
# ------------------------------------------------------------------
|
|
# cross-instance visibility: mutation reloads state inside the lock
|
|
# ------------------------------------------------------------------
|
|
def test_mutation_reloads_state_from_other_instances(self) -> None:
|
|
self._write("a.txt", "a1\n")
|
|
stale = _new_manager(self.project, self.data) # loads empty state
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_1")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_1")
|
|
|
|
# stale instance mutates: must not wipe msg_1's row
|
|
self._write("b.txt", "b1\n")
|
|
stale.track_edit("b.txt", "msg_2")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_2")
|
|
|
|
rows = _read_state_rows(self.data)
|
|
msg_ids = [r["message_id"] for r in rows]
|
|
self.assertIn("msg_1", msg_ids)
|
|
self.assertIn("msg_2", msg_ids)
|
|
self.assertEqual(len(msg_ids), 2)
|
|
|
|
# ------------------------------------------------------------------
|
|
# rewind still works
|
|
# ------------------------------------------------------------------
|
|
def test_rewind_restores_tracked_files(self) -> None:
|
|
self._write("a.txt", "original\n")
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_1")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_1")
|
|
|
|
self._write("a.txt", "modified\n")
|
|
_new_manager(self.project, self.data).track_edit("a.txt", "msg_2")
|
|
_new_manager(self.project, self.data).make_snapshot("msg_2")
|
|
|
|
result = _new_manager(self.project, self.data).rewind("msg_1")
|
|
self.assertTrue(result.get("success"))
|
|
self.assertEqual((self.project / "a.txt").read_text(encoding="utf-8"), "original\n")
|
|
|
|
# ------------------------------------------------------------------
|
|
# get_snapshot_by_seq maps to user messages correctly
|
|
# ------------------------------------------------------------------
|
|
def test_get_snapshot_by_seq(self) -> None:
|
|
for i in (1, 2, 3):
|
|
self._write(f"f{i}.txt", f"content {i}\n")
|
|
_new_manager(self.project, self.data).track_edit(f"f{i}.txt", f"msg_{i}")
|
|
_new_manager(self.project, self.data).make_snapshot(f"msg_{i}")
|
|
|
|
reader = _new_manager(self.project, self.data)
|
|
self.assertEqual(reader.get_snapshot_by_seq(1).message_id, "msg_1")
|
|
self.assertEqual(reader.get_snapshot_by_seq(2).message_id, "msg_2")
|
|
self.assertEqual(reader.get_snapshot_by_seq(3).message_id, "msg_3")
|
|
self.assertIsNone(reader.get_snapshot_by_seq(4))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|