Prevent live thread branches from regressing to temp worktree names

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53

[juliusmarminge]

Summary

• Preserve semantic thread branch names when the current git status reports a temporary t3code/<sha> worktree branch.
• Add a guard in resolveLiveThreadBranchUpdate so live thread branch updates only adopt temporary worktree names when the thread branch is already temporary.
• Cover the regression with a logic test for semantic thread branches.

Testing

• Not run (not requested).

---

Note

Low Risk
Low risk: small, targeted change to resolveLiveThreadBranchUpdate that only blocks adopting temporary worktree branch names, plus a regression test.

Overview
Prevents live thread branch metadata from being overwritten by temporary worktree branch names (t3code/<sha>) when a semantic branch name is already stored.

Adds a guard in resolveLiveThreadBranchUpdate using isTemporaryWorktreeBranch and covers the scenario with a new unit test to avoid regressions.

^{Reviewed by Cursor Bugbot for commit c1a7e53. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Prevent resolveLiveThreadBranchUpdate from regressing semantic thread branches to temporary worktree names

When a thread already has a semantic branch name (e.g. t3code/github-query-rate-limit), resolveLiveThreadBranchUpdate in GitActionsControl.logic.ts now returns null if the live git status reports a temporary worktree branch (e.g. t3code/bda76797), blocking the regression. A corresponding test case is added in GitActionsControl.logic.test.ts to cover this guard.

^{Macroscope summarized c1a7e53.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 82f34733-d33e-4629-b6d4-6344decd160e

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch t3code/branch-rename-fix

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Duplicated worktree branch detection logic across packages
  • Moved TEMP_WORKTREE_BRANCH_PATTERN and isTemporaryWorktreeBranch into @t3tools/shared/git and updated both apps/web and apps/server to import from the shared module, eliminating the duplication.

Or push these changes by commenting:

@cursor push 8913a6c37b

Preview (8913a6c37b)

diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts@@ -14,6 +14,8 @@
import { Cache, Cause, Duration, Effect, Equal, Layer, Option, Schema, Stream } from "effect";
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";+
import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
import { GitCore } from "../../git/Services/GitCore.ts";
import { increment, orchestrationEventsProcessedTotal } from "../../observability/Metrics.ts";
@@ -73,7 +75,6 @@
const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
const DEFAULT_RUNTIME_MODE: RuntimeMode = "full-access";
const WORKTREE_BRANCH_PREFIX = "t3code";
-const TEMP_WORKTREE_BRANCH_PATTERN = new RegExp(`^${WORKTREE_BRANCH_PREFIX}\\/[0-9a-f]{8}$`);
const DEFAULT_THREAD_TITLE = "New thread";
function canReplaceThreadTitle(currentTitle: string, titleSeed?: string): boolean {
@@ -119,10 +120,6 @@
return `Stale pending ${requestKind} request: ${requestId}. Provider callback state does not survive app restarts or recovered sessions. Restart the turn to continue.`;
}
-function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
function buildGeneratedWorktreeBranchName(raw: string): string {
const normalized = raw
.trim()
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts--- a/apps/web/src/components/GitActionsControl.logic.ts+++ b/apps/web/src/components/GitActionsControl.logic.ts@@ -3,6 +3,7 @@
GitStackedAction,
GitStatusResult,
} from "@t3tools/contracts";
+import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -37,12 +38,6 @@
| "commit_push"
| "commit_push_pr";
-const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;--function isTemporaryWorktreeBranch(branch: string): boolean {- return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());-}-
export function buildGitActionProgressStages(input: {
action: GitStackedAction;
hasCustomCommitMessage: boolean;
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts--- a/packages/shared/src/git.ts+++ b/packages/shared/src/git.ts@@ -242,6 +242,16 @@
};
}
+const TEMP_WORKTREE_BRANCH_PATTERN = /^t3code\/[0-9a-f]{8}$/;++/**+ * Returns true when the branch name matches the temporary worktree naming+ * convention used when a worktree is first created (`t3code/<8-hex-chars>`).+ */+export function isTemporaryWorktreeBranch(branch: string): boolean {+ return TEMP_WORKTREE_BRANCH_PATTERN.test(branch.trim().toLowerCase());+}+
const EMPTY_GIT_STATUS_REMOTE: GitStatusRemoteResult = {
hasUpstream: false,
aheadCount: 0,

_{You can send follow-ups to the cloud agent here.}

^{Reviewed by Cursor Bugbot for commit 63092f5. Configure here.}

[macroscopeapp]

Approvability

Verdict: Approved

Small, focused bug fix that adds a guard to prevent overwriting meaningful branch names with temporary worktree names. The change uses an existing utility function and includes a unit test. Clear intent with minimal scope.

^{You can customize Macroscope's approvability policy. Learn more.}

Dismissing prior approval to re-evaluate c1a7e53