Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat: improve worktree-path config discoverability (#431)

Maximilian Roos32771bcad6d6
diff --git a/docs/content/config.md b/docs/content/config.md
index 17542cee4..d9b020b01 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -700,6 +700,7 @@ Usage: <b><span class=c>wt config state</span></b> <span class=c>[OPTIONS]</span
<b><span class=c>ci-status</span></b> CI status cache
<b><span class=c>marker</span></b> Branch markers
<b><span class=c>logs</span></b> Background operation logs
+ <b><span class=c>hints</span></b> One-time hints shown in this repo
<b><span class=c>get</span></b> Get all stored state
<b><span class=c>clear</span></b> Clear all stored state
diff --git a/src/cli.rs b/src/cli.rs
index 9a342b3cc..b5f2e3c6c 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -142,7 +142,8 @@ Getting started
wt list Show all worktrees
wt merge Squash, rebase, and merge to default branch
-Run `wt config shell` to set up directory switching.
+Run `wt config shell install` to set up directory switching.
+Run `wt config create` to customize worktree locations.
Docs: https://worktrunk.dev
GitHub: https://github.com/max-sixty/worktrunk")]
@@ -619,6 +620,30 @@ wt config state logs clear
action: Option<LogsAction>,
},
+ /// One-time hints shown in this repo
+ #[command(
+ after_long_help = r#"Some hints show once per repo on first use, then are recorded in git config
+as `worktrunk.hints.<name> = true`.
+
+## Current hints
+
+| Name | Trigger | Message |
+|------|---------|---------|
+| `worktree-path` | First `wt switch --create` | Customize worktree locations: wt config create |
+
+## Examples
+
+```console
+wt config state hints # list shown hints
+wt config state hints clear # re-show all hints
+wt config state hints clear NAME # re-show specific hint
+```"#
+ )]
+ Hints {
+ #[command(subcommand)]
+ action: Option<HintsAction>,
+ },
+
/// Get all stored state
#[command(after_long_help = r#"Shows all stored state including:
@@ -626,6 +651,7 @@ wt config state logs clear
- **Previous branch**: Previous branch for `wt switch -`
- **Branch markers**: User-defined branch notes
- **CI status**: Cached GitHub/GitLab CI status per branch (30s TTL)
+- **Hints**: One-time hints that have been shown
- **Log files**: Background operation logs
CI cache entries show status, age, and the commit SHA they were fetched for."#)]
@@ -642,6 +668,7 @@ CI cache entries show status, age, and the commit SHA they were fetched for."#)]
- Previous branch
- All branch markers
- All CI status cache
+- All hints
- All log files
Use individual subcommands (`default-branch clear`, `ci-status clear --all`, etc.)
@@ -863,6 +890,43 @@ wt config state logs
Clear,
}
+#[derive(Subcommand)]
+pub enum HintsAction {
+ /// List hints that have been shown
+ #[command(
+ after_long_help = r#"Lists which one-time hints have been shown in this repository.
+
+## Examples
+
+List shown hints:
+```console
+wt config state hints
+```"#
+ )]
+ Get,
+
+ /// Clear hints (re-show on next trigger)
+ #[command(
+ after_long_help = r#"Clears hint state so hints will show again on next trigger.
+
+## Examples
+
+Clear all hints:
+```console
+wt config state hints clear
+```
+
+Clear a specific hint:
+```console
+wt config state hints clear worktree-path
+```"#
+ )]
+ Clear {
+ /// Specific hint to clear (clears all if not specified)
+ name: Option<String>,
+ },
+}
+
/// Run individual operations
#[derive(Subcommand)]
pub enum StepCommand {
diff --git a/src/commands/config.rs b/src/commands/config.rs
index b0d154e34..c8f3b20b1 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -1159,6 +1159,12 @@ pub fn handle_state_clear_all() -> anyhow::Result<()> {
cleared_any = true;
}
+ // Clear all hints
+ let hints_cleared = repo.clear_all_hints()?;
+ if hints_cleared > 0 {
+ cleared_any = true;
+ }
+
if cleared_any {
crate::output::print(success_message("Cleared all stored state"))?;
} else {
@@ -1168,6 +1174,54 @@ pub fn handle_state_clear_all() -> anyhow::Result<()> {
Ok(())
}
+/// Handle the hints get command (list shown hints)
+pub fn handle_hints_get() -> anyhow::Result<()> {
+ let repo = Repository::current();
+ let hints = repo.list_shown_hints();
+
+ if hints.is_empty() {
+ crate::output::print(info_message("No hints have been shown"))?;
+ } else {
+ for hint in hints {
+ crate::output::stdout(&hint)?;
+ }
+ }
+
+ Ok(())
+}
+
+/// Handle the hints clear command
+pub fn handle_hints_clear(name: Option<String>) -> anyhow::Result<()> {
+ let repo = Repository::current();
+
+ match name {
+ Some(hint_name) => {
+ if repo.clear_hint(&hint_name)? {
+ crate::output::print(success_message(cformat!(
+ "Cleared hint <bold>{hint_name}</>"
+ )))?;
+ } else {
+ crate::output::print(info_message(cformat!(
+ "Hint <bold>{hint_name}</> was not set"
+ )))?;
+ }
+ }
+ None => {
+ let cleared = repo.clear_all_hints()?;
+ if cleared == 0 {
+ crate::output::print(info_message("No hints to clear"))?;
+ } else {
+ crate::output::print(success_message(cformat!(
+ "Cleared <bold>{cleared}</> hint{}",
+ if cleared == 1 { "" } else { "s" }
+ )))?;
+ }
+ }
+ }
+
+ Ok(())
+}
+
/// Handle the state get command (shows all state)
pub fn handle_state_show(format: crate::cli::OutputFormat) -> anyhow::Result<()> {
use crate::cli::OutputFormat;
@@ -1264,12 +1318,16 @@ fn handle_state_show_json(repo: &Repository) -> anyhow::Result<()> {
vec![]
};
+ // Get hints
+ let hints = repo.list_shown_hints();
+
let output = serde_json::json!({
"default_branch": default_branch,
"previous_branch": previous_branch,
"markers": markers,
"ci_status": ci_status,
- "logs": logs
+ "logs": logs,
+ "hints": hints
});
crate::output::stdout(serde_json::to_string_pretty(&output)?)?;
@@ -1351,6 +1409,18 @@ fn handle_state_show_table(repo: &Repository) -> anyhow::Result<()> {
}
writeln!(out)?;
+ // Show hints
+ writeln!(out, "{}", format_heading("HINTS", None))?;
+ let hints = repo.list_shown_hints();
+ if hints.is_empty() {
+ writeln!(out, "{}", format_with_gutter("(none)", None))?;
+ } else {
+ for hint in hints {
+ writeln!(out, "{}", format_with_gutter(&hint, None))?;
+ }
+ }
+ writeln!(out)?;
+
// Show log files
render_log_files(&mut out, repo)?;
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index b21479912..cfdbaac29 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -23,8 +23,9 @@ pub mod worktree;
pub use command_approval::approve_hooks;
pub use config::{
- handle_config_create, handle_config_show, handle_state_clear, handle_state_clear_all,
- handle_state_get, handle_state_set, handle_state_show,
+ handle_config_create, handle_config_show, handle_hints_clear, handle_hints_get,
+ handle_state_clear, handle_state_clear_all, handle_state_get, handle_state_set,
+ handle_state_show,
};
pub use configure_shell::{handle_configure_shell, handle_show_theme, handle_unconfigure_shell};
pub use for_each::step_for_each;
diff --git a/src/config/user.rs b/src/config/user.rs
index 8dd58e633..61d57e3d7 100644
--- a/src/config/user.rs
+++ b/src/config/user.rs
@@ -310,6 +310,11 @@ impl WorktrunkConfig {
.unwrap_or_else(default_worktree_path)
}
+ /// Returns true if the user has explicitly set a custom worktree-path.
+ pub fn has_custom_worktree_path(&self) -> bool {
+ self.worktree_path.is_some()
+ }
+
/// Load configuration from config file and environment variables.
///
/// Configuration is loaded in the following order (later sources override earlier ones):
diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rs
index b2c828a13..eb81d8396 100644
--- a/src/git/repository/mod.rs
+++ b/src/git/repository/mod.rs
@@ -308,6 +308,54 @@ impl Repository {
.filter(|s| !s.is_empty())
}
+ /// Check if a hint has been shown in this repo.
+ ///
+ /// Hints are stored as `worktrunk.hints.<name> = true`.
+ /// TODO: Could move to global git config if we accumulate more global hints.
+ pub fn has_shown_hint(&self, name: &str) -> bool {
+ self.run_command(&["config", "--get", &format!("worktrunk.hints.{name}")])
+ .is_ok()
+ }
+
+ /// Mark a hint as shown in this repo.
+ pub fn mark_hint_shown(&self, name: &str) -> anyhow::Result<()> {
+ self.run_command(&["config", &format!("worktrunk.hints.{name}"), "true"])?;
+ Ok(())
+ }
+
+ /// Clear a hint so it will show again.
+ pub fn clear_hint(&self, name: &str) -> anyhow::Result<bool> {
+ match self.run_command(&["config", "--unset", &format!("worktrunk.hints.{name}")]) {
+ Ok(_) => Ok(true),
+ Err(_) => Ok(false), // Key didn't exist
+ }
+ }
+
+ /// List all hints that have been shown in this repo.
+ pub fn list_shown_hints(&self) -> Vec<String> {
+ self.run_command(&["config", "--get-regexp", r"^worktrunk\.hints\."])
+ .unwrap_or_default()
+ .lines()
+ .filter_map(|line| {
+ // Format: "worktrunk.hints.worktree-path true"
+ line.split_whitespace()
+ .next()
+ .and_then(|key| key.strip_prefix("worktrunk.hints."))
+ .map(String::from)
+ })
+ .collect()
+ }
+
+ /// Clear all hints so they will show again.
+ pub fn clear_all_hints(&self) -> anyhow::Result<usize> {
+ let hints = self.list_shown_hints();
+ let count = hints.len();
+ for hint in hints {
+ self.clear_hint(&hint)?;
+ }
+ Ok(count)
+ }
+
/// Resolve a worktree name, expanding "@" to current, "-" to previous, and "^" to main.
///
/// # Arguments
diff --git a/src/main.rs b/src/main.rs
index ac8136745..c567681d3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -31,17 +31,17 @@ use commands::worktree::{SwitchResult, handle_push};
use commands::{
MergeOptions, RebaseResult, ResolutionContext, SquashResult, add_approvals, approve_hooks,
clear_approvals, compute_worktree_path, handle_config_create, handle_config_show,
- handle_configure_shell, handle_hook_show, handle_init, handle_list, handle_merge,
- handle_rebase, handle_remove, handle_remove_current, handle_show_theme, handle_squash,
- handle_state_clear, handle_state_clear_all, handle_state_get, handle_state_set,
- handle_state_show, handle_switch, handle_unconfigure_shell, resolve_worktree_arg, run_hook,
- step_commit, step_for_each,
+ handle_configure_shell, handle_hints_clear, handle_hints_get, handle_hook_show, handle_init,
+ handle_list, handle_merge, handle_rebase, handle_remove, handle_remove_current,
+ handle_show_theme, handle_squash, handle_state_clear, handle_state_clear_all, handle_state_get,
+ handle_state_set, handle_state_show, handle_switch, handle_unconfigure_shell,
+ resolve_worktree_arg, run_hook, step_commit, step_for_each,
};
use output::{execute_user_command, handle_remove_output, handle_switch_output};
use cli::{
ApprovalsCommand, CiStatusAction, Cli, Commands, ConfigCommand, ConfigShellCommand,
- DefaultBranchAction, HookCommand, ListSubcommand, LogsAction, MarkerAction,
+ DefaultBranchAction, HintsAction, HookCommand, ListSubcommand, LogsAction, MarkerAction,
PreviousBranchAction, StateCommand, StepCommand,
};
use worktrunk::HookType;
@@ -1007,6 +1007,10 @@ fn main() {
Some(LogsAction::Get) | None => handle_state_get("logs", false, None),
Some(LogsAction::Clear) => handle_state_clear("logs", None, false),
},
+ StateCommand::Hints { action } => match action {
+ Some(HintsAction::Get) | None => handle_hints_get(),
+ Some(HintsAction::Clear { name }) => handle_hints_clear(name),
+ },
StateCommand::Get { format } => handle_state_show(format),
StateCommand::Clear => handle_state_clear_all(),
},
@@ -1260,6 +1264,7 @@ fn main() {
// Show success message (temporal locality: immediately after worktree operation)
// Returns path to display in hooks when user's shell won't be in the worktree
+ // Also shows worktree-path hint on first --create (before shell integration warning)
let hooks_display_path =
handle_switch_output(&result, &branch_info, execute.as_deref())?;
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 76d71b300..994d3a264 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -382,6 +382,21 @@ pub fn handle_switch_output(
from_remote.as_deref(),
)))?;
+ // Show worktree-path config hint on first --create in this repo,
+ // unless user already has a custom worktree-path config
+ if *created_branch {
+ let repo = worktrunk::git::Repository::current();
+ let has_custom_config = WorktrunkConfig::load()
+ .map(|c| c.has_custom_worktree_path())
+ .unwrap_or(false);
+ if !has_custom_config && !repo.has_shown_hint("worktree-path") {
+ super::print(hint_message(cformat!(
+ "Customize worktree locations: <bright-black>wt config create</>"
+ )))?;
+ let _ = repo.mark_hint_shown("worktree-path");
+ }
+ }
+
// Warn if shell won't cd to the new worktree
if let Some(reason) = shell_warning_reason {
if let Some(cmd) = execute_command {
diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rs
index 9150f28ae..b36230e5a 100644
--- a/tests/integration_tests/config_state.rs
+++ b/tests/integration_tests/config_state.rs
@@ -637,6 +637,9 @@ fn test_state_get_empty(repo: TestRepo) {
CI STATUS CACHE
  (none)
+ HINTS
+   (none)
+
LOG FILES @ <PATH>
  (none)
");
@@ -731,6 +734,7 @@ fn test_state_get_json_empty(repo: TestRepo) {
assert_eq!(json["previous_branch"], serde_json::Value::Null);
assert_eq!(json["markers"], serde_json::json!([]));
assert_eq!(json["ci_status"], serde_json::json!([]));
+ assert_eq!(json["hints"], serde_json::json!([]));
assert_eq!(json["logs"], serde_json::json!([]));
}
@@ -957,3 +961,122 @@ fn test_state_clear_marker_all_single(repo: TestRepo) {
assert!(output.status.success());
assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✓ Cleared 1 marker");
}
+
+// ============================================================================
+// hints
+// ============================================================================
+
+#[rstest]
+fn test_state_hints_get_empty(repo: TestRepo) {
+ let output = wt_state_cmd(&repo, "hints", "get", &[]).output().unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"○ No hints have been shown");
+}
+
+#[rstest]
+fn test_state_hints_get_with_hints(repo: TestRepo) {
+ // Set hints via git config (as the code stores them)
+ repo.git_command()
+ .args(["config", "worktrunk.hints.worktree-path", "true"])
+ .status()
+ .unwrap();
+ repo.git_command()
+ .args(["config", "worktrunk.hints.another-hint", "true"])
+ .status()
+ .unwrap();
+
+ let output = wt_state_cmd(&repo, "hints", "get", &[]).output().unwrap();
+ assert!(output.status.success());
+ // Output goes to stdout
+ let stdout = String::from_utf8_lossy(&output.stdout);
+ assert!(stdout.contains("worktree-path"));
+ assert!(stdout.contains("another-hint"));
+}
+
+#[rstest]
+fn test_state_hints_clear_empty(repo: TestRepo) {
+ let output = wt_state_cmd(&repo, "hints", "clear", &[]).output().unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"○ No hints to clear");
+}
+
+#[rstest]
+fn test_state_hints_clear_all(repo: TestRepo) {
+ // Set hints
+ repo.git_command()
+ .args(["config", "worktrunk.hints.worktree-path", "true"])
+ .status()
+ .unwrap();
+ repo.git_command()
+ .args(["config", "worktrunk.hints.another-hint", "true"])
+ .status()
+ .unwrap();
+
+ let output = wt_state_cmd(&repo, "hints", "clear", &[]).output().unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✓ Cleared 2 hints");
+
+ // Verify hints were cleared
+ let output = repo
+ .git_command()
+ .args(["config", "--get-regexp", r"^worktrunk\.hints\."])
+ .output()
+ .unwrap();
+ assert!(!output.status.success()); // No matches
+}
+
+#[rstest]
+fn test_state_hints_clear_single(repo: TestRepo) {
+ // Set a single hint
+ repo.git_command()
+ .args(["config", "worktrunk.hints.worktree-path", "true"])
+ .status()
+ .unwrap();
+
+ let output = wt_state_cmd(&repo, "hints", "clear", &[]).output().unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✓ Cleared 1 hint");
+}
+
+#[rstest]
+fn test_state_hints_clear_specific(repo: TestRepo) {
+ // Set hints
+ repo.git_command()
+ .args(["config", "worktrunk.hints.worktree-path", "true"])
+ .status()
+ .unwrap();
+ repo.git_command()
+ .args(["config", "worktrunk.hints.another-hint", "true"])
+ .status()
+ .unwrap();
+
+ let output = wt_state_cmd(&repo, "hints", "clear", &["worktree-path"])
+ .output()
+ .unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✓ Cleared hint worktree-path");
+
+ // Verify only that hint was cleared
+ let output = repo
+ .git_command()
+ .args(["config", "--get", "worktrunk.hints.worktree-path"])
+ .output()
+ .unwrap();
+ assert!(!output.status.success()); // Cleared
+
+ let output = repo
+ .git_command()
+ .args(["config", "--get", "worktrunk.hints.another-hint"])
+ .output()
+ .unwrap();
+ assert!(output.status.success()); // Still there
+}
+
+#[rstest]
+fn test_state_hints_clear_specific_not_set(repo: TestRepo) {
+ let output = wt_state_cmd(&repo, "hints", "clear", &["nonexistent"])
+ .output()
+ .unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"○ Hint nonexistent was not set");
+}
diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rs
index ce9120b02..da0d02bb6 100644
--- a/tests/integration_tests/switch.rs
+++ b/tests/integration_tests/switch.rs
@@ -1046,3 +1046,23 @@ fn test_switch_clobber_path_with_extension(repo: TestRepo) {
"file with extension"
);
}
+
+/// Test that worktree-path hint is suppressed when user has custom worktree-path config
+#[rstest]
+fn test_switch_create_no_hint_with_custom_worktree_path(repo: TestRepo) {
+ // Set up custom worktree-path in user config
+ repo.write_test_config(r#"worktree-path = ".worktrees/{{ branch | sanitize }}""#);
+
+ let output = repo
+ .wt_command()
+ .args(["switch", "--create", "test-no-hint"])
+ .output()
+ .unwrap();
+ assert!(output.status.success());
+
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ assert!(
+ !stderr.contains("Customize worktree locations"),
+ "Hint should be suppressed when user has custom worktree-path config"
+ );
+}
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index 0e1c28f2e..d4b4cec2b 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -13,4 +13,5 @@ y
  echo 'test command'
test command
✓ Created branch test-approve and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index 82e378f3b..b16bf8df0 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -11,4 +11,5 @@ n
❯ Allow and remember? [y/N]
○ Commands declined, continuing worktree creation
✓ Created branch test-decline and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 05a725c25..0c732a3ea 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -21,4 +21,5 @@ y
  echo 'Third command'
Third command
✓ Created branch test-mixed-accept and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index adc57d4cd..6275cd2fc 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -13,4 +13,5 @@ n
❯ Allow and remember? [y/N]
○ Commands declined, continuing worktree creation
✓ Created branch test-mixed-decline and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 175b95371..a46aa5248 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -23,4 +23,5 @@ y
  echo 'Third command'
Third command
✓ Created branch test-multi and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index c29c5ba50..c3616ec6a 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -23,4 +23,5 @@ y
  echo 'Running tests...'
Running tests...
✓ Created branch test-named and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 42a8c6fbc..777f87475 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -15,4 +15,5 @@ y
  echo 'test command'
test command
✓ Created branch test-permission and worktree from main @ _REPO_/repo.BRANCH
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index e1bd233ef..bebb2f95c 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -36,5 +36,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.test-approved:
  echo 'approved' > output.txt
✓ Created branch test-approved and worktree from main @ _REPO_.test-approved
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap
index ac381d8f6..1d3e69520 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap
@@ -38,5 +38,6 @@ exit_code: 0
  echo 'test command'
test command
✓ Created branch test-yes-tty and worktree from main @ _REPO_.test-yes-tty
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap
index 478e73217..f97589932 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap
@@ -37,5 +37,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.test-yes:
  echo 'test command' > output.txt
✓ Created branch test-yes and worktree from main @ _REPO_.test-yes
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap b/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
index 546d00d2f..bc3e337aa 100644
--- a/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
+++ b/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
@@ -19,6 +19,9 @@ expression: "normalize_log_path(&String::from_utf8_lossy(&output.stderr))"
─────── ────── ─── ────────
feature passed now abc12345
+HINTS
+  (none)
+
LOG FILES @ <PATH>
File Size Age
────────────────────────── ──── ──────
diff --git a/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap b/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
index b3981ef67..39b76c23a 100644
--- a/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
+++ b/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
@@ -18,5 +18,8 @@ expression: "normalize_log_path(&String::from_utf8_lossy(&output.stderr))"
feature passed now abc12345
main none now deadbeef
+HINTS
+  (none)
+
LOG FILES @ <PATH>
  (none)
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state.snap b/tests/snapshots/integration__integration_tests__help__help_config_state.snap
index 75e5b8f18..8f7103577 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state.snap
@@ -12,6 +12,7 @@ info:
GIT_EDITOR: ""
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
---
@@ -30,6 +31,7 @@ Usage: wt config state [OPTIONS] <COMMAND>
ci-status CI status cache
marker Branch markers
logs Background operation logs
+ hints One-time hints shown in this repo
get Get all stored state
clear Clear all stored state
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
index 034eac593..3730fba00 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
@@ -13,6 +13,7 @@ info:
GIT_EDITOR: ""
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
---
@@ -45,6 +46,7 @@ Clears all stored state:
- Previous branch
- All branch markers
- All CI status cache
+- All hints
- All log files
Use individual subcommands (default-branch clear, ci-status clear --all, etc.)
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
index aa9905d46..34447f93e 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
@@ -13,6 +13,7 @@ info:
GIT_EDITOR: ""
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
---
@@ -50,6 +51,7 @@ Shows all stored state including:
- Previous branch: Previous branch for wt switch -
- Branch markers: User-defined branch notes
- CI status: Cached GitHub/GitLab CI status per branch (30s TTL)
+- Hints: One-time hints that have been shown
- Log files: Background operation logs
CI cache entries show status, age, and the commit SHA they were fetched for.
diff --git a/tests/snapshots/integration__integration_tests__help__help_md_root.snap b/tests/snapshots/integration__integration_tests__help__help_md_root.snap
index f68b241b5..b35eb3905 100644
--- a/tests/snapshots/integration__integration_tests__help__help_md_root.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_md_root.snap
@@ -55,7 +55,8 @@ Getting started
wt list Show all worktrees
wt merge Squash, rebase, and merge to default branch
-Run `wt config shell` to set up directory switching.
+Run `wt config shell install` to set up directory switching.
+Run `wt config create` to customize worktree locations.
Docs: https://worktrunk.dev
GitHub: https://github.com/max-sixty/worktrunk
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_long.snap b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
index 8842ffd60..bbd0818a6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
@@ -57,7 +57,8 @@ Getting started
wt list Show all worktrees
wt merge Squash, rebase, and merge to default branch
-Run wt config shell to set up directory switching.
+Run wt config shell install to set up directory switching.
+Run wt config create to customize worktree locations.
Docs: https://worktrunk.dev
GitHub: https://github.com/max-sixty/worktrunk
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
index f5894e8c4..e78619d25 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
@@ -40,6 +40,7 @@ exit_code: 0
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
✓ Created branch feature-x and worktree from main @ _REPO_.feature-x
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:dev @ _REPO_.feature-x:
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
index 00687b63a..1cd15d958 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
@@ -34,5 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch fix-auth and worktree from main @ _REPO_.fix-auth
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index 0d6753a85..7ff0207ef 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -36,6 +36,7 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'Setup done' > setup.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:server @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index f8c8b05a9..9a17edfda 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -36,6 +36,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Executing echo 'Execute flag' > execute.txt @ _REPO_.feature, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
index 3bd281503..0beba58f9 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
@@ -37,5 +37,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'Default: main' > default.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 4940b5790..de824df61 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -37,5 +37,6 @@ exit_code: 0
  exit 1
▲ Command failed: exit status: 1
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
index ab42f114a..1d9f1304e 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
@@ -43,5 +43,6 @@ exit_code: 0
◎ Running post-create project:worktree_name @ _REPO_.feature:
  echo 'Worktree Name: repo.feature' >> git_vars.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index 9b70223fd..c70c20505 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -40,5 +40,6 @@ exit_code: 0
  echo 'Running setup'
Running setup
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
index 48b32b9e0..d93ead831 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
@@ -34,5 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index a488643c6..b3e7640a8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -37,5 +37,6 @@ exit_code: 0
  echo 'Setup complete'
Setup complete
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
index c1ffb18a9..1a0af6ef3 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
@@ -37,5 +37,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'Upstream: ' > upstream.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index 6c6eaedf8..82854f53c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index ceb7bb482..3afa129ea 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index 0609e1943..f31c605dd 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 5fc3e95b5..8978b41a4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index f5f738a2a..cb4314430 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:task1 @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index d5b64b4a7..0d1b18e5d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:task1 @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index e738a0b3a..fa951f25d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap
index 70b418dd0..305eabe9c 100644
--- a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap
+++ b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap
@@ -5,6 +5,7 @@ expression: normalized
y
✓ Created branch feature and worktree from main @ [REPO]/repo.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
❯ Install shell integration? [y/N/?]
diff --git a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap
index 3adef530a..be84fcbd4 100644
--- a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap
+++ b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap
@@ -5,6 +5,7 @@ expression: normalized
n
✓ Created branch feature and worktree from main @ [REPO]/repo.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
❯ Install shell integration? [y/N/?]
diff --git a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap
index 22cf118e2..bd2eb5c9d 100644
--- a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap
+++ b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap
@@ -6,6 +6,7 @@ expression: normalized
n
✓ Created branch feature and worktree from main @ [REPO]/repo.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
❯ Install shell integration? [y/N/?]
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index c5775ecc4..592645d0d 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -3,3 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch bash-test and worktree from main @ [TMPDIR]/repo.bash-test
+↳ Customize worktree locations: wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index dbe76f2a5..1213e287a 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fish-multiline and worktree from main @ [TMPDIR]/repo.fish-multiline
+↳ Customize worktree locations: wt config create
◎ Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index 8311dd6d2..b0e72ca3f 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -3,3 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fish-minimal and worktree from main @ [TMPDIR]/repo.fish-minimal
+↳ Customize worktree locations: wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 4b8ca5914..18316fc8c 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -3,5 +3,6 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fish-bg and worktree from main @ [TMPDIR]/repo.fish-bg
+↳ Customize worktree locations: wt config create
◎ Running post-start project hook:
  echo 'fish background task'
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index ea4eec5bb..e14908ae1 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -8,5 +8,6 @@ expression: output.normalized()
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
✓ Created branch feature-x and worktree from main @ [TMPDIR]/repo.feature-x
+↳ Customize worktree locations: wt config create
◎ Running post-start project:dev:
  uv run dev
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index 3a1fcaf56..e41a73327 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -3,3 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fix-auth and worktree from main @ [TMPDIR]/repo.fix-auth
+↳ Customize worktree locations: wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 7a59beb65..e3142f7ee 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -3,3 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch feature and worktree from main @ [TMPDIR]/repo.feature
+↳ Customize worktree locations: wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index c4c946fa0..5176f18e8 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch test-exec and worktree from main @ [TMPDIR]/repo.test-exec
+↳ Customize worktree locations: wt config create
◎ Executing (--execute):
  echo executed
executed
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index c4c946fa0..5176f18e8 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch test-exec and worktree from main @ [TMPDIR]/repo.test-exec
+↳ Customize worktree locations: wt config create
◎ Executing (--execute):
  echo executed
executed
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 22edda3b6..447a732fc 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -9,6 +9,7 @@ Installing dependencies...
  echo 'Building project...'
Building project...
✓ Created branch feature-hooks and worktree from main @ [TMPDIR]/repo.feature-hooks
+↳ Customize worktree locations: wt config create
◎ Running post-start project:server:
  echo 'Starting dev server on port 3000'
◎ Running post-start project:watch:
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 04235e83f..0b1cc7b32 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -3,5 +3,6 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch feature-with-hooks and worktree from main @ [TMPDIR]/repo.feature-with-hooks
+↳ Customize worktree locations: wt config create
◎ Running post-start project hook:
  echo 'test command executed'
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 9b34c813e..66b9f85b6 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -3,5 +3,6 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch feature-bg and worktree from main @ [TMPDIR]/repo.feature-bg
+↳ Customize worktree locations: wt config create
◎ Running post-start project hook:
  echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
index ea857e533..9bf6a69f0 100644
--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch new-feature and worktree from main @ _REPO_.new-feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap
index 7a4e62823..97a9ad83c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
▲ Moving _REPO_.clobber-ext.txt to _REPO_.clobber-ext.txt.bak.20250102-000000 (--clobber)
✓ Created branch clobber-ext.txt and worktree from main @ _REPO_.clobber-ext.txt
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap
index 2adc93aa9..9d2f67e39 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
▲ Moving _REPO_.clobber-dir-test to _REPO_.clobber-dir-test.bak.20250102-000000 (--clobber)
✓ Created branch clobber-dir-test and worktree from main @ _REPO_.clobber-dir-test
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap
index 9f9175af9..f8b4e2757 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
▲ Moving _REPO_.clobber-file-test to _REPO_.clobber-file-test.bak.20250102-000000 (--clobber)
✓ Created branch clobber-file-test and worktree from main @ _REPO_.clobber-file-test
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index e3793e45f..a3558afba 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -34,5 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature-x and worktree from main @ _REPO_.feature-x
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index cbe98ce36..17efdcafb 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
@@ -34,5 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index a7db1dc55..d7d01a256 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
@@ -36,5 +36,6 @@ exit_code: 0
▲ Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
↳ To switch to the remote branch, remove --create; run wt switch remote-feature
✓ Created branch remote-feature and worktree from main @ _REPO_.remote-feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index ce763979b..ced18c878 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -36,6 +36,7 @@ exit_code: 0
----- stderr -----
✓ Created branch file-test and worktree from main @ _REPO_.file-test
+↳ Customize worktree locations: wt config create
▲ Executing echo 'test content' > test.txt @ _REPO_.file-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index 8abd1a753..5f9079c6b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -36,6 +36,7 @@ exit_code: 1
----- stderr -----
✓ Created branch fail-test and worktree from main @ _REPO_.fail-test
+↳ Customize worktree locations: wt config create
▲ Executing exit 1 @ _REPO_.fail-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index acf01592f..2aab6f309 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -39,6 +39,7 @@ line3
----- stderr -----
✓ Created branch multiline-test and worktree from main @ _REPO_.multiline-test
+↳ Customize worktree locations: wt config create
▲ Executing echo 'line1'
echo 'line2'
echo 'line3' @ _REPO_.multiline-test, but shell directory unchanged — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 500d4e84c..2dbda72e2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -37,6 +37,7 @@ test output
----- stderr -----
✓ Created branch exec-test and worktree from main @ _REPO_.exec-test
+↳ Customize worktree locations: wt config create
▲ Executing echo 'test output' @ _REPO_.exec-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index 9dacdfdef..2729d05ce 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -37,5 +37,6 @@ exit_code: 0
----- stderr -----
✓ Created branch exit-code-test and worktree from main @ _REPO_.exit-code-test
+↳ Customize worktree locations: wt config create
◎ Executing (--execute):
  exit 42
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index 79491aa86..6ceba852b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -37,6 +37,7 @@ exit_code: 0
----- stderr -----
✓ Created branch output-exit-test and worktree from main @ _REPO_.output-exit-test
+↳ Customize worktree locations: wt config create
◎ Executing (--execute):
  echo 'doing work'
  exit 7
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index e96d46370..71d3be35b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
@@ -35,3 +35,4 @@ exit_code: 0
----- stderr -----
✓ Created branch internal-test and worktree from main @ _REPO_.internal-test
+↳ Customize worktree locations: wt config create
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 1195a7dbd..44a6778d0 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -37,6 +37,7 @@ exit_code: 0
----- stderr -----
✓ Created branch exec-internal and worktree from main @ _REPO_.exec-internal
+↳ Customize worktree locations: wt config create
◎ Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
index 39317cbf9..6bbf4897f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
@@ -38,6 +38,7 @@ execute command runs
----- stderr -----
✓ Created branch no-hooks-test and worktree from main @ _REPO_.no-hooks-test
+↳ Customize worktree locations: wt config create
▲ Executing echo 'execute command runs' @ _REPO_.no-hooks-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
index 9e68c4521..a31226ddc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
@@ -35,5 +35,6 @@ exit_code: 0
----- stderr -----
✓ Created branch no-post-start and worktree from main @ _REPO_.no-post-start
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap
index 95efb21d8..b08fab381 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch yes-no-hooks and worktree from main @ _REPO_.yes-no-hooks
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap
index 277371ffe..5abbecd46 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch post-hook-shell-test and worktree from main @ _REPO_.post-hook-shell-test
+↳ Customize worktree locations: wt config create
◎ Running post-switch project hook:
  echo switched
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap
index 7b34af868..51ad9f003 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap
@@ -35,6 +35,7 @@ exit_code: 0
----- stderr -----
✓ Created branch post-hook-test and worktree from main @ _REPO_.post-hook-test
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-switch project hook @ _REPO_.post-hook-test:
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
index 21522ba8c..8d5483156 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
@@ -34,5 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature-from-main and worktree from main @ _REPO_.feature-from-main
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index eff21b23f..f80c9e158 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -36,5 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature-with-base and worktree from main @ _REPO_.feature-with-base
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
index 91a9f1aa9..a1d7add45 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
@@ -35,5 +35,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
index 85c934dcc..3f54532be 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start user:bg @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
index a16ace7f4..1b101d5c1 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
@@ -36,5 +36,6 @@ exit_code: 0
◎ Running post-create user:vars @ _REPO_.feature:
  echo 'repo=repo branch=feature' > template_vars.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
index 63d9feb9e..17d604f5a 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
@@ -38,5 +38,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'PROJECT_HOOK' >> hook_order.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
index 2f695242d..9a490faea 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
@@ -36,5 +36,6 @@ exit_code: 0
◎ Running post-create user:setup @ _REPO_.feature:
  echo 'NO_APPROVAL_NEEDED' > no_approval.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
index 97c677634..75b998a1e 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
@@ -36,5 +36,6 @@ exit_code: 0
◎ Running post-create user:log @ _REPO_.feature:
  echo 'USER_POST_CREATE_RAN' > user_hook_marker.txt
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
index 1ba28e55b..00f40b83e 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
@@ -37,5 +37,6 @@ exit_code: 0
  exit 1
▲ Command failing failed: exit status: 1
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
index 80381a904..024405bef 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
@@ -34,6 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start user:bg @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
index 91a9f1aa9..a1d7add45 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
@@ -35,5 +35,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature and worktree from main @ _REPO_.feature
+↳ Customize worktree locations: wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install