From 076608021c89afb294f4bdc75d99018936540c95 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Mon, 9 Mar 2026 17:30:17 -0700
Subject: [PATCH] Namespace PR worktree branch names under t3code

- Change local PR worktree branch format from `pr/<number>-<head>` to `t3code/pr-<number>/<head>`
- Update GitManager tests to assert the new branch naming convention
---
 apps/server/src/git/Layers/GitManager.test.ts | 6 +++---
 apps/server/src/git/Layers/GitManager.ts      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/server/src/git/Layers/GitManager.test.ts b/apps/server/src/git/Layers/GitManager.test.ts
index 2cef6489c2b12ea6ca79cb1c09972cb8fcc66b4f..120ed83be3c6d73abeb35badc121c478637e0bd7 100644
--- a/apps/server/src/git/Layers/GitManager.test.ts
+++ b/apps/server/src/git/Layers/GitManager.test.ts
@@ -1452,13 +1452,13 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         mode: "worktree",
       });
 
-      expect(result.branch).toBe("pr/91-main");
+      expect(result.branch).toBe("t3code/pr-91/main");
       expect(result.worktreePath).not.toBeNull();
       expect((yield* runGit(repoDir, ["branch", "--show-current"])).stdout.trim()).toBe("main");
       expect((yield* runGit(repoDir, ["rev-parse", "main"])).stdout.trim()).toBe(mainBefore);
       expect(
         (yield* runGit(result.worktreePath as string, ["branch", "--show-current"])).stdout.trim(),
-      ).toBe("pr/91-main");
+      ).toBe("t3code/pr-91/main");
     }),
   );
 
@@ -1508,7 +1508,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         mode: "worktree",
       });
 
-      expect(result.branch).toBe("pr/92-main");
+      expect(result.branch).toBe("t3code/pr-92/main");
       expect((yield* runGit(repoDir, ["rev-parse", "main"])).stdout.trim()).toBe(localMainBefore);
       expect(
         (yield* runGit(result.worktreePath as string, ["rev-parse", "--abbrev-ref", "@{upstream}"]))
diff --git a/apps/server/src/git/Layers/GitManager.ts b/apps/server/src/git/Layers/GitManager.ts
index 072bdcc1e374c665411e394e83d06ab223d2bdd1..7ac63ab545bed0ac2d828db336edb6c3d8ca66c0 100644
--- a/apps/server/src/git/Layers/GitManager.ts
+++ b/apps/server/src/git/Layers/GitManager.ts
@@ -79,7 +79,7 @@ function resolvePullRequestWorktreeLocalBranchName(
 
   const sanitizedHeadBranch = sanitizeBranchFragment(pullRequest.headBranch).trim();
   const suffix = sanitizedHeadBranch.length > 0 ? sanitizedHeadBranch : "head";
-  return `pr/${pullRequest.number}-${suffix}`;
+  return `t3code/pr-${pullRequest.number}/${suffix}`;
 }
 
 function parsePullRequestList(raw: unknown): PullRequestInfo[] {
-- 
2.54.0