From f3952a509b2d98a25cbb80c9ad091b3b471be52e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 31 Dec 2025 15:32:58 +0900 Subject: feat(crdt): handle crdtChanges in sync pull response MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add applyCrdtChanges function to process CRDT payloads received from the server during pull operations. The function merges remote documents with local ones using Automerge and stores the result in sync state. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- docs/dev/roadmap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/dev/roadmap.md b/docs/dev/roadmap.md index d17ba41..9251e15 100644 --- a/docs/dev/roadmap.md +++ b/docs/dev/roadmap.md @@ -24,7 +24,7 @@ Replace the current Last-Write-Wins (LWW) conflict resolution with Automerge CRD ### Phase 3: Modify Sync Protocol - [x] Modify `src/client/sync/push.ts` - Add crdtChanges to push payload -- [ ] Modify `src/client/sync/pull.ts` - Handle crdtChanges in pull response +- [x] Modify `src/client/sync/pull.ts` - Handle crdtChanges in pull response - [ ] Modify `src/client/sync/conflict.ts` - Replace LWW with Automerge merge - [ ] Modify `src/client/sync/manager.ts` - Integrate CRDT sync flow -- cgit v1.2.3-70-g09d2