Skip to content

Commit 4de1ec6

Browse files
TonybynMp4claude
andcommitted
feat(web): composer strip names the worktree folder
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 8b74a69 commit 4de1ec6

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
resolveEffectiveEnvMode,
99
resolveBranchToolbarPrBranch,
1010
resolveLocalCheckoutBranchMismatch,
11+
resolveLockedWorkspaceLabel,
1112
sanitizeNewRefName,
1213
shouldIncludeBranchPickerItem,
1314
} from "./BranchToolbar.logic";
@@ -92,6 +93,16 @@ describe("resolveEffectiveEnvMode", () => {
9293
});
9394
});
9495

96+
describe("resolveLockedWorkspaceLabel", () => {
97+
it.each([
98+
["/home/me/.t3/worktrees/app/t3-ff466c42", "t3-ff466c42"],
99+
["/home/me/.t3/worktrees/app/t3-ff466c42/", "t3-ff466c42"],
100+
["C:\\Users\\me\\worktrees\\feature-x", "feature-x"],
101+
])("names the worktree at %s", (path, label) => {
102+
expect(resolveLockedWorkspaceLabel(path, "worktree")).toBe(label);
103+
});
104+
});
105+
95106
describe("deriveLocalBranchNameFromRemoteRef", () => {
96107
it("supports remote names that contain slashes", () => {
97108
expect(deriveLocalBranchNameFromRemoteRef("my-org/upstream/feature/demo")).toBe(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export function resolveLockedWorkspaceLabel(
106106
activeWorktreePath: string | null,
107107
effectiveEnvMode: EnvMode,
108108
): string {
109-
if (activeWorktreePath) return "Worktree";
109+
if (activeWorktreePath) return activeWorktreePath.split(/[\\/]/).findLast(Boolean) ?? "Worktree";
110110
return effectiveEnvMode === "worktree" ? resolveEnvModeLabel("worktree") : "Local checkout";
111111
}
112112

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
9797
<TooltipPopup>
9898
{forceNewWorktree
9999
? "Each model starts in its own worktree."
100-
: resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode)}
100+
: (activeWorktreePath ??
101+
resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode))}
101102
</TooltipPopup>
102103
</Tooltip>
103104
);

0 commit comments

Comments
 (0)