Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit 571a8b4

Browse files
Unify temporary worktree branch naming (pingdotgg#4278)
1 parent b6e1b39 commit 571a8b4

2 files changed

Lines changed: 36 additions & 2 deletions

File tree

‎packages/shared/src/git.test.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,29 @@ describe("isTemporaryWorktreeBranch", () => {
7171
expect(isTemporaryWorktreeBranch(`${WORKTREE_BRANCH_PREFIX}/DEADBEEF`)).toBe(true);
7272
});
7373

74+
it("normalizes a UUID-shaped random callback to the canonical 8-hex form", () => {
75+
expect(buildTemporaryWorktreeBranchName(() => "f4ae4e0e-f971-4d48-b4f2-9cf0aa54ab12")).toBe(
76+
`${WORKTREE_BRANCH_PREFIX}/f4ae4e0e`,
77+
);
78+
});
79+
80+
it("matches legacy UUID-shaped temporary worktree refs from older mobile builds", () => {
81+
expect(
82+
isTemporaryWorktreeBranch(`${WORKTREE_BRANCH_PREFIX}/f4ae4e0e-f971-4d48-b4f2-9cf0aa54ab12`),
83+
).toBe(true);
84+
});
85+
86+
it("rejects UUID-shaped refs that are not RFC 4122 v4", () => {
87+
// version nibble is not 4
88+
expect(
89+
isTemporaryWorktreeBranch(`${WORKTREE_BRANCH_PREFIX}/f4ae4e0e-f971-1d48-b4f2-9cf0aa54ab12`),
90+
).toBe(false);
91+
// variant nibble is not [89ab]
92+
expect(
93+
isTemporaryWorktreeBranch(`${WORKTREE_BRANCH_PREFIX}/f4ae4e0e-f971-4d48-c4f2-9cf0aa54ab12`),
94+
).toBe(false);
95+
});
96+
7497
it("rejects non-temporary refName names", () => {
7598
expect(isTemporaryWorktreeBranch(`${WORKTREE_BRANCH_PREFIX}/feature/demo`)).toBe(false);
7699
expect(isTemporaryWorktreeBranch("main")).toBe(false);

‎packages/shared/src/git.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ import * as Result from "effect/Result";
1111
import { detectSourceControlProviderFromRemoteUrl } from "./sourceControl.ts";
1212

1313
export const WORKTREE_BRANCH_PREFIX = "t3code";
14-
const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
14+
// Canonical form is `t3code/<8 hex>`. Older mobile builds generated `t3code/<uuid>`
15+
// via Crypto.randomUUID() (always RFC 4122 v4), so the matcher also accepts exactly
16+
// that shape — version nibble `4`, variant nibble `[89ab]` — to keep those threads
17+
// eligible for branch regeneration without loosening beyond what was ever generated.
18+
const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(
19+
`^${WORKTREE_BRANCH_PREFIX}\\/(?:[0-9a-f]{8}|[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$`,
20+
);
1521

1622
/**
1723
* Sanitize an arbitrary string into a valid, lowercase git refName fragment.
@@ -89,7 +95,12 @@ export function deriveLocalBranchNameFromRemoteRef(branchName: string): string {
8995
export function buildTemporaryWorktreeBranchName(
9096
randomHex: (byteLength: number) => string,
9197
): string {
92-
const token = randomHex(4).toLowerCase();
98+
// Normalize to exactly 8 lowercase hex chars so a UUID-shaped callback
99+
// still produces the canonical temporary branch form.
100+
const token = randomHex(4)
101+
.toLowerCase()
102+
.replace(/[^0-9a-f]/g, "")
103+
.slice(0, 8);
93104
return `${WORKTREE_BRANCH_PREFIX}/${token}`;
94105
}
95106

0 commit comments

Comments
 (0)