[saphid]

Problem

On GitLab, T3 Code can miss a branch's own open merge request. To find it, the server asks GitLab for open merge requests on the branch name with --per-page 1. GitLab's project list (GET /projects/:id/merge_requests?source_branch=...) also returns merge requests from forks that target the project. It has no source-project or owner filter, and it sorts by newest first. If a fork opened a merge request from a branch with the same name (feature, fix-typo, main) more recently, that fork's merge request takes the only slot. The owner check then rejects it, and the branch's real merge request is never fetched.

The user then sees no merge request for their branch in the Git status, the PR action, and the completion toast. The owner:branch selectors don't help, because GitLabCli strips the owner before querying, so they send the same request again.

Change

GitLab now provides the headBranchProbe hook that GitHub already has. It drops the owner:branch selectors (duplicates after normalization) and reads one full page of 100, GitLab's per_page maximum. GitManager's existing owner matching then picks the branch's own merge request out of that page. glab mr list normally fetches a single page. If the process output cap truncates that page, the lookup retries with smaller pages, still bounded to the first 100 candidates. This mirrors #29751, which does the same for Bitbucket.

Scope and approval

Very small, focused fix for an obvious bug, so no prior issue: the GitLab provider adds the branch probe hook and the CLI retries oversized list responses with smaller pages, with focused regression coverage.

Overlap search: #29751 (Bitbucket only, same hook) is the precedent, not a duplicate. Open #23439 changes GitLab fork merge request creation, not the lookup. Closed #27890 was about GitCafe.

Verification

• Red on main: vp test run src/server/GitLabSourceControlProvider.test.ts gives AssertionError: expected undefined to deeply equal { headSelectors: [ 'feature' ], …(1) } (1 failed, 12 passed).
• Green: the same file passes, 13 of 13.
• vp run check:changed: format, lint, knip, typecheck (11 packages), and tests (3 files, 17 passed) all pass.
• GitLab API behavior comes from the GitLab docs: source_branch filter, default created_at desc, source_project_id "equal to target_project_id, unless the merge request originates from a fork", and per_page max 100.
• Not checked: a live run against a real GitLab project with a fork merge request.

Reviewed with sol-loop: 1 round with GPT-6.1 Sol on high. Sol verdict: approved.

Created with Claude Opus 5.5 in Claude Code (T3 Code).

🤖 Generated with Claude Code

Takeover verification: Blacksmith vp run check:changed github/main passed format, lint, knip, typecheck (11 packages), and 23 tests. The oversized-response regression failed before the fix and passes after it. Current main was merged without conflicts, including its upstream fix for the unrelated Astro test assertion. The previously failing file-save browser test also passes on Blacksmith. Two independent read-only GPT-6.1 Sol reviews approved the final head. A live GitLab project remains unverified.

Takeover changes: gpt-6.1-sol through the Codex harness.

[macroscopeapp]

Approvability

Verdict: Approved at c84a54c

Macroscope's review found this PR approvable — GitLab merge-request discovery now looks past same-named fork branches and retries oversized responses with smaller pages. The change remains read-only and preserves existing repository/owner matching.

^{You can add or adjust custom eligibility rules. Learn more.}

[coderabbitai]

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

• Last reviewed commit: c84a54c

Use the following commands to manage reviews:

• @coderabbitai resume to resume automatic reviews.
• @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

• Resume reviews
• Trigger review

No actionable comments were generated in the recent review.

Walkthrough

The GitLab CLI now retrieves merge requests across pages and retries truncated output with smaller pages. The GitLab provider filters colon-qualified branch selectors and sets the head-branch probe limit to 100.

Changes: GitLab merge-request lookup

Layer / File(s)	Summary
Paginate merge-request results packages/source-control-gitlab/src/server/GitLabCli.ts, packages/source-control-gitlab/src/server/GitLabCli.test.ts	The CLI requests pages up to the requested limit. If output is truncated and the page size is greater than one, it halves the page size and retries. It uses raw entry counts to continue paging, returns results up to the limit, and reports a decode error if truncation persists at page size one or list decoding fails. The test checks retrieval of four entries and same-project classification.
Filter head selectors and validate probe packages/source-control-gitlab/src/server/GitLabSourceControlProvider.ts, packages/source-control-gitlab/src/server/GitLabSourceControlProvider.test.ts	The provider excludes selectors containing : and sets the probe limit to 100. The test checks that feature remains eligible, octocat:feature is excluded, and the limit is 100.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Bug fix

Suggested reviewers: juliusmarminge

Merge Risk: Minimal · up to c84a5

GitLab lookup now finds a branch's own merge request even when a fork has a same-named one, and it handles large responses by retrying with smaller pages. No outstanding merge-blocking risk was identified.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title "fix(gitlab): a fork's same-named branch no longer hides the branch's own merge request" matches the main change. The GitLab provider adds a headBranchProbe hook, and the CLI retries oversiz…
Description check		The description follows the repository template. It covers Problem, Change, Scope, and Verification. The Problem section gives the cause and expected behavior. The Change section explains the headBran…
Linked Issues check		The only linked issue, #27890, is closed. It supplies historical context only. Its GitCafe acceptance criteria do not apply to this pull request. No active directly linked target remains, so no linked…
Out of Scope Changes check		All changed files are in packages/source-control-gitlab/src/server: GitLabSourceControlProvider.ts and its test, and GitLabCli.ts and its test. The provider change adds the headBranchProbe hook, remov…

