SD-3357 - fix: dedupe tracked changes from merged activity feed#3609
Merged
harbournick merged 4 commits intoJun 3, 2026
Merged
Conversation
…3357) SuperDoc surfaces tracked changes in both ui.comments.items (as trackedChange:true comments) and ui.trackChanges.items with the same id. The ActivitySidebar merged both slices without filtering, so each suggestion rendered twice (one comment card + one change card). Skip comment.trackedChange items when building the feed, and drop a leftover debug log. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
cubic analysis
No issues found across 1 file
Linked issue analysis
Linked issue: SD-3357: BUG: Tracked change in suggesting mode renders as both a comment and a tracked change (custom-ui demo)
| Status | Acceptance criteria | Notes |
|---|---|---|
| ✅ | Skip comment.trackedChange items when building the merged activity feed in ActivitySidebar | The diff adds a filter that returns early for c.trackedChange before pushing comment items into the feed. |
| ✅ | Still include trackChanges.items so tracked changes render once from the change feed | The code continues to push trackChanges.items into the feed after filtering comments, ensuring changes are rendered from the change bucket. |
| ✅ | Activity sidebar no longer displays duplicate entries for the same tracked change (one comment + one change) | By skipping comment.trackedChange items and keeping trackChanges.items, the merged feed will contain only the change instance, preventing the previously duplicated rendering. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 048e6d6e5d
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
…D-3357) A real comment thread anchored over text that overlaps a suggestion also gets trackedChange:true (comments.list links it via assignTrackedChangeLink), so filtering on the flag wrongly hid those discussions. Dedupe by id instead — synthetic tracked-change comment rows reuse the tracked-change id, while real comments keep their own. Also exclude pairedWithChangeId so replacement pairs collapsed by trackChanges.list (replacements: paired) don't leak one half back as a comment. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
andrii-harbour
requested changes
Jun 3, 2026
Contributor
andrii-harbour
left a comment
andrii-harbour
left a comment
There was a problem hiding this comment.
Nice job! Minor comments here.
P.S. PR title typo: title says SD-3557; the ticket is SD-3357
chittolinag
changed the title
Contributor
Author
|
@andrii-harbour thanks for the review! updated the ticket title and also pushed a commit removing dead code + adding comments. |
…ting-mode-renders-as-both-a
harbournick
deleted the
gabriel/sd-3357-bug-tracked-change-in-suggesting-mode-renders-as-both-a
branch
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
5 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.
Tracked changes were being displayed twice in the sidebar.