Skip to content

Sync merged PR base and surface sync badges across sidebar - #549

Merged
SDSLeon merged 1 commit into
masterfrom
poracode/crisp-summit-275a3be9
Aug 9, 2026
Merged

Sync merged PR base and surface sync badges across sidebar#549
SDSLeon merged 1 commit into
masterfrom
poracode/crisp-summit-275a3be9

Conversation

@SDSLeon

@SDSLeon SDSLeon commented Aug 9, 2026

Copy link
Copy Markdown
Owner
  • Sync the PR base branch (pull + status refresh) after a merge from all paths — manual merge, auto-done watcher, and PR watch events — dedupe concurrent syncs and serialize per project.
  • Derive the merge sync target from the project instead of threading mergeSyncLocation props through Git/PR review overlays, sidebars, and the mobile Git view.
  • Surface sync badges on project/experiment groups and on non-worktree threads so sync state is visible across the whole sidebar.
  • Fall back to experiment/worktree base branches when launching drafts for more accurate branch selection.
  • Add tests for merge base sync, PR write actions, and badge rendering.

- Add `prMergeBaseSync` state module that pulls the merged base once per project after a PR merge, resolving against the head branch and worktree location
- Switch `usePrWriteActions` to take `projectId` instead of `mergeSyncLocation` and call `syncMergedPrBase` on merge; remove the `mergeSyncLocation` prop threading from Git/PR review overlays, sidebars, and mobile `GitView`
- Refresh git status in the store after pulls complete so prompt sync badges clear
- Show `SyncBadge` in experiment group headers, sidebar thread groups, and thread items when in worktree or project-badge mode; disable the badge while syncing
- Resolve worktree base branch from branch selection when no explicit worktree base is set
- Add tests for `usePrWriteActions`, `prMergeBaseSync`, and sync-badge/merge sync flows
@SDSLeon
SDSLeon merged commit 9ae3136 into master Aug 9, 2026
8 checks passed
@SDSLeon
SDSLeon deleted the poracode/crisp-summit-275a3be9 branch August 9, 2026 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant