add configurable worktree location settings

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.

[tarik02]

Fixes#1878

What Changed

This adds configurable worktree location settings so T3 Code does not have to create worktrees in one fixed global layout.

Specifically, this PR:

• adds built-in worktree location modes for the default global layout, a project subdirectory layout, and a project sibling layout
• adds a custom template option for users who need a different absolute path layout
• updates server-side worktree creation flows to resolve the target path before creating a worktree
• centralizes path sanitization, template validation, resolution, and preview rendering in shared helpers
• adds settings UI for selecting the mode, editing a custom template, previewing the final path, and showing inline validation errors
• adds tests for shared helpers, server plumbing, and settings panel behavior
• GitCore no longer depends on ServerConfig

Why

Some projects depend on folder-scoped local tooling and parent-directory configuration.

Examples from the issue include setups like direnv, flakes, and similar tooling that only work when the worktree lives under the expected project directory tree. The current global worktree location breaks those setups because the new worktree ends up outside the folder hierarchy those tools rely on.

This change lets users keep the existing global behavior, place worktrees under the project, or define a custom layout when their environment has stricter path requirements.

UI Changes

Before:

• worktrees were created in the default global location only
• there was no setting to change that behavior

After:

• General Settings includes a Worktree location setting
• users can choose a built-in location mode or a custom template
• the UI shows a live preview of the resolved path and inline validation for invalid custom templates

_20260411_131122.webm

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for any UI changes
• I included a video for animation/interaction changes

---

Note

Medium Risk
Changes where worktrees are created on disk (filesystem layout) and threads on paths that depend on project-adjacent tooling; invalid templates fail worktree creation explicitly rather than silently using the old default.

Overview
Adds configurable worktree paths so server-driven worktree creation (new worktree threads, PR worktree prep, and createWorktree without an explicit path) no longer always uses Git’s default layout.

Server: Introduces WorktreeLocationResolver, wired into GitManager and GitWorkflowService, which reads worktreeLocation from server settings and resolves a path before git worktree add. Invalid custom templates surface as WorktreeLocationResolverError (also included in git manager / VCS create-worktree error unions).

Contracts & shared:ServerSettings gains worktreeLocation (mode + template); shared worktreeLocation helpers handle template validation, variable substitution ($T3_HOME, $PROJECT_DIRNAME, $PROJECT_NAME, $WORKTREE_NAME), resolution for default / project-subdirectory / project-sibling / custom modes, and previews.

UI: General Settings adds a Worktree location control (mode selector, custom template field with variable hints, live preview, validation) and includes it in restore-defaults.

Tests: Coverage for shared resolution, resolver layers in git/server tests, and updated expectations when paths are auto-resolved (e.g. mock .mock-worktrees/... in tests).

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

Note

Add configurable worktree location settings with UI controls and live preview

• Adds a new WorktreeLocationResolver service that resolves where git worktrees are created, supporting four modes: default, project-subdirectory, project-sibling, and custom template.
• Adds worktreeLocation (mode + template) to ServerSettings with defaults, patch support, and a new WorktreeLocationResolverError error type in contracts.
• Wires the live resolver into GitManager and GitWorkflowService so worktrees are created at the resolved path instead of an unspecified location.
• Adds a settings UI row in GeneralSettingsPanel with a mode selector, optional custom template input, variable chips, and a live preview/validation message.
• Behavioral Change: createWorktree and preparePullRequestThread now use a resolved path rather than null; the WsVcsCreateWorktreeRpc RPC may now fail with WorktreeLocationResolverError in addition to GitCommandError.

^{Macroscope summarized 49b653e.}

---

[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: 182a8ecd-bf74-4bc9-8f9b-673b11651c9d

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.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature (configurable worktree locations) with substantial new code across services, shared utilities, UI components, and settings schema. New user-facing capabilities and runtime behavior changes warrant human review.

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

[cursor]

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

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

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

[fredericmorin-flare]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

[tarik02]

bump! would love to have that feature. currently blocked from using t3code on a project that requires worktree to be in a specific location for some other integration to work.

@fredericmorin-flare actually you can create worktrees on your own and they become available in t3code branch picker

pretty good workaround

[juliusmarminge]

Closing after product review: configurable worktree location is not planned in this form against the current workspace lifecycle.