Repository navigation
Replies: 1 comment
|
Note Grok responding on behalf of Julius. This is the same report as #17312 ("Start from origin" hard-codes Related but broader: #17314 (fork checkouts resolve "the primary remote" inconsistently across features). Nearby but not the same case: #9340 / open PR #9341 (base already named |
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Problem
When "Start from origin" is on, T3 Code always runs
git fetch origin <base>before it creates a new worktree. On a fork,originis usually the user's fork andupstreamis the main repository. Many fork users point their localmainatupstream(branch.main.remote = upstream). For them, new worktrees start from the fork's copy ofmain, which is often weeks old. The setting is on, but the worktree is still out of date.originis hard-coded in two places:apps/server/src/orchestration-v2/ThreadLaunchService.ts(threads launched from the UI)apps/server/src/mcp/WorktreeMcpService.ts(worktrees that agents create through MCP)Proposal
Choose the remote from what git already knows, in this order:
upstream/main→upstream).branch.<base>.remote), if that remote exists.origin.Users without a fork see no change, because their base branch tracks
origin. Fork users get the fresh base with no new setting. Only the setting's description text changes. Its title and key stay the same.Alternative
If you want to keep the current default, we could add a setting that chooses which remote "Start from origin" fetches, with
originas the default. That adds UI that most users will never need, so I prefer the proposal above.Status
I have a working implementation with tests (about 145 lines across 10 files, most of them tests). I can open a PR if you approve this direction.
All reactions