Sync with upstream/main#9
Closed
asabirov wants to merge 4 commits into
Closed
Conversation
…ields and preserving vector clock on parse failure Updates updateNote() to send version and uniqueIdentifier fields that Bear desktop requires to properly process sync updates. Also fixes incrementVectorClock() to preserve the existing clock unchanged when parsing fails, instead of resetting to counter=1 which caused sync conflicts. Fixes #5
Move core logic into a separate BearCLICore library target so it can be imported by tests. Add initial test suite (18 tests) covering models, cache operations, and codable round-trips. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Extract BearCLICore library and add test infrastructure
Resolve conflicts keeping fork's fixes (custom CKRecord decoder, robust vector clock parsing, version 0.3.4) while incorporating upstream's version/uniqueIdentifier fields for edit sync. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Changes from upstream
e5fd86aMerge PR Fix crash when CloudKit returns records without fields #3 (test infrastructure)c843a47Extract BearCLICore libraryd32b64cFix edit sync with version/uniqueIdentifier fields🤖 Generated with Claude Code