fix: preserve configurable worktree branch prefixes

[nassimna]

What Changed

• Added a configurable worktreeBranchPrefix setting.
• Used that prefix when creating temporary worktree branches.
• Preserved the prefix during server-side generated branch renames.
• Added schema, migration, and test coverage for the new setting.

Why

• Users with a non-t3code branch namespace should not have generated worktree renames rewritten back to t3code/....
• This keeps branch naming predictable across settings, worktree creation, retries, and rename handling.

UI Changes

• This adds a visible settings control for the worktree branch prefix.
  
  

Verification

• bun fmt
• bun lint
• bun typecheck

---

Note

Medium Risk
Touches worktree branch naming and server-side rename detection; mistakes could cause missed renames or incorrect git branch names for new threads.

Overview
Adds a new client setting worktreeBranchPrefix (default t3code) with validation (WorktreeBranchPrefix) and migration support, plus a Settings UI control to edit/reset it.

Changes temporary worktree branches from <prefix>/<8hex> to <prefix>/worktree-<8hex> and updates the server rename logic to only target this marked pattern, preserving the existing branch prefix (including mixed case and digit-prefixed namespaces) when renaming to an LLM-generated branch name.

Extends test coverage in ProviderCommandReactor.test.ts and contracts/settings.test.ts to lock in prefix preservation and ensure ordinary user branches aren’t mistakenly renamed.

^{Written by Cursor Bugbot for commit 2c6133f. This will update automatically on new commits. Configure here.}

Note

Preserve configurable worktree branch prefixes when creating and renaming branches

• Adds a worktreeBranchPrefix setting to ClientSettingsSchema (default t3code) with validation via WorktreeBranchPrefix schema; invalid values are corrected on decode and rejected on encode.
• Temporary worktree branches are now named <prefix>/worktree-<8hex> using the configured prefix instead of a fixed t3code/<8hex>.
• When renaming a temporary branch, buildGeneratedWorktreeBranchName now extracts and preserves the original prefix (including case) rather than forcing a hard-coded value.
• Detection of temporary worktree branches uses a case-insensitive regex requiring the explicit worktree- marker, so ordinary user branches (e.g. feature/deadbeef) are no longer mistakenly renamed.
• Adds a UI input in the General Settings panel to view, validate, and persist the prefix; empty input resets to default.
• Legacy persisted settings with a worktreeBranchPrefix string are migrated into the new validated structure.

^{Macroscope summarized 2c6133f.}

[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: 94786626-4f89-4271-9fd5-064c33ab991c

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{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 is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}