@devries-cameron20 / t3code Mirror · read-only / commits / b6d3097379
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 23:30 UTC

feat(web): composer strip names the worktree folder (#28459)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

Antony committed Nov 11, 2026 at 08:06 UTC b6d30973790aad715218c9d80e65263b62c59255
3 files changed +14 -2
apps/web/src/components/BranchToolbar.logic.test.ts
+11
@@ -8,6 +8,7 @@ import {
8 resolveEffectiveEnvMode,
9 resolveBranchToolbarPrBranch,
10 resolveLocalCheckoutBranchMismatch,
11 + resolveLockedWorkspaceLabel,
12 sanitizeNewRefName,
13 shouldIncludeBranchPickerItem,
14 } from "./BranchToolbar.logic";
@@ -92,6 +93,16 @@ describe("resolveEffectiveEnvMode", () => {
93 });
94 });
95
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 +
106 describe("deriveLocalBranchNameFromRemoteRef", () => {
107 it("supports remote names that contain slashes", () => {
108 expect(deriveLocalBranchNameFromRemoteRef("my-org/upstream/feature/demo")).toBe(
apps/web/src/components/BranchToolbar.logic.ts
+1 -1
@@ -107,7 +107,7 @@ export function resolveLockedWorkspaceLabel(
107 activeWorktreePath: string | null,
108 effectiveEnvMode: EnvMode,
109 ): string {
110 - if (activeWorktreePath) return "Worktree";
110 + if (activeWorktreePath) return activeWorktreePath.split(/[\\/]/).findLast(Boolean) ?? "Worktree";
111 return effectiveEnvMode === "worktree" ? resolveEnvModeLabel("worktree") : "Local checkout";
112 }
113
apps/web/src/components/BranchToolbarEnvModeSelector.tsx
+2 -1
@@ -97,7 +97,8 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
97 <TooltipPopup>
98 {forceNewWorktree
99 ? "Each model starts in its own worktree."
100 - : resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode)}
100 + : (activeWorktreePath ??
101 + resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode))}
102 </TooltipPopup>
103 </Tooltip>
104 );