From bcedbc61436d3b78f9c8c66dc94c9758b5641b4a Mon Sep 17 00:00:00 2001 From: mirivlad Date: Mon, 29 Jun 2026 03:38:03 +0800 Subject: [PATCH] docs: mark sync conflict UX complete --- 05_Official_Plugins.md | 9 +++++++++ 07_Full_Implementation_Roadmap.md | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/05_Official_Plugins.md b/05_Official_Plugins.md index 19fdd9c..c06d9fd 100644 --- a/05_Official_Plugins.md +++ b/05_Official_Plugins.md @@ -171,6 +171,15 @@ the plugin storage even when the Activity view is not mounted. The Activity UI is a read/clear surface, not a manual recording toggle. Reconstruction and worklog suggestions are still future work. +## Sync Conflict UX Contract + +`api.sync.now()` returns warning details through `conflicts` and `applyErrors`. +The official Sync plugin must display both as warnings after manual sync. A +conflict warning must include at least the affected entity type/path when the +server provides those fields. The plugin must not auto-resolve conflicts, rename +local files, overwrite local files, or hide conflict details behind a plain +count. + ## 6. `official.journal` Назначение: diff --git a/07_Full_Implementation_Roadmap.md b/07_Full_Implementation_Roadmap.md index dae56d8..2cc9dd6 100644 --- a/07_Full_Implementation_Roadmap.md +++ b/07_Full_Implementation_Roadmap.md @@ -110,7 +110,7 @@ Goal: make cross-device sync reliable enough for real vaults. Tasks: -- define conflict UX contract for desktop and sync plugin; +- [x] define conflict UX contract for desktop and sync plugin; - [x] add server/device revocation checks for sync auth paths; - [x] persist and display sync errors in Sync plugin; - [x] add retry/backoff for sync client operations;