Full details: Title check

Explanation

The title "fix(gitlab): a fork's same-named branch no longer hides the branch's own merge request" matches the main change. The GitLab provider adds a headBranchProbe hook, and the CLI retries oversized list responses with smaller pages, so a fork's same-named merge request no longer takes the only result slot. The title is specific, follows conventional commit form, and names the user-visible bug.

Full details: Description check

Explanation

The description follows the repository template. It covers Problem, Change, Scope, and Verification. The Problem section gives the cause and expected behavior. The Change section explains the headBranchProbe hook and the retry logic. The Scope section states why no issue is linked, names related PRs, and justifies the bug-fix scope. The Verification section gives red-then-green test results, the check:changed outcome, and the unverified live GitLab case. The description is long and includes some extra material, such as a takeover note and tool attribution, but the required information is present.

Full details: Linked Issues check

Explanation

The only linked issue, #27890, is closed. It supplies historical context only. Its GitCafe acceptance criteria do not apply to this pull request. No active directly linked target remains, so no linked-issue coding requirements apply. The PR objective (a GitLab fork merge request occupying the single result slot) comes from the current PR description. It is not a linked-issue requirement. The reviewed summary shows the GitLab provider change (headBranchProbe with limit 100, selectors containing ':' removed) and the GitLabCli paging retry with regression tests. These changes match the current PR intent. This result does not depend on the live GitLab check, which the PR states is unverified.

Full details: Out of Scope Changes check

Explanation

All changed files are in packages/source-control-gitlab/src/server: GitLabSourceControlProvider.ts and its test, and GitLabCli.ts and its test. The provider change adds the headBranchProbe hook, removes owner:branch selectors, and sets the probe limit to 100. The GitLabCli change retries listMergeRequests with smaller pages when output is truncated, bounded to the first 100 candidates. The PR description names both changes as part of the fix. The tests cover these changes. No unrelated feature or file appears in the summary. Minor note: the GitLabCli test describes truncation under a 1 MB default cap, while the implementation caps responses at 8,000,000 bytes. This is a detail of test setup, not a scope issue. The assessment uses the whole-PR summary and PR description only. No repository inspection was run.

Finishing Touches

Generate unit tests (beta)

• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: main
• File: .coderabbit.config.ts
• Commit: 382312a
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Advanced
• Run ID: 226cb725-c7fe-4218-9c5a-5fa9a612c9be

Commits

Reviewing files that changed from the base of the PR and between 0dfc65b and c84a54c.

Files selected for processing: 2

• packages/source-control-gitlab/src/server/GitLabCli.test.ts
• packages/source-control-gitlab/src/server/GitLabCli.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 1 remain after this review.

[coderabbitai]

• Fix comments: Fix CodeRabbit comments on this PR

Dismissing prior approval to re-evaluate 987feb7

Dismissing prior approval to re-evaluate 0dfc65b

Dismissing prior approval to re-evaluate c84a54c

[juliusmarminge]

Evidence

Real GitLab projects, isolated fresh T3 databases, and replay only for the model turn. Native captures: iPhone 18 Pro, light theme. Web captures: Chromium, 1280×800, light theme.

1. Created original-project feature MR !1, then a fork with a different feature branch and newer MR !2 targeting the original. Live glab with --per-page 1 returned only fork MR !2; --per-page 100 returned !2 and original !1.
2. Added the original feature checkout to T3, created a replay thread, made a local commit, opened Git controls, and pushed. Both pre-push menus showed MR oxc stack #1. Base omitted View from the push notification; head showed View. Clicking it on head opened Original branch MR oxc stack #1.
3. On a second fixture, added twenty newer closed same-named fork MRs, putting original MR !1 at candidate fix: prod builds loads asset files with relative file urls, not from the backend over http #22. Opened the original checkout in web: base offered Create MR; head displayed oxc stack #1: Original branch MR.
4. Repeated the same web scenario after adding large descriptions: one million less-than characters in MR !22 and 400,000 each in MRs !19–!21. Live glab emitted 6,002,009 bytes for one MR and 13,243,505 bytes for all 22. Head still displayed original MR oxc stack #1, exercising smaller-page retries and pagination under the 8,000,000-byte cap.

All three scenario comparisons failed on base and passed on head.

Behavior	Before — 382312aba8	After — c84a54c303
Native push result
Native interaction	Before recording	After recording, including opening MR #1
All-state lookup, original at candidate #22
All-state lookup, 13.2 MB response

iOS scenario · Web scenario, unchanged for both status fixtures

The notification’s View action opens the correct MR:

Live CLI output confirms candidate ordering and response sizes. These images format captured command output; the app captures above contain the app’s own UI.

Reproduction instructions · GitLab seed · Twenty-MR expansion · Large descriptions · CLI capture driver · Large-response transcript · Full scenario evidence report

Proof performed by gpt-6.1-sol through the Codex harness.

Not shown:

• The create-MR action’s duplicate-creation/opened_existing path was not invoked; findOpenPr’s visible effect was demonstrated through the native push notification and its working MR oxc stack #1 destination.
• The exact 100th-candidate boundary and matches beyond the first 100 were not exercised; fixtures contained 2 and 22 candidates.
• Malformed-entry paging/counting and empty-page handling were not induced because live GitLab returned valid MR entries.
• Removal of owner:branch probe commands was not separately traced; the resulting wider all-state lookup and capped-output paging were exercised in the real app.