Skip to content

Commit d91aa21

Browse files
juliusmarmingecodex
andcommitted
Preserve explicit remote branch labels
Use ref metadata to distinguish local branches from explicit remotes when displaying the worktree base. Co-authored-by: codex <[email protected]>
1 parent 1f1a71c commit d91aa21

3 files changed

Lines changed: 74 additions & 2 deletions

File tree

‎apps/web/src/components/BranchToolbar.logic.test.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,31 @@ describe("resolveBranchTriggerLabel", () => {
182182
activeWorktreePath: null,
183183
effectiveEnvMode: "worktree",
184184
resolvedActiveBranch: "main",
185+
resolvedActiveBranchIsRemote: false,
185186
startFromOrigin: true,
186187
}),
187188
).toBe("From origin/main");
188189
});
189190

191+
it("shows the origin ref for local branch names that contain slashes", () => {
192+
expect(
193+
resolveBranchTriggerLabel({
194+
activeWorktreePath: null,
195+
effectiveEnvMode: "worktree",
196+
resolvedActiveBranch: "feature/demo",
197+
resolvedActiveBranchIsRemote: false,
198+
startFromOrigin: true,
199+
}),
200+
).toBe("From origin/feature/demo");
201+
});
202+
190203
it("shows the local ref when start from origin is disabled", () => {
191204
expect(
192205
resolveBranchTriggerLabel({
193206
activeWorktreePath: null,
194207
effectiveEnvMode: "worktree",
195208
resolvedActiveBranch: "main",
209+
resolvedActiveBranchIsRemote: false,
196210
startFromOrigin: false,
197211
}),
198212
).toBe("From main");
@@ -204,17 +218,31 @@ describe("resolveBranchTriggerLabel", () => {
204218
activeWorktreePath: null,
205219
effectiveEnvMode: "worktree",
206220
resolvedActiveBranch: "origin/feature/demo",
221+
resolvedActiveBranchIsRemote: true,
207222
startFromOrigin: true,
208223
}),
209224
).toBe("From origin/feature/demo");
210225
});
211226

227+
it("preserves an explicit ref from a non-origin remote", () => {
228+
expect(
229+
resolveBranchTriggerLabel({
230+
activeWorktreePath: null,
231+
effectiveEnvMode: "worktree",
232+
resolvedActiveBranch: "upstream/feature/demo",
233+
resolvedActiveBranchIsRemote: true,
234+
startFromOrigin: true,
235+
}),
236+
).toBe("From upstream/feature/demo");
237+
});
238+
212239
it("keeps current-checkout labels and empty state unchanged", () => {
213240
expect(
214241
resolveBranchTriggerLabel({
215242
activeWorktreePath: null,
216243
effectiveEnvMode: "local",
217244
resolvedActiveBranch: "main",
245+
resolvedActiveBranchIsRemote: false,
218246
startFromOrigin: true,
219247
}),
220248
).toBe("main");
@@ -223,10 +251,23 @@ describe("resolveBranchTriggerLabel", () => {
223251
activeWorktreePath: null,
224252
effectiveEnvMode: "worktree",
225253
resolvedActiveBranch: null,
254+
resolvedActiveBranchIsRemote: null,
226255
startFromOrigin: true,
227256
}),
228257
).toBe("Select ref");
229258
});
259+
260+
it("does not fabricate an origin ref while branch metadata is loading", () => {
261+
expect(
262+
resolveBranchTriggerLabel({
263+
activeWorktreePath: null,
264+
effectiveEnvMode: "worktree",
265+
resolvedActiveBranch: "upstream/feature/demo",
266+
resolvedActiveBranchIsRemote: null,
267+
startFromOrigin: true,
268+
}),
269+
).toBe("From upstream/feature/demo");
270+
});
230271
});
231272

232273
describe("resolveBranchToolbarPrBranch", () => {

‎apps/web/src/components/BranchToolbar.logic.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,22 @@ export function resolveBranchTriggerLabel(input: {
160160
activeWorktreePath: string | null;
161161
effectiveEnvMode: EnvMode;
162162
resolvedActiveBranch: string | null;
163+
resolvedActiveBranchIsRemote: boolean | null;
163164
startFromOrigin: boolean;
164165
}): string {
165-
const { activeWorktreePath, effectiveEnvMode, resolvedActiveBranch, startFromOrigin } = input;
166+
const {
167+
activeWorktreePath,
168+
effectiveEnvMode,
169+
resolvedActiveBranch,
170+
resolvedActiveBranchIsRemote,
171+
startFromOrigin,
172+
} = input;
166173
if (!resolvedActiveBranch) {
167174
return "Select ref";
168175
}
169176
if (effectiveEnvMode === "worktree" && !activeWorktreePath) {
170177
const baseRef =
171-
startFromOrigin && !resolvedActiveBranch.startsWith("origin/")
178+
startFromOrigin && resolvedActiveBranchIsRemote === false
172179
? `origin/${resolvedActiveBranch}`
173180
: resolvedActiveBranch;
174181
return `From ${baseRef}`;

‎apps/web/src/components/BranchToolbarBranchSelector.tsx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,29 @@ export function BranchToolbarBranchSelector({
294294
canonicalActiveBranch,
295295
(_currentBranch: string | null, optimisticBranch: string | null) => optimisticBranch,
296296
);
297+
const listedActiveBranch =
298+
resolvedActiveBranch === null ? null : (branchByName.get(resolvedActiveBranch) ?? null);
299+
const activeBranchRefQuery = useEnvironmentQuery(
300+
branchCwd !== null && resolvedActiveBranch !== null
301+
? vcsEnvironment.listRefs({
302+
environmentId,
303+
input: {
304+
cwd: branchCwd,
305+
query: resolvedActiveBranch,
306+
limit: 10,
307+
},
308+
})
309+
: null,
310+
);
311+
const queriedActiveBranch = activeBranchRefQuery.data?.refs.find(
312+
(refName) => refName.name === resolvedActiveBranch,
313+
);
314+
const resolvedActiveBranchIsRemote =
315+
listedActiveBranch !== null
316+
? listedActiveBranch.isRemote === true
317+
: queriedActiveBranch
318+
? queriedActiveBranch.isRemote === true
319+
: null;
297320
const [isBranchActionPending, startBranchActionTransition] = useTransition();
298321
const totalBranchCount = branchRefState.data?.totalCount ?? 0;
299322
const branchStatusText = isInitialBranchesLoadPending
@@ -574,6 +597,7 @@ export function BranchToolbarBranchSelector({
574597
activeWorktreePath,
575598
effectiveEnvMode,
576599
resolvedActiveBranch,
600+
resolvedActiveBranchIsRemote,
577601
startFromOrigin,
578602
});
579603

0 commit comments

Comments
 (0)