Block reading notes sync deletions

Author: chengtan9907

deployments/desktop/shared/agents.py

@@ -1368,6 +1368,33 @@ def _is_non_fast_forward_push(output: str) -> bool:
     return "non-fast-forward" in normalized or "fetch first" in normalized
 
 
+def _guard_reading_notes_deletions(repo_dir: Path, language: str) -> None:
+    deleted = [
+        line.strip()
+        for line in _git_output(["diff", "--cached", "--name-only", "--diff-filter=D"], repo_dir).splitlines()
+        if line.strip()
+    ]
+    if not deleted:
+        return
+    _run_git(["checkout", "HEAD", "--", *deleted], repo_dir, check=False)
+    preview = "\n".join(f"- {path}" for path in deleted[:12])
+    if len(deleted) > 12:
+        preview += f"\n- ... and {len(deleted) - 12} more"
+    raise RuntimeError(
+        (
+            "GitHub sync blocked because it would delete reading-note files. "
+            "PaperFlow GUI sync is additive by default; delete files manually with Git if that is intended.\n"
+            f"{preview}"
+        )
+        if language == "en"
+        else (
+            "GitHub 同步已阻止：本次同步会删除阅读笔记文件。"
+            "PaperFlow GUI 同步默认只允许新增/修改；如果确实要删除文件，请手动用 Git 删除后提交。\n"
+            f"{preview}"
+        )
+    )
+
+
 def _remote_first_sync_notes_worktree(repo_dir: Path, branch: str, language: str) -> Tuple[bool, bool, str]:
     local_patch = ""
     if _git_output(["status", "--short"], repo_dir):
@@ -1503,6 +1530,7 @@ def sync_reading_notes_github(user_id: str = "", response_language: str = "zh")
     pull_warning = remote_first_message if remote_conflict_discarded else ""
 
     _run_git(["add", "."], repo_dir)
+    _guard_reading_notes_deletions(repo_dir, language)
     llm_review = _notes_llm_sync_review(
         repo_dir,
         branch,

tests/test_desktop_gui.py

@@ -1368,6 +1368,44 @@ def test_desktop_github_sync_applies_local_changes_after_remote_first_sync(tmp_p
     assert (clone_check / "Daily Note - Jun 2026.md").exists()
 
 
+def test_desktop_github_sync_blocks_reading_note_deletions(tmp_path, monkeypatch: pytest.MonkeyPatch) -> None:
+    bare = tmp_path / "notes.git"
+    seed = tmp_path / "seed"
+    notes = tmp_path / "Daily Note 2026"
+    agents._run_git(["init", "--bare", str(bare)], tmp_path)  # noqa: SLF001 - git sync contract
+    seed.mkdir()
+    agents._run_git(["init"], seed)  # noqa: SLF001
+    agents._run_git(["checkout", "-b", "main"], seed)  # noqa: SLF001
+    agents._run_git(["config", "user.email", "paperflow@example.com"], seed)  # noqa: SLF001
+    agents._run_git(["config", "user.name", "PaperFlow Test"], seed)  # noqa: SLF001
+    (seed / "Daily Note - Jan 2026.md").write_text("# Jan Note\n", encoding="utf-8")
+    (seed / "Daily Note - Jun 2026.md").write_text("# Jun Note\n", encoding="utf-8")
+    agents._run_git(["add", "."], seed)  # noqa: SLF001
+    agents._run_git(["commit", "-m", "Initialize reading notes"], seed)  # noqa: SLF001
+    agents._run_git(["remote", "add", "origin", str(bare)], seed)  # noqa: SLF001
+    agents._run_git(["push", "-u", "origin", "main"], seed)  # noqa: SLF001
+
+    agents._run_git(["clone", "-b", "main", str(bare), str(notes)], tmp_path)  # noqa: SLF001
+    agents._run_git(["config", "user.email", "paperflow@example.com"], notes)  # noqa: SLF001
+    agents._run_git(["config", "user.name", "PaperFlow Test"], notes)  # noqa: SLF001
+    (notes / "Daily Note - Jan 2026.md").unlink()
+    (notes / "Daily Note - Jun 2026.md").write_text("# Jun Note\n\nNew local content.\n", encoding="utf-8")
+
+    monkeypatch.setattr(agents, "_configured_reading_notes_git_dir", lambda: notes)
+    monkeypatch.setattr(agents, "_configured_reading_notes_git_remote", lambda: str(bare))
+    monkeypatch.setattr(agents, "_configured_reading_notes_git_branch", lambda: "main")
+    monkeypatch.setenv("PAPERFLOW_READING_NOTES_GIT_LLM_REVIEW", "false")
+
+    with pytest.raises(RuntimeError, match="删除阅读笔记文件"):
+        agents.sync_reading_notes_github("user_test")
+
+    assert (notes / "Daily Note - Jan 2026.md").exists()
+    clone_check = tmp_path / "check-delete-guard"
+    agents._run_git(["clone", "-b", "main", str(bare), str(clone_check)], tmp_path)  # noqa: SLF001
+    assert (clone_check / "Daily Note - Jan 2026.md").exists()
+    assert "New local content" not in (clone_check / "Daily Note - Jun 2026.md").read_text(encoding="utf-8")
+
+
 def test_desktop_github_sync_keeps_remote_on_note_conflict_without_branch(
     tmp_path, monkeypatch: pytest.MonkeyPatch
 ) -> None: