docs: mark sync conflict UX complete

This commit is contained in:
mirivlad 2026-06-29 03:38:03 +08:00
parent 3a2142d674
commit bcedbc6143
2 changed files with 10 additions and 1 deletions

View File

@ -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 is a read/clear surface, not a manual recording toggle. Reconstruction and
worklog suggestions are still future work. 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` ## 6. `official.journal`
Назначение: Назначение:

View File

@ -110,7 +110,7 @@ Goal: make cross-device sync reliable enough for real vaults.
Tasks: 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] add server/device revocation checks for sync auth paths;
- [x] persist and display sync errors in Sync plugin; - [x] persist and display sync errors in Sync plugin;
- [x] add retry/backoff for sync client operations; - [x] add retry/backoff for sync client operations;