Uh oh!
There was an error while loading. Please reload this page.
fix(vcs): fetch GitLab merge-request refs for worktree checkout - #7174
fix(vcs): fetch GitLab merge-request refs for worktree checkout#7174maslinedwin wants to merge 3 commits into
Conversation
…issing Worktree checkout of a GitLab MR called git fetch refs/pull/<n>/head, which GitLab does not publish. Fall back to refs/merge-requests/<n>/head so Checkout merge request works on GitLab remotes.
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
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. Comment |
There was a problem hiding this comment.
One convention issue found in apps/server/src/vcs/GitVcsDriverCore.ts: the new GitLab fallbacks use Effect.orElse, which drops the original refs/pull/<n>/head failure, so a failure of both attempts surfaces only the merge-request error and loses the real cause chain. The repo already has the intended pattern in materializePullRequestHeadBranch (apps/server/src/git/GitManager.ts), which preserves both failures via an AggregateError cause.
Also, this is a backend behavior change (a second fetch attempt on every failed pull-ref fetch) and the new refs/merge-requests/<n>/head path currently has no coverage — a focused test in apps/server/src/vcs/GitVcsDriverCore.test.ts (spawner mock asserting the second refspec and that both failures are preserved) would be worth adding.
Posted via Macroscope — Effect Service Conventions
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
ApprovabilityVerdict: Approved 6eeb0c3 This PR adds GitLab merge-request ref support as a fallback to existing GitHub pull ref fetching. The change is well-scoped to VCS driver fetch logic and includes comprehensive test coverage for both the fallback scenario and error aggregation when both providers fail. You can customize Macroscope's approvability policy. Learn more. |
When GitHub pull refs and GitLab merge-request refs both fail, surface an AggregateError cause so the original pull-head error is not lost behind the fallback message.
There was a problem hiding this comment.
One finding: the new GitLab merge-request fallback is a backend behavior change without focused test coverage. The error-preservation issue flagged on the previous revision is resolved — both fetch failures are now surfaced as an AggregateError cause on GitCommandError, matching materializePullRequestHeadBranch in apps/server/src/git/GitManager.ts.
Posted via Macroscope — Effect Service Conventions
| const fetchPullThenMergeRequestRef = ( | ||
| operation: string, | ||
| cwd: string, | ||
| remoteName: string, | ||
| pullSpec: string, | ||
| mergeRequestSpec: string, | ||
| pullFailureDetail: string, | ||
| mergeRequestFailureDetail: string, | ||
| ) => | ||
| executeGit(operation, cwd, ["fetch", "--quiet", "--no-tags", remoteName, pullSpec], { |
There was a problem hiding this comment.
This changes backend fetch behavior (new refs/merge-requests/<n>/head fallback plus a combined failure error), but no test covers it. Consider adding focused cases in apps/server/src/vcs/GitVcsDriverCore.test.ts using the existing ChildProcessSpawner.make harness (see the failingFetchSpawner test around line 556): one asserting the merge-request refspec is retried after the pull refspec fails, and one asserting that when both fail the resulting GitCommandError.cause is an AggregateError containing both failures.
Posted via Macroscope — Effect Service Conventions
There was a problem hiding this comment.
Added focused coverage in GitVcsDriverCore.test.ts: one case retries refs/merge-requests/<n>/head after the pull refspec fails, and one case asserts both failures land in an AggregateError cause.
There was a problem hiding this comment.
Sorry, I'm unable to act on this request because you do not have permissions within this repository.
Assert the pull-ref fetch is retried with refs/merge-requests/<n>/head, and that both failures are preserved as an AggregateError cause.
t3dotgg
commented
Aug 28, 2026
Note 🤖 GPT-5.6 Sol responding on behalf of Theo We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together. We are keeping OPEN #6532 as the review path for host-specific change-request refs. It covers GitLab merge-request checkout as part of the broader host contract. If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. |
Summary
Fixes#6448.
fetchPullRequestBranch/fetchPullRequestHeadCommithardcoded GitHub'srefs/pull/<n>/head. GitLab publishesrefs/merge-requests/<n>/head, so every Checkout merge request → Worktree on a GitLab remote failed withcouldn't find remote ref.The fetch now tries the GitHub layout first and falls back to the GitLab layout.
Test plan
refs/merge-requests/<n>/headand opens the draft threadNote
Medium Risk
Touches shared Git fetch paths used for checkout/worktree; behavior change is additive fallback, but mis-numbered or missing refs on both hosts still fail and now surface an aggregate error.
Overview
Fixes GitLab Checkout merge request → Worktree failures caused by only fetching GitHub-style
refs/pull/<n>/head.GitVcsDriverCoreaddsfetchPullThenMergeRequestRef, which tries the GitHub pull ref first and on failure retries with GitLab’srefs/merge-requests/<n>/head.fetchPullRequestBranchandfetchPullRequestHeadCommitboth use this helper (branch refspec vs.FETCH_HEADunchanged). When both fetches fail, callers get aGitCommandErrorwhosecauseis anAggregateErrorholding both underlying errors.Tests cover successful GitLab fallback after a failed GitHub fetch and the dual-failure aggregation path. The public API comment on
fetchPullRequestHeadCommitnow documents both ref layouts.Reviewed by Cursor Bugbot for commit 6eeb0c3. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Fix
fetchPullRequestBranchandfetchPullRequestHeadCommitto fall back to GitLab merge-request refsGitVcsDriverCore.tspreviously only attempted GitHubrefs/pull/<n>/head, failing silently on GitLab repositories.fetchPullThenMergeRequestRefhelper tries the GitHub refspec first, then falls back to the GitLabrefs/merge-requests/<n>/headrefspec on failure.GitCommandErroris thrown with anAggregateErrorcause containing both failures.GitCommandErroron failure will now receive one whosecauseis anAggregateErrorwhen both refspecs are attempted and fail.Macroscope summarized 6eeb0c3.