improve and prevent silent thread branch drift and PR fetching

[justsomelegs]

What Changed

Improves the local branch mismatch warning in the branch picker.

• Highlights the branch picker with a warning color when the thread branch and current checkout differ.
• Adds an inline warning icon to the picker.
• Shows a popover above the picker explaining the mismatch.
• Adds actions to either switch the checkout back to the thread branch or update the thread to use the current checkout.
• Keeps server thread branch metadata from being overwritten when the shared local checkout changes.
• Tightens PR/status indicator behavior so local checkout PR state is scoped to the relevant thread branch.
• Improves PR fetching so that forked repos with PR on upstream not origin allow showing PR status in application

Why

When using local checkout mode, the active Git branch can drift away from the branch a thread was last associated with. Previously this was easy to miss and could lead to continuing work on the wrong branch.

This makes the mismatch visible in-place and gives users clear recovery actions without changing branches automatically.

The thread’s associated branch should only change when the user intentionally chooses a branch for the thread, creates/checks out a branch through the picker, or clicks Use current in the warning popover. It should not change just because the shared local checkout moved while viewing an existing server thread.

UI Changes

Screenshots/video to attach:

• Before screenshot of the old picker state.
• After screenshot of the warning picker and popover.
• Short video showing hover/click on the warning icon and the Use current / Switch actions.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

Note

Fix thread branch drift and PR matching for local and dedicated worktree modes

• matchesBranchHeadContext in GitManager.ts now rejects ambiguous PR reuse by enforcing cross-repo vs same-repo head identity consistency, tolerating missing GitHub metadata via new resolveExpectedHeadIdentity and resolvePullRequestHeadIdentity helpers.
• GitActionsControl no longer overwrites an existing server thread's stored branch when the shared checkout changes while no git action is running.
• BranchToolbarBranchSelector surfaces a warning icon and inline actions when the thread's stored branch differs from the current local checkout, with a refresh of git status after branch mutations.
• resolveThreadPr now returns PR info for dedicated worktree threads even when stored branch metadata is stale or missing; the sidebar uses this to show PR status in more cases.
• PR tooltip content is restructured to include a capitalized state, provider short name, PR number, and truncated title via the new PrStatusTooltipContent component.

^{Macroscope summarized 3b1cf19.}

---

---

Note

Medium Risk
Touches PR matching logic and thread/ref state synchronization across server + UI, which can affect which PRs are reused/displayed and when thread branch metadata updates. Changes are well-covered by new unit/integration tests but could still cause edge-case regressions in ref/PR selection flows.

Overview
Prevents silent thread branch drift in local-checkout mode by detecting when the thread’s stored ref differs from the current checkout and surfacing an inline warning + popover actions (switch checkout to thread ref, or re-associate thread to current ref) in BranchToolbarBranchSelector.

Tightens PR/status scoping so PR indicators for local checkouts only show when vcsStatus.refName matches the thread’s stored branch, while dedicated worktree threads always show the worktree’s PR even if stored branch metadata is stale/missing; PR tooltips are now rendered via structured tooltipLead/tooltipTitle (PrStatusTooltipContent).

Fixes cross-repo PR reuse edge cases by reworking matchesBranchHeadContext to compare head identity only when comparable metadata exists, rejecting ambiguous cross-repo PRs when GitHub omits head identity fields; adds new server-side tests for these scenarios. Also introduces vcs*-named query/status wrappers (vcsQueryKeys, vcsRefSearchInfiniteQueryOptions, useVcsStatus/refreshVcsStatus) while keeping git* aliases for compatibility.

^{Reviewed by Cursor Bugbot for commit e0314cf. Bugbot is set up for automated code reviews on this repo. Configure here.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 287cf401-386e-41ec-9281-1ebe03a2f643

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

• Generate code and open pull requests
• Plan features and break down work
• Investigate incidents and troubleshoot customer tickets together
• Automate recurring tasks and respond to alerts with triggers
• Summarize progress and report instantly

Built for teams:

• Shared memory across your entire org—no repeating context
• Per-thread sandboxes to safely plan and execute work
• Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces new user-facing functionality (branch mismatch warning popover with resolution actions) and modifies core branch/PR matching logic. The runtime behavior changes to thread-branch association and PR resolution warrant human review.

^{You can customize Macroscope's approvability policy. Learn more.}

[juliusmarminge]

Heya I will properly review your PRs when we get back from Miami. Seems like some good stuff just don't have capacity to review big PRs while we're here

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 23355c1. Configure here.}

[juliusmarminge]

either i messed soemthing up when mergin main or i don't understand this PR:

CleanShot.2026-05-02.at.23.02.21.mp4

[vercel]

@justsomelegs is attempting to deploy a commit to the Ping Labs Team on Vercel.

A member of the Team first needs to authorize it.

[justsomelegs]

either i messed soemthing up when mergin main or i don't understand this PR:

CleanShot.2026-05-02.at.23.02.21.mp4

It meant to warn the user when switching branches that the thread was last working on another branch so that they dont accidently try and continue the work on the wrong branch.

just pushed my local version up that is rebased onto main if you wanna try that one out.

Screen.Recording.2026-05-04.101354.mp4