Skip to content

Commit 673c5e3

Browse files
fix(server): new worktrees fetch their base branch's own remote (#21032)
Co-authored-by: Julius Marminge <[email protected]>
1 parent 60d3773 commit 673c5e3

24 files changed

Lines changed: 970 additions & 316 deletions

‎apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
387387
<SettingsSection title="Worktrees">
388388
<SettingsSwitchRow
389389
icon="arrow.triangle.branch"
390-
label="Start from origin"
391-
subtitle="Base new worktrees on the remote branch."
390+
label="Start from remote"
391+
subtitle="Uses the latest commit of the base branch’s tracked remote branch, even if its name differs. Otherwise uses the same-named branch on origin. Uses your local branch if that remote branch is missing."
392392
value={uniform("newWorktreesStartFromOrigin")}
393393
disabled={disabledFor("newWorktreesStartFromOrigin")}
394394
onValueChange={(value) => write({ newWorktreesStartFromOrigin: value })}

‎apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ export function BranchPickerScreen(props: {
438438
>
439439
<ToggleRow
440440
onValueChange={props.worktree.onChangeStartFromOrigin}
441-
title="Start from origin"
441+
title="Start from remote"
442442
value={props.worktree.startFromOrigin}
443443
/>
444444
</View>

‎apps/mobile/src/features/threads/new-task-context-presentation.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ describe("resolveNewTaskBranchLabel", () => {
117117
).toBe("From main");
118118
});
119119

120-
it("labels a remote worktree base with From origin", () => {
120+
it("labels a remote worktree base with a remote marker", () => {
121121
expect(
122122
resolveNewTaskBranchLabel({
123123
branchName: "main",
124124
startFromOrigin: true,
125125
workspaceMode: "worktree",
126126
}),
127-
).toBe("From origin/main");
127+
).toBe("From main (remote)");
128128
});
129129

130130
it("prompts when no branch is available", () => {

‎apps/mobile/src/features/threads/new-task-context-presentation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ export function resolveNewTaskBranchLabel(input: {
7878
return input.branchName;
7979
}
8080

81-
const baseRef = input.startFromOrigin ? `origin/${input.branchName}` : input.branchName;
82-
return `From ${baseRef}`;
81+
// Only the server can determine a local branch's configured remote.
82+
return input.startFromOrigin ? `From ${input.branchName} (remote)` : `From ${input.branchName}`;
8383
}
8484

8585
export function shouldCheckoutNewTaskBranch(input: {

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 256 additions & 56 deletions
Large diffs are not rendered by default.

‎apps/server/src/git/GitManager.ts‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,24 +1967,47 @@ export const make = Effect.gen(function* () {
19671967
};
19681968
});
19691969

1970-
const resolveBaseBranch = Effect.fn("resolveBaseBranch")(function* (
1970+
const resolvePrBase = Effect.fn("resolvePrBase")(function* (
19711971
cwd: string,
19721972
branch: string,
19731973
upstreamRef: string | null,
19741974
headContext: Pick<BranchHeadContext, "isCrossRepository" | "remoteName">,
19751975
) {
1976+
const configuredRef = yield* gitCore.readConfigValue(cwd, `branch.${branch}.t3-merge-base-ref`);
1977+
if (configuredRef?.startsWith("refs/heads/") || configuredRef?.startsWith("refs/remotes/")) {
1978+
const configuredBranch = yield* gitCore.resolveBranchName(cwd, configuredRef);
1979+
if (configuredBranch) return { baseBranch: configuredBranch, baseRef: configuredRef };
1980+
}
1981+
19761982
const configured = yield* gitCore.readConfigValue(cwd, `branch.${branch}.gh-merge-base`);
19771983
if (configured) {
1984+
const localRef = configured.startsWith("refs/") ? configured : `refs/heads/${configured}`;
1985+
const localBranch = yield* gitCore.resolveBranchName(cwd, localRef);
1986+
if (localBranch) {
1987+
const shadowsRemote =
1988+
configured.includes("/") &&
1989+
!configured.startsWith("refs/") &&
1990+
(yield* gitCore.resolveBranchName(cwd, `refs/remotes/${configured}`)) !== null;
1991+
return {
1992+
baseBranch: localBranch,
1993+
baseRef: configured.startsWith("refs/") || shadowsRemote ? localRef : localBranch,
1994+
};
1995+
}
1996+
if (configured.includes("/") && !configured.startsWith("refs/")) {
1997+
const remoteRef = `refs/remotes/${configured}`;
1998+
const remoteBranch = yield* gitCore.resolveBranchName(cwd, remoteRef);
1999+
if (remoteBranch) return { baseBranch: remoteBranch, baseRef: remoteRef };
2000+
}
19782001
const configuredBranch = yield* gitCore.resolveBranchName(cwd, configured);
1979-
if (configuredBranch) return configuredBranch;
2002+
if (configuredBranch) return { baseBranch: configuredBranch, baseRef: configuredBranch };
19802003
}
19812004

19822005
if (upstreamRef && !headContext.isCrossRepository) {
19832006
const upstreamBranch = extractBranchNameFromRemoteRef(upstreamRef, {
19842007
remoteName: headContext.remoteName,
19852008
});
19862009
if (upstreamBranch.length > 0 && upstreamBranch !== branch) {
1987-
return upstreamBranch;
2010+
return { baseBranch: upstreamBranch, baseRef: upstreamBranch };
19882011
}
19892012
}
19902013

@@ -1993,24 +2016,25 @@ export const make = Effect.gen(function* () {
19932016
Effect.orElseSucceed(() => null),
19942017
);
19952018
if (defaultFromProvider) {
1996-
return defaultFromProvider;
2019+
return { baseBranch: defaultFromProvider, baseRef: defaultFromProvider };
19972020
}
19982021

19992022
const defaultFromRemote = yield* gitCore.resolvePrimaryRemoteName(cwd).pipe(
20002023
Effect.flatMap((remoteName) => gitCore.resolveDefaultBranchName(cwd, remoteName)),
20012024
Effect.orElseSucceed(() => null),
20022025
);
20032026
if (defaultFromRemote) {
2004-
return defaultFromRemote;
2027+
return { baseBranch: defaultFromRemote, baseRef: defaultFromRemote };
20052028
}
20062029

2007-
return "main";
2030+
return { baseBranch: "main", baseRef: "main" };
20082031
});
20092032

20102033
const resolveBaseRangeRef = Effect.fn("resolveBaseRangeRef")(function* (
20112034
cwd: string,
20122035
baseBranch: string,
20132036
) {
2037+
if (baseBranch.startsWith("refs/")) return baseBranch;
20142038
const remoteName = yield* gitCore
20152039
.resolvePrimaryRemoteName(cwd)
20162040
.pipe(Effect.orElseSucceed(() => null));
@@ -2235,13 +2259,18 @@ export const make = Effect.gen(function* () {
22352259
};
22362260
}
22372261

2238-
const baseBranch = yield* resolveBaseBranch(cwd, branch, details.upstreamRef, headContext);
2262+
const { baseBranch, baseRef } = yield* resolvePrBase(
2263+
cwd,
2264+
branch,
2265+
details.upstreamRef,
2266+
headContext,
2267+
);
22392268
yield* emit({
22402269
kind: "phase_started",
22412270
phase: "pr",
22422271
label: `Generating ${terms.shortLabel} content...`,
22432272
});
2244-
const baseRangeRef = yield* resolveBaseRangeRef(cwd, baseBranch);
2273+
const baseRangeRef = yield* resolveBaseRangeRef(cwd, baseRef);
22452274
const rangeContext = yield* gitCore.readRangeContext(cwd, baseRangeRef);
22462275
const policy = yield* resolveStylePolicy(cwd, settings);
22472276
const changeRequestTemplate =

‎apps/server/src/git/GitWorkflowService.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ export class GitWorkflowService extends Context.Service<
9898
{ readonly commitSha: string; readonly remoteRefName: string },
9999
GitCommandError
100100
>;
101+
readonly resolveWorktreeBaseRemote: GitVcsDriver.GitVcsDriver["Service"]["resolveWorktreeBaseRemote"];
102+
readonly fetchWorktreeBaseCommit: (input: {
103+
readonly cwd: string;
104+
readonly refName: string;
105+
}) => Effect.Effect<
106+
{ readonly commitSha: string; readonly remoteRefName: string } | null,
107+
GitCommandError
108+
>;
101109
readonly removeWorktree: (
102110
input: VcsRemoveWorktreeInput,
103111
) => Effect.Effect<void, GitCommandError>;
@@ -392,6 +400,14 @@ export const make = Effect.gen(function* () {
392400
ensureGitCommand("GitWorkflowService.resolveRemoteTrackingCommit", input.cwd).pipe(
393401
Effect.andThen(git.resolveRemoteTrackingCommit(input)),
394402
),
403+
resolveWorktreeBaseRemote: (input) =>
404+
ensureGitCommand("GitWorkflowService.resolveWorktreeBaseRemote", input.cwd).pipe(
405+
Effect.andThen(git.resolveWorktreeBaseRemote(input)),
406+
),
407+
fetchWorktreeBaseCommit: (input) =>
408+
ensureGitCommand("GitWorkflowService.fetchWorktreeBaseCommit", input.cwd).pipe(
409+
Effect.andThen(git.fetchWorktreeBaseCommit(input)),
410+
),
395411
removeWorktree: (input) =>
396412
ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(
397413
Effect.andThen(git.removeWorktree(input)),

0 commit comments

Comments
 (0)