Uh oh!
There was an error while loading. Please reload this page.
fix(server): fall back to local-only base branches - #8241
Conversation
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 |
| remoteName: "origin", | ||
| }); | ||
| const resolvedRemoteBase = yield* gitWorkflow.resolveRemoteTrackingCommit({ | ||
| const baseBranch = bootstrap.prepareWorktree.baseBranch; |
There was a problem hiding this comment.
🟠 Highsrc/ws.ts:1033
When baseBranch is origin/main, the remote check looks for refs/remotes/origin/origin/main and leaves worktreeBaseRef as the ambiguous origin/main; if refs/heads/origin/main exists, createWorktree starts from that local branch instead of the selected remote branch. Strip the origin/ qualifier before calling remoteBranchExists and resolveRemoteTrackingCommit so the worktree is based on the remote commit.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/ws.ts around line 1033:
When `baseBranch` is `origin/main`, the remote check looks for `refs/remotes/origin/origin/main` and leaves `worktreeBaseRef` as the ambiguous `origin/main`; if `refs/heads/origin/main` exists, `createWorktree` starts from that local branch instead of the selected remote branch. Strip the `origin/` qualifier before calling `remoteBranchExists` and `resolveRemoteTrackingCommit` so the worktree is based on the remote commit.
ApprovabilityVerdict: Would Approve Macroscope's review found this PR approvable — This is a focused bootstrap bug fix that adds a read-only remote-ref check and preserves existing remote-backed behavior while enabling local-only branches, with targeted regression coverage and no schema or sensitive-path impact. An unresolved high-severity finding still flags qualified base names such as Not approved because:
Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more. |
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 selected #8349 as the smaller active repair for local-only base branches. It uses the existing remote resolution path and avoids adding new Git workflow and VCS contract methods. This branch's explicit missing-ref versus other Git error cases are not all in #8349, so they remain useful reference. If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. |
What Changed
When Start from origin is enabled, check whether the selected base branch has an
origintracking ref after fetching. If it does, create the worktree from the fetched remote commit. If it only exists locally, create the worktree from the local branch instead.This keeps unrelated Git resolution failures visible instead of treating every failure as a missing branch.
Why
T3 previously checked only whether the repository had an
originremote. Selecting a valid local-only base branch then causedresolveRemoteTrackingCommitto fail, aborting bootstrap and deleting the provisional thread.Closes#8191
Checklist
Created with GPT-5.6 Sol through the Codex harness.
Note
Medium Risk
Changes thread bootstrap and worktree creation when “Start from origin” is on; mistakes could pick the wrong base commit, but scope is narrow and covered by new regression tests.
Overview
Bootstrap worktrees with “Start from origin” no longer always resolve the base branch through
origin. After fetchingorigin, the server checks whetherorigin/<baseBranch>exists via a newremoteBranchExistsAPI on the Git workflow/VCS driver stack. Only when that ref exists does it callresolveRemoteTrackingCommitand base the worktree on the remote commit; otherwise it keeps the local base branch name, so local-only branches bootstrap successfully instead of failing and tearing down the thread.remoteBranchExistsis wired fromGitVcsDriverCore(gitshow-refonrefs/remotes/<remote>/<ref>) throughGitVcsDriver,GitWorkflowService, and the WS bootstrap path. Server tests mock the new hook and add a regression case assertingcreateWorktreeuses the local branch and skips remote commit resolution when the origin tracking ref is missing.Reviewed by Cursor Bugbot for commit 5762a2b. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Fall back to local base branch when remote tracking ref is missing
Adds a
remoteBranchExistsmethod toGitVcsDriverandGitWorkflowServiceso the server can check whether a remote branch exists before resolving it. In theprepareWorktreebootstrap flow in ws.ts, whenstartFromOriginis true the server now callsgitWorkflow.remoteBranchExists; if the remote base branch does not exist, it skipsresolveRemoteTrackingCommitand creates the worktree from the local base branch instead.remoteBranchExiststhrows (e.g. network failure to remote), theensureGitCommandguard inGitWorkflowService.makesurfaces aGitCommandErrorrather than silently falling back to local; callers inws.tsrely on this error propagating correctly.📊 Macroscope summarized 5762a2b. 4 files reviewed, 1 issue evaluated, 0 issues filtered, 1 comment posted
🗂️ Filtered Issues