Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts the extension’s two-way bookmark sync conflict-resolution so that locally modified bookmarks (including title/folder/order changes) are not overwritten by cloud data during the pull phase, and it refines ordering behavior to avoid “moved to end” outcomes. It also bumps versions to v0.8.30 across packages and browser manifests.
Changes:
- Skip all cloud→local updates for bookmarks tracked in
locallyModifiedBookmarkIds(title/folder/index), ensuring local edits survive the pull and get pushed. - Rework ordering behavior by creating bookmarks/folders without indices during pull and relying on a reorder pass, using a snapshot of user-modified IDs to avoid sync-driven pollution.
- Version bump to
0.8.30across packages/apps/manifests.
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| apps/extension/src/background/index.js | Updates sync logic to fully protect locally modified bookmarks from cloud overwrites; adjusts ordering creation/reorder flow and adds a “user-modified IDs” snapshot. |
| apps/extension/src/manifest.chrome.json | Bumps extension version to 0.8.30. |
| apps/extension/src/manifest.firefox.json | Bumps extension version to 0.8.30. |
| apps/extension/src/manifest.safari.json | Bumps extension version to 0.8.30. |
| apps/extension/package.json | Bumps package version to 0.8.30. |
| apps/web/package.json | Bumps package version to 0.8.30. |
| packages/core/package.json | Bumps package version to 0.8.30. |
| packages/sources/package.json | Bumps package version to 0.8.30. |
| packages/types/package.json | Bumps package version to 0.8.30. |
| package.json | Bumps monorepo version to 0.8.30. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Previously, locallyModifiedBookmarkIds protection only skipped index-only changes from cloud. Title and folder changes were allowed through, which caused local edits (e.g., renaming a bookmark label) to be overwritten by stale cloud data during the pull phase. By the time the push phase ran, the local change had already been reverted, so nothing got pushed. Now ALL cloud-driven updates are skipped for locally modified bookmarks, allowing local title, folder, and index changes to survive the pull phase and get pushed to cloud correctly.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…index-only) Update categorizeCloudBookmarks, updateLocalBookmarksFromCloud, and tests to ensure local wins for title, folder, AND index changes when a bookmark is in locallyModifiedBookmarkIds. Fixes the bug where renaming a bookmark label locally (e.g. 'incident' -> 's') gets reverted on next sync. Also reverts Copilot autofix commits that partially restored the old broken behavior.
bf3c3aa to
f8ae8da
Compare
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
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
locallyModifiedBookmarkIdsprotection only blocked index-only changes from cloud, but allowed title and folder changes through — assuming they were "meaningful edits from another browser." Now all cloud-driven updates are skipped for locally modified bookmarks, letting the local change survive the pull phase and get pushed to cloud.Root Cause
In
categorizeCloudBookmarksandupdateLocalBookmarksFromCloud, the locally-modified guard only skipped index-only cloud updates. Title and folder differences were allowed through unconditionally, overwriting local edits. By the time the push phase ran, the local title had already been reverted, so the checksum matched cloud and nothing got pushed — the user's change was silently lost.