Skip to content

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

Refactor messaging for clarity and consistency

Maximilian Roos789a692ad8fb
diff --git a/README.md b/README.md
index 34fb5f14b..2fb582c61 100644
--- a/README.md
+++ b/README.md
@@ -61,9 +61,9 @@ Create a worktree for a new task:
<!-- ⚠️ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap — edit source to update -->
-```bash
+```console
$ wt switch --create fix-auth
-✅ Created new worktree for fix-auth from main at ../repo.fix-auth
+✅ Created worktree fix-auth based off main @ ../repo.fix-auth
```
<!-- END AUTO-GENERATED -->
@@ -72,9 +72,9 @@ Switch to an existing worktree:
<!-- ⚠️ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap — edit source to update -->
-```bash
+```console
$ wt switch feature-api
-✅ Switched to worktree for feature-api at ../repo.feature-api
+✅ Switched to feature-api @ ../repo.feature-api
```
<!-- END AUTO-GENERATED -->
@@ -90,7 +90,7 @@ $ wt list
^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
-⚪ Showing 3 worktrees, 1 with changes, 2 ahead
+⚪ Showing 3 worktrees; 1 with changes, 2 ahead
```
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index bdb01c6ec..119e2ca89 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -22,7 +22,7 @@ The plugin adds status indicators to `wt list`:
+ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>afd3b353</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
+ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
-⚪ <span class=d>Showing 4 worktrees, 2 ahead</span>
+⚪ <span class=d>Showing 4 worktrees; 2 ahead</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/list.md b/docs/content/list.md
index c51657fec..10e218454 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -25,7 +25,7 @@ List all worktrees:
^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
-⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
+⚪ <span class=d>Showing 3 worktrees; 1 with changes, 2 ahead</span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -41,7 +41,7 @@ Include CI status and line diffs:
^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
-⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+⚪ <span class=d>Showing 3 worktrees; 1 with changes, 2 ahead; 1 column hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -59,7 +59,7 @@ Include branches that don't have worktrees:
exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
-⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
+⚪ <span class=d>Showing 3 worktrees, 2 branches; 1 with changes, 4 ahead; 1 column hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/why-worktrunk.md b/docs/content/why-worktrunk.md
index d0f1798a2..c4bfe8e80 100644
--- a/docs/content/why-worktrunk.md
+++ b/docs/content/why-worktrunk.md
@@ -50,7 +50,7 @@ Create a worktree for a new task:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt switch --create fix-auth</span>
-✅ <span class=g>Created new worktree for <b>fix-auth</b> from <b>main</b> at <b>../repo.fix-auth</b></span>
+✅ <span class=g>Created worktree <b>fix-auth</b> based off <b>main</b> @ <b>../repo.fix-auth</b></span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -61,7 +61,7 @@ Switch to an existing worktree:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt switch feature-api</span>
-✅ <span class=g>Switched to worktree for <b>feature-api</b> at <b>../repo.feature-api</b></span>
+✅ <span class=g>Switched to <b>feature-api</b> @ <b>../repo.feature-api</b></span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -77,7 +77,7 @@ See all worktrees at a glance:
^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
-⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
+⚪ <span class=d>Showing 3 worktrees; 1 with changes, 2 ahead</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index 3d83beb4a..7dc21a142 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -87,7 +87,7 @@ pub fn approve_command_batch(
let _ = output::print(warning_message(format!(
"Failed to save command approval: {e}"
)));
- let _ = output::print(hint_message("Approval will be requested again next time."));
+ let _ = output::print(hint_message("Approval will be requested again next time"));
}
}
diff --git a/src/commands/config.rs b/src/commands/config.rs
index 4dacf16c2..0dcf9e163 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -419,7 +419,7 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
hint_message(cformat!(
- "<bright-black>wt config shell install</> enables shell integration"
+ "Run <bright-black>wt config shell install</> to enable shell integration"
))
)?;
}
@@ -447,7 +447,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
warning_message(cformat!(
- "<bold>gh</> installed but not authenticated; run <bright-black>gh auth login</>"
+ "<bold>gh</> installed but not authenticated; run <bold>gh auth login</>"
))
)?;
}
@@ -455,9 +455,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
writeln!(
out,
"{}",
- hint_message(cformat!(
- "<bold>gh</> not found (GitHub CI status unavailable)"
- ))
+ hint_message(cformat!("Install <bright-black>gh</> for GitHub CI status"))
)?;
}
@@ -474,7 +472,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
warning_message(cformat!(
- "<bold>glab</> installed but not authenticated; run <bright-black>glab auth login</>"
+ "<bold>glab</> installed but not authenticated; run <bold>glab auth login</>"
))
)?;
}
@@ -483,7 +481,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
hint_message(cformat!(
- "<bold>glab</> not found (GitLab CI status unavailable)"
+ "Install <bright-black>glab</> for GitLab CI status"
))
)?;
}
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rs
index 7e59ce46e..edec02bf8 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -642,20 +642,26 @@ pub fn collect(
let num_local_branches = branches_without_worktrees.len();
let num_remote_branches = remote_branches.len();
- let footer_base =
+ let footer_base = {
+ let wt_plural = if num_worktrees == 1 { "" } else { "s" };
if (show_branches && num_local_branches > 0) || (show_remotes && num_remote_branches > 0) {
- let mut parts = vec![format!("{} worktrees", num_worktrees)];
+ let mut parts = vec![format!("{} worktree{}", num_worktrees, wt_plural)];
if show_branches && num_local_branches > 0 {
- parts.push(format!("{} branches", num_local_branches));
+ let br_plural = if num_local_branches == 1 { "" } else { "es" };
+ parts.push(format!("{} branch{}", num_local_branches, br_plural));
}
if show_remotes && num_remote_branches > 0 {
- parts.push(format!("{} remote branches", num_remote_branches));
+ let rb_plural = if num_remote_branches == 1 { "" } else { "es" };
+ parts.push(format!(
+ "{} remote branch{}",
+ num_remote_branches, rb_plural
+ ));
}
format!("Showing {}", parts.join(", "))
} else {
- let plural = if num_worktrees == 1 { "" } else { "s" };
- format!("Showing {} worktree{}", num_worktrees, plural)
- };
+ format!("Showing {} worktree{}", num_worktrees, wt_plural)
+ }
+ };
// Create progressive table if showing progress
let mut progressive_table = if show_progress {
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 16e67e797..292176724 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -284,44 +284,58 @@ impl SummaryMetrics {
}
}
+ /// Returns (primary_parts, status_parts, meta_parts) for structured joining.
+ /// Primary: worktree/branch counts
+ /// Status: dirty/ahead counts
+ /// Meta: hidden columns
pub(super) fn summary_parts(
&self,
include_branches: bool,
hidden_columns: usize,
- ) -> Vec<String> {
- let mut parts = Vec::new();
+ ) -> (Vec<String>, Vec<String>, Vec<String>) {
+ let mut primary = Vec::new();
+ let mut status = Vec::new();
+ let mut meta = Vec::new();
+ // Primary: item counts
+ let wt_plural = if self.worktrees == 1 { "" } else { "s" };
if include_branches {
- parts.push(format!("{} worktrees", self.worktrees));
+ primary.push(format!("{} worktree{}", self.worktrees, wt_plural));
if self.local_branches > 0 {
- parts.push(format!("{} branches", self.local_branches));
+ let br_plural = if self.local_branches == 1 { "" } else { "es" };
+ primary.push(format!("{} branch{}", self.local_branches, br_plural));
}
if self.remote_branches > 0 {
- parts.push(format!("{} remote branches", self.remote_branches));
+ let rb_plural = if self.remote_branches == 1 { "" } else { "es" };
+ primary.push(format!(
+ "{} remote branch{}",
+ self.remote_branches, rb_plural
+ ));
}
} else {
- let plural = if self.worktrees == 1 { "" } else { "s" };
- parts.push(format!("{} worktree{}", self.worktrees, plural));
+ primary.push(format!("{} worktree{}", self.worktrees, wt_plural));
}
+ // Status: state counts
if self.dirty_worktrees > 0 {
- parts.push(format!("{} with changes", self.dirty_worktrees));
+ status.push(format!("{} with changes", self.dirty_worktrees));
}
if self.ahead_items > 0 {
- parts.push(format!("{} ahead", self.ahead_items));
+ status.push(format!("{} ahead", self.ahead_items));
}
+ // Meta: UI state
if hidden_columns > 0 {
let plural = if hidden_columns == 1 {
"column"
} else {
"columns"
};
- parts.push(format!("{} {} hidden", hidden_columns, plural));
+ meta.push(format!("{} {} hidden", hidden_columns, plural));
}
- parts
+ (primary, status, meta)
}
}
@@ -336,8 +350,17 @@ pub(crate) fn format_summary_message(
let metrics = SummaryMetrics::from_items(items);
let dim = Style::new().dimmed();
- let summary = metrics
- .summary_parts(show_branches, hidden_nonempty_count)
- .join(", ");
+ let (primary, status, meta) = metrics.summary_parts(show_branches, hidden_nonempty_count);
+
+ // Join groups with semicolons, items within groups with commas
+ let mut groups = vec![primary.join(", ")];
+ if !status.is_empty() {
+ groups.push(status.join(", "));
+ }
+ if !meta.is_empty() {
+ groups.push(meta.join(", "));
+ }
+ let summary = groups.join("; ");
+
format!("{INFO_EMOJI} {dim}Showing {summary}{dim:#}")
}
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index e639f6aa9..e82d01874 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -342,9 +342,9 @@ pub fn handle_switch(
// Check if base flag was provided without create flag
if resolved_base.is_some() && !create {
- crate::output::print(warning_message(
- "--base flag is only used with --create, ignoring",
- ))?;
+ crate::output::print(warning_message(cformat!(
+ "<bold>--base</> is only used with <bold>--create</>; ignoring"
+ )))?;
}
// Compute expected worktree path for this branch
diff --git a/src/llm.rs b/src/llm.rs
index 443b8cc49..37c61e342 100644
--- a/src/llm.rs
+++ b/src/llm.rs
@@ -423,7 +423,7 @@ pub fn test_commit_generation(
) -> anyhow::Result<String> {
if !commit_generation_config.is_configured() {
anyhow::bail!(
- "Commit generation is not configured. Add [commit-generation] to your config."
+ "Commit generation is not configured. Add [commit-generation] to the config."
);
}
diff --git a/src/output/directive.rs b/src/output/directive.rs
index 4088f8417..2a05d4d7a 100644
--- a/src/output/directive.rs
+++ b/src/output/directive.rs
@@ -12,7 +12,7 @@
//!
//! **stderr** (streams directly to terminal in real-time):
//! ```text
-//! ✅ Created new worktree for my-branch at ~/worktrees/my-branch
+//! ✅ Created worktree my-branch based off main @ ~/worktrees/my-branch
//! ```
//!
//! **stdout** (shell script emitted at the end):
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 5caf98d20..bb82cae04 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -21,7 +21,7 @@ use worktrunk::styling::{
/// Format a switch success message with a consistent location phrase
///
/// Both interactive and directive modes now use the human-friendly
-/// `"Created new worktree for {branch} from {base} at {path}"` wording so
+/// `"Created worktree {branch} based off {base} @ {path}"` wording so
/// users see the same message regardless of how worktrunk is invoked.
fn format_switch_success_message(
branch: &str,
@@ -33,20 +33,20 @@ fn format_switch_success_message(
// Determine action and source based on how the worktree was created
// Priority: explicit --create > DWIM from remote > existing local branch
let (action, source) = if created_branch {
- ("Created new worktree for", base_branch)
+ ("Created worktree", base_branch)
} else if let Some(remote) = from_remote {
- ("Created worktree for", Some(remote))
+ ("Created worktree", Some(remote))
} else {
- ("Switched to worktree for", None)
+ ("Switched to", None)
};
match source {
Some(src) => cformat!(
- "<green>{action} <bold>{branch}</> from <bold>{src}</> at <bold>{}</></>",
+ "<green>{action} <bold>{branch}</> based off <bold>{src}</> @ <bold>{}</></>",
format_path_for_display(path)
),
None => cformat!(
- "<green>{action} <bold>{branch}</> at <bold>{}</></>",
+ "<green>{action} <bold>{branch}</> @ <bold>{}</></>",
format_path_for_display(path)
),
}
@@ -225,7 +225,7 @@ fn handle_branch_deletion_result(
"Branch <bold>{branch_name}</> retained; has unmerged changes"
)))?;
super::print(hint_message(cformat!(
- "<bright-black>wt remove -D</> deletes unmerged branches"
+ "Use <bright-black>wt remove -D</> to delete unmerged branches"
)))?;
result
}
@@ -357,7 +357,7 @@ pub fn handle_switch_output(
// Shell integration not configured - show warning and setup hint
let path_display = format_path_for_display(path);
super::print(warning_message(cformat!(
- "Worktree for <bold>{branch}</> at <bold>{path_display}</>; cannot cd (no shell integration)"
+ "Worktree for <bold>{branch}</> at <bold>{path_display}</>; cd unavailable (no shell integration)"
)))?;
super::shell_integration_hint(shell_integration_hint())?;
}
@@ -649,7 +649,7 @@ fn handle_removed_worktree_output(
// Show hint for unmerged branches (same as synchronous path)
if !no_delete_branch && !should_delete_branch {
super::print(hint_message(cformat!(
- "<bright-black>wt remove -D</> deletes unmerged branches"
+ "Use <bright-black>wt remove -D</> to delete unmerged branches"
)))?;
}
diff --git a/tests/integration_tests/approval_pty.rs b/tests/integration_tests/approval_pty.rs
index 5df6063bd..07adbb21f 100644
--- a/tests/integration_tests/approval_pty.rs
+++ b/tests/integration_tests/approval_pty.rs
@@ -426,7 +426,9 @@ approved-commands = ["echo 'Second command'"]
"Should NOT execute any commands when declined"
);
assert!(
- normalized.contains("Created new worktree"),
+ normalized.contains("Created worktree")
+ && normalized.contains("based off")
+ && normalized.contains("@"),
"Should still create worktree even when commands declined"
);
assert_snapshot!(
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index dc15e80f0..4f225e72e 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -747,7 +747,7 @@ mod tests {
output.assert_no_job_control_messages();
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"{}: Should show success message",
shell
);
@@ -942,7 +942,7 @@ mod tests {
// Should still show wt's success message (worktree was created)
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"{}: Should show wt's success message even though execute command failed",
shell
);
@@ -1376,7 +1376,7 @@ approved-commands = ["echo 'test command executed'"]
// Should still have the success message
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"Success message missing"
);
@@ -1618,7 +1618,7 @@ approved-commands = ["echo 'fish background task'"]
// Should still show success message
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"Success message missing from minimal output"
);
@@ -1867,7 +1867,7 @@ approved-commands = ["echo 'bash background'"]
// Verify the command completed successfully
assert!(
- output.contains("Created new worktree"),
+ output.contains("Created worktree"),
"Should show success message.\nOutput:\n{}",
output
);
@@ -2041,7 +2041,7 @@ approved-commands = ["echo 'bash background'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"{}: Should create worktree for branch with slashes",
shell
);
@@ -2062,7 +2062,7 @@ approved-commands = ["echo 'bash background'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"{}: Should create worktree for branch with dashes/underscores",
shell
);
@@ -2163,7 +2163,7 @@ approved-commands = ["echo 'bash background'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"{}: Should create worktree using WORKTRUNK_BIN fallback.\nOutput:\n{}",
shell,
output.combined
@@ -2229,7 +2229,7 @@ approved-commands = ["echo 'cleanup test'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created new worktree"),
+ output.combined.contains("Created worktree"),
"{}: Should complete successfully",
shell
);
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index cfb2f65f3..c8afb910c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -12,5 +12,5 @@ y
🔄 Running project post-create:
  echo 'test command'
test command
-✅ Created new worktree for test-approve from main at [REPO]/repo.test-approve
+✅ Created worktree test-approve based off main @ [REPO]/repo.test-approve
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index e85ae71f6..f112196df 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -10,5 +10,5 @@ n
  echo 'test command'
❓ Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
-✅ Created new worktree for test-decline from main at [REPO]/repo.test-decline
+✅ Created worktree test-decline based off main @ [REPO]/repo.test-decline
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 132c64e82..5330098ff 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -20,5 +20,5 @@ y
🔄 Running project post-create third:
  echo 'Third command'
Third command
-✅ Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
+✅ Created worktree test-mixed-accept based off main @ [REPO]/repo.test-mixed-accept
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 5c892b033..9af275f68 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -12,5 +12,5 @@ n
  echo 'Third command'
❓ Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
-✅ Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
+✅ Created worktree test-mixed-decline based off main @ [REPO]/repo.test-mixed-decline
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 98d454f9c..8d1166bc5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -22,5 +22,5 @@ y
🔄 Running project post-create third:
  echo 'Third command'
Third command
-✅ Created new worktree for test-multi from main at [REPO]/repo.test-multi
+✅ Created worktree test-multi based off main @ [REPO]/repo.test-multi
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 3edb6c96a..b34da60e6 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -22,5 +22,5 @@ y
🔄 Running project post-create test:
  echo 'Running tests...'
Running tests...
-✅ Created new worktree for test-named from main at [REPO]/repo.test-named
+✅ Created worktree test-named based off main @ [REPO]/repo.test-named
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index e99923648..f90a05665 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -10,9 +10,9 @@ y
  echo 'test command'
❓ Allow and remember? [y/N]
🟡 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
-💡 Approval will be requested again next time.
+💡 Approval will be requested again next time
🔄 Running project post-create:
  echo 'test command'
test command
-✅ Created new worktree for test-permission from main at [REPO]/repo.test-permission
+✅ Created worktree test-permission based off main @ [REPO]/repo.test-permission
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index 9edd43cb5..5f54a0249 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
+✅ Created worktree bash-test based off main @ [TMPDIR]/repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index 7933b3270..37349a2e4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
+✅ Created worktree fish-multiline based off main @ [TMPDIR]/repo.fish-multiline
🔄 Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index dcb73b8d5..4983f7434 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
+✅ Created worktree fish-minimal based off main @ [TMPDIR]/repo.fish-minimal
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index aaedd2370..3659fa8d9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
+✅ Created worktree fish-bg based off main @ [TMPDIR]/repo.fish-bg
🔄 Running project post-start:
  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index 598c5cecf..87c41d59d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -7,6 +7,6 @@ expression: output.normalized()
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
-✅ Created new worktree for feature-x from main at [TMPDIR]/repo.feature-x
+✅ Created worktree feature-x based off main @ [TMPDIR]/repo.feature-x
🔄 Running project post-start dev:
  uv run dev
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index 1dd78f22e..a4ea45be9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
+✅ Created worktree fix-auth based off main @ [TMPDIR]/repo.fix-auth
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
index a00343b8a..5630e1750 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Switched to worktree for feature-api at [TMPDIR]/repo.feature-api
+✅ Switched to feature-api @ [TMPDIR]/repo.feature-api
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 49a0583f6..6ae8d62e3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature from main at [TMPDIR]/repo.feature
+✅ Created worktree feature based off main @ [TMPDIR]/repo.feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index f6b59740d..9e68d4fbe 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
+✅ Created worktree test-exec based off main @ [TMPDIR]/repo.test-exec
🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index f6b59740d..9e68d4fbe 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
+✅ Created worktree test-exec based off main @ [TMPDIR]/repo.test-exec
🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 1ba35ba38..e06137389 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -8,7 +8,7 @@ Installing dependencies...
🔄 Running project post-create build:
  echo 'Building project...'
Building project...
-✅ Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
+✅ Created worktree feature-hooks based off main @ [TMPDIR]/repo.feature-hooks
🔄 Running project post-start server:
  echo 'Starting dev server on port 3000'
🔄 Running project post-start watch:
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index c259856b2..f72bc5b0e 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
+✅ Created worktree feature-with-hooks based off main @ [TMPDIR]/repo.feature-with-hooks
🔄 Running project post-start:
  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index f11476a3a..5311c7637 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
+✅ Created worktree feature-bg based off main @ [TMPDIR]/repo.feature-bg
🔄 Running project post-start:
  echo 'background task'
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 7435af477..5b03153a1 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'approved' > output.txt
-✅ Created new worktree for test-approved from main at [REPO].test-approved
+✅ Created worktree test-approved based off main @ [REPO].test-approved
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
index 2910f661c..3bdc78e19 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
@@ -28,5 +28,5 @@ exit_code: 0
🔄 Running project post-create:
  echo 'test command'
test command
-✅ Created new worktree for test-force-tty from main at [REPO].test-force-tty
+✅ Created worktree test-force-tty based off main @ [REPO].test-force-tty
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index 9520a818a..9164ac179 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
@@ -27,5 +27,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'test command' > output.txt
-✅ Created new worktree for test-force from main at [REPO].test-force
+✅ Created worktree test-force based off main @ [REPO].test-force
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index 5ccb9d88a..4ef43508d 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -25,4 +25,4 @@ exit_code: 0
@ main ^ ./repo.main 6c3da842 1d Initial commit on main
+ feature ⚑↑ ↑1 ./repo.feature 72413a3b 1d Work on feature
-⚪ Showing 2 worktrees, 1 ahead
+⚪ Showing 2 worktrees; 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
index 0fb1a6ee7..0a3f2d90b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
@@ -45,8 +45,8 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
⚪ Running diagnostic checks...
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
index 6b5c5f838..334a1904d 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
@@ -41,8 +41,8 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
⚪ Running diagnostic checks...
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
index 871f55138..2b6c99617 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
@@ -40,5 +40,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
index 2c492946c..bdedf6725 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
@@ -33,5 +33,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
index 84c32e4aa..951962fa8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
@@ -40,8 +40,8 @@ exit_code: 0
⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
⚪ Skipped fish; ~/.config/fish/conf.d not found
-💡 wt config shell install enables shell integration
+💡 Run wt config shell install to enable shell integration
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
index caa512b73..fdb3e4c52 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
@@ -42,5 +42,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
index fd5baff49..ff66e5665 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
@@ -44,5 +44,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
index ac46f200d..b199e1982 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
@@ -46,5 +46,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
index 61dcf0c4d..ab7f50b4a 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
@@ -41,5 +41,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
index d0da06b9e..c1c936bd2 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
@@ -43,5 +43,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap
index bbf9d9380..94a14a565 100644
--- a/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap
@@ -25,4 +25,4 @@ exit_code: 0
Set-Location '[PATH]'
----- stderr -----
-✅ Switched to worktree for feature at [REPO].feature
+✅ Switched to feature @ [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
index 21e7081c8..73bdb2d10 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
@@ -41,5 +41,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 57064f33d..5c615771b 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -27,4 +27,4 @@ exit_code: 0
@ main ^ . b834638e 1d Initial commit
branch-only /_ b834638e 1d Initial commit
-⚪ Showing 1 worktrees, 1 branches
+⚪ Showing 1 worktree, 1 branch
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 3d53361cf..1b4200de1 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
+ fix ? _ 💬 ./repo.fix b834638e 1d Initial commit
-⚪ Showing 4 worktrees, 2 with changes, 2 ahead
+⚪ Showing 4 worktrees; 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 5679fe758..9a0d22bd3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -29,4 +29,4 @@ exit_code: 0
+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
-⚪ Showing 5 worktrees, 4 ahead
+⚪ Showing 5 worktrees; 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index cf330744c..08a8e48b9 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -27,4 +27,4 @@ exit_code: 0
@ main ^⇡ ./repo ⇡1 85ed6d3d 1d Main advances
+ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
-⚪ Showing 2 worktrees, 1 with changes, 1 ahead
+⚪ Showing 2 worktrees; 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index bf457b00d..933591335 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -27,4 +27,4 @@ exit_code: 0
@ main ^ ./repo b7c14ce1 1d Main conflicting changes
+ feature +!?✘ 🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
-⚪ Showing 2 worktrees, 1 with changes
+⚪ Showing 2 worktrees; 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index 7a3bb67fa..044883804 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -26,4 +26,4 @@ exit_code: 0
@ main ^ ./repo b834638e 1d Initial commit
+ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d Add files
-⚪ Showing 2 worktrees, 1 with changes, 1 ahead
+⚪ Showing 2 worktrees; 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
index 64fcdfc7b..af247fd9a 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -27,4 +27,4 @@ exit_code: 0
^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
-⚪ Showing 3 worktrees, 1 with changes, 2 ahead
+⚪ Showing 3 worktrees; 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index c2af730d1..71c991e29 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -31,4 +31,4 @@ exit_code: 0
exp /↕ ↑2 ↓1 +137 32936618 2d
wip /↕ ↑1 ↓1 +33 6844b101 3d
-⚪ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden
+⚪ Showing 3 worktrees, 2 branches; 1 with changes, 4 ahead; 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
index 9c2843e18..bd2ab3f95 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
@@ -28,4 +28,4 @@ exit_code: 0
^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
-⚪ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
+⚪ Showing 3 worktrees; 1 with changes, 2 ahead; 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index a6ebe72f4..4005bb43d 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d Initial content
-⚪ Showing 4 worktrees, 1 with changes, 3 ahead
+⚪ Showing 4 worktrees; 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index 2f3480350..6ae297b1b 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -29,4 +29,4 @@ exit_code: 0
+ feature-a ? _ ./repo.feature-a b834638e 1d Initial commit
+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d Test commit
-⚪ Showing 3 worktrees, 1 ahead
+⚪ Showing 3 worktrees; 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index 5e85060cc..f8100766f 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -30,4 +30,4 @@ exit_code: 0
+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
-⚪ Showing 5 worktrees, 4 ahead
+⚪ Showing 5 worktrees; 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index 3df6798f0..945097b04 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -29,4 +29,4 @@ exit_code: 0
+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 2fff52c2 1d Ahead commit
+ in-sync _| ./repo.in-sync | 6c3da842 1d Initial commit on main
-⚪ Showing 3 worktrees, 1 ahead
+⚪ Showing 3 worktrees; 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index ec50436e7..b5e2e0425 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -29,4 +29,4 @@ exit_code: 0
branch-beta /_ b834638e 1d Initial commit
branch-gamma /_ b834638e 1d Initial commit
-⚪ Showing 1 worktrees, 3 branches
+⚪ Showing 1 worktree, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index c20ff157d..02718a1ad 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -31,4 +31,4 @@ exit_code: 0
origin/remote-only-1 /_ b834638e 1d Initial commit
origin/remote-only-2 /_ b834638e 1d Initial commit
-⚪ Showing 1 worktrees, 2 branches, 2 remote branches
+⚪ Showing 1 worktree, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 865ee7241..44f2ab6e7 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
origin/remote-only /_ b834638e 1d Initial commit
-⚪ Showing 2 worktrees, 1 remote branches
+⚪ Showing 2 worktrees, 1 remote branch
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index 229a522db..0af7d63d4 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -28,4 +28,4 @@ exit_code: 0
origin/remote-feature-1 /_ b834638e 1d Initial commit
origin/remote-feature-2 /_ b834638e 1d Initial commit
-⚪ Showing 1 worktrees, 2 remote branches
+⚪ Showing 1 worktree, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 4652bdbd2..5b018cb34 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -33,4 +33,4 @@ exit_code: 0
+ in-sync _| ./repo.in-sync | 6c3da842 1d Initial commit on main
+ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
-⚪ Showing 6 worktrees, 2 ahead
+⚪ Showing 6 worktrees; 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
index c72cf83ec..4bea5777c 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
+ wip-docs ? _ ./repo.wip-docs b834638e 1d Initial commit
-⚪ Showing 4 worktrees, 2 ahead
+⚪ Showing 4 worktrees; 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index 3aa2d18f9..77ecbf746 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -26,4 +26,4 @@ exit_code: 0
@ main ^ ./repo b834638e 1d Initial commit
+ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
-⚪ Showing 2 worktrees, 1 with changes
+⚪ Showing 2 worktrees; 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index 95f5cfac9..c6f88038c 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -27,4 +27,4 @@ exit_code: 0
+ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
+ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
-⚪ Showing 3 worktrees, 2 with changes
+⚪ Showing 3 worktrees; 2 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index c3be9fa36..52bcc0620 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -6,6 +6,7 @@ info:
- list
- "--branches"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -30,4 +31,4 @@ exit_code: 0
@ main ^ . b834638e 1d Initial commit
feature /_ b834638e 1d Initial commit
-⚪ Showing 1 worktrees, 1 branches
+⚪ Showing 1 worktree, 1 branch
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 928991ee9..64802d4d3 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
@@ -31,7 +31,7 @@ exit_code: 0
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
-✅ Created new worktree for feature-x from main at [REPO].feature-x
+✅ Created worktree feature-x based off main @ [REPO].feature-x
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start dev:
  uv run dev
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 8faef25ce..a6f319245 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
@@ -24,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for fix-auth from main at [REPO].fix-auth
+✅ Created worktree fix-auth based off main @ [REPO].fix-auth
💡 Run wt config shell install to enable automatic cd
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 cd8aff18d..833563138 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
@@ -28,7 +28,7 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'Setup done' > setup.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start server:
  sleep 0.05 && echo 'Server running' > server.txt
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 d6f91413b..8390a1cfd 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
@@ -28,7 +28,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
🔄 Running project post-start:
  echo 'Background task' > background.txt
🔄 Executing (--execute):
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 7c013a5e4..1d6ad6a0d 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
@@ -29,5 +29,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'Default: main' > default.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 a248eddfa..7c26a3e91 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
@@ -29,5 +29,5 @@ exit_code: 0
🔄 Running project post-create:
  exit 1
🟡 Command failed: exit status: 1
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 21d4c3446..25f0841fe 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
@@ -35,5 +35,5 @@ exit_code: 0
  echo 'Remote: origin' >> git_vars.txt
🔄 Running project post-create worktree_name:
  echo 'Worktree Name: repo.feature' >> git_vars.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index 49812c37a..daf9ae377 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -32,5 +32,5 @@ exit_code: 0
  else
  echo 'File exists' > result.txt
  fi
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 6607debbd..c805a7bb6 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
@@ -32,5 +32,5 @@ exit_code: 0
🔄 Running project post-create setup:
  echo 'Running setup'
Running setup
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 a8490f1d3..72f709921 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
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 57ba53111..115c4efbc 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
@@ -29,5 +29,5 @@ exit_code: 0
🔄 Running project post-create:
  echo 'Setup complete'
Setup complete
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index 63ab4e466..90b232b0d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -34,5 +34,5 @@ exit_code: 0
  echo 'Worktree: [REPO].feature-test' >> info.txt
🔄 Running project post-create root:
  echo 'Root: [REPO]' >> info.txt
-✅ Created new worktree for feature/test from main at [REPO].feature-test
+✅ Created worktree feature/test based off main @ [REPO].feature-test
💡 Run wt config shell install to enable automatic cd
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 48efaacfb..6540a047d 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
@@ -29,5 +29,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'Upstream: ' > upstream.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 2a5cc04ab..f2f72de42 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'line1
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 ede735be5..12011478b 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'POST-START-RAN' > post_start_marker.txt
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 afdaec908..c595e48f2 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'unclosed quote
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 ff922d1dd..6f63c4aa0 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'stdout output' && echo 'stderr output' >&2
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index 346e60f75..4dbb8455b 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'first line' > multiline.txt
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 ccf6d4624..ffe7df747 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start task1:
  echo 'Task 1 running' > task1.txt
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 ff09fe59e..f07df6770 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start task1:
  echo 'TASK1_OUTPUT'
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 cc86c3172..2c9af19a6 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  sleep 0.1 && echo 'Background task done' > background.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
index e7cd1946c..ae4db0471 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
+🟡 Worktree for feature at [REPO].feature; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
index 5583dc291..2ae624740 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
@@ -24,4 +24,4 @@ exit_code: 0
----- stderr -----
🔄 Removing feature-unmerged worktree in background; retaining unmerged branch
-💡 wt remove -D deletes unmerged branches
+💡 Use wt remove -D to delete unmerged branches
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
index ca2cae1a3..9af287f20 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-unmerged
⚪ Branch feature-unmerged retained; has unmerged changes
-💡 wt remove -D deletes unmerged branches
+💡 Use wt remove -D to delete unmerged branches
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index 27ef82ad9..a6f45a321 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ no-changes _ ./repo.no-changes b834638e 1d Initial commit
+ with-changes ! +1 -1 ./repo.with-changes b834638e 1d Initial commit
-⚪ Showing 4 worktrees, 1 with changes
+⚪ Showing 4 worktrees; 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index b89f6ddf4..425670c22 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
@@ -27,4 +27,4 @@ exit_code: 0
+ huge ? _ ./repo.huge b834638e 1d Initial commit
+ tiny ! +1 -1 ./repo.tiny b834638e 1d Initial commit
-⚪ Showing 3 worktrees, 1 with changes
+⚪ Showing 3 worktrees; 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index dbeb85310..e4a6fd121 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ short _ ./repo.short b834638e 1d
+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
-⚪ Showing 4 worktrees, 1 column hidden
+⚪ Showing 4 worktrees; 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index 2f1bb9aa7..5d41975ce 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -28,4 +28,4 @@ exit_code: 0
+ medium _ b834638e 1d Initial commit
+ x _ b834638e 1d Initial commit
-⚪ Showing 4 worktrees, 1 column hidden
+⚪ Showing 4 worktrees; 1 column hidden
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 186059b32..93a5cbb37 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -27,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for new-feature from main at [REPO].new-feature
+✅ Created worktree new-feature based off main @ [REPO].new-feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
index 46ea77adf..e662cba1d 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-a at [REPO].feature-a
+✅ Switched to feature-a @ [REPO].feature-a
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
index 971780a6f..75831d5f1 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for main at [REPO]; cannot cd (no shell integration)
+🟡 Worktree for main at [REPO]; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
index cb0852e81..02fe03524 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
+🟡 Worktree for feature-a at [REPO].feature-a; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap
index dae80143b..f07316a82 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for main at [REPO]; cannot cd (no shell integration)
+🟡 Worktree for main at [REPO]; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
index cb0852e81..02fe03524 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
+🟡 Worktree for feature-a at [REPO].feature-a; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
index aebd20d29..d6b772094 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -26,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 --base flag is only used with --create, ignoring
+🟡 --base is only used with --create; ignoring
⚪ Already on worktree for main at [REPO]
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 16b5acb11..344cb48c5 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature-x from main at [REPO].feature-x
+✅ Created worktree feature-x based off main @ [REPO].feature-x
💡 Run wt config shell install to enable automatic cd
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 7b03803b9..429dc1425 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
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 b889daa6d..e9a7a11f1 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
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -27,5 +28,5 @@ exit_code: 0
----- stderr -----
🟡 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
💡 Use wt switch remote-feature (without --create) to switch to the remote branch
-✅ Created new worktree for remote-feature from main at [REPO].remote-feature
+✅ Created worktree remote-feature based off main @ [REPO].remote-feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
index ee614bcb9..bfe2abbae 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for main at [REPO].main
+✅ Switched to main @ [REPO].main
💡 Run wt config shell install to enable automatic cd
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 fb54913e8..d0cf9685a 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
@@ -28,6 +28,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for file-test from main at [REPO].file-test
+✅ Created worktree file-test based off main @ [REPO].file-test
🔄 Executing (--execute):
  echo 'test content' > test.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 3d0b30c01..471111c5e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -27,6 +27,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for existing-exec at [REPO].existing-exec
+✅ Switched to existing-exec @ [REPO].existing-exec
🔄 Executing (--execute):
  echo 'existing worktree' > existing.txt
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 719f4150d..e67510798 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -28,6 +28,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-✅ Created new worktree for fail-test from main at [REPO].fail-test
+✅ Created worktree fail-test based off main @ [REPO].fail-test
🔄 Executing (--execute):
  exit 1
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 c4c1aca0e..ac9e698bb 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -31,7 +31,7 @@ line2
line3
----- stderr -----
-✅ Created new worktree for multiline-test from main at [REPO].multiline-test
+✅ Created worktree multiline-test based off main @ [REPO].multiline-test
🔄 Executing (--execute):
  echo 'line1'
  echo 'line2'
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 3cbcdd33c..4331eb20b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -29,6 +29,6 @@ exit_code: 0
test output
----- stderr -----
-✅ Created new worktree for exec-test from main at [REPO].exec-test
+✅ Created worktree exec-test based off main @ [REPO].exec-test
🔄 Executing (--execute):
  echo 'test output'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
index 02db36f0b..f938cf4b8 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
+🟡 Worktree for feature-z at [REPO].feature-z; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index bc07e9d2b..bf06acb93 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
@@ -27,4 +27,4 @@ exit_code: 0
cd '[REPO].existing-wt'
----- stderr -----
-✅ Switched to worktree for existing-wt at [REPO].existing-wt
+✅ Switched to existing-wt @ [REPO].existing-wt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
index 97f68f4e5..31559352a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for shell-configured at [REPO].shell-configured
+✅ Switched to shell-configured @ [REPO].shell-configured
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 e880149c6..da85f279f 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
@@ -31,6 +31,6 @@ cd '[REPO].exit-code-test'
exit 42
----- stderr -----
-✅ Created new worktree for exit-code-test from main at [REPO].exit-code-test
+✅ Created worktree exit-code-test based off main @ [REPO].exit-code-test
🔄 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 711193aa8..9d785287e 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
@@ -32,7 +32,7 @@ echo 'doing work'
exit 7
----- stderr -----
-✅ Created new worktree for output-exit-test from main at [REPO].output-exit-test
+✅ Created worktree output-exit-test based off main @ [REPO].output-exit-test
🔄 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 455b00b0c..6ae95cc8a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
@@ -28,4 +28,4 @@ exit_code: 0
cd '[REPO].internal-test'
----- stderr -----
-✅ Created new worktree for internal-test from main at [REPO].internal-test
+✅ Created worktree internal-test based off main @ [REPO].internal-test
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 741a11bbe..563ef7fda 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
@@ -32,7 +32,7 @@ echo 'line1'
echo 'line2'
----- stderr -----
-✅ Created new worktree for exec-internal from main at [REPO].exec-internal
+✅ Created worktree exec-internal based off main @ [REPO].exec-internal
🔄 Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
index 46ea77adf..e662cba1d 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-a at [REPO].feature-a
+✅ Switched to feature-a @ [REPO].feature-a
💡 Run wt config shell install to enable automatic cd
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 6f093c4a8..33eab4158 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
@@ -30,6 +30,6 @@ exit_code: 0
execute command runs
----- stderr -----
-✅ Created new worktree for no-hooks-test from main at [REPO].no-hooks-test
+✅ Created worktree no-hooks-test based off main @ [REPO].no-hooks-test
🔄 Executing (--execute):
  echo 'execute command runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
index 625673e71..468260ba2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
@@ -29,6 +29,6 @@ exit_code: 0
execute still runs
----- stderr -----
-✅ Switched to worktree for existing-no-hooks at [REPO].existing-no-hooks
+✅ Switched to existing-no-hooks @ [REPO].existing-no-hooks
🔄 Executing (--execute):
  echo 'execute still runs'
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 935fa1a11..ed056e1cd 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -26,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for no-post-start from main at [REPO].no-post-start
+✅ Created worktree no-post-start based off main @ [REPO].no-post-start
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
index 9fbc9420c..e332da541 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -27,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for force-no-hooks from main at [REPO].force-no-hooks
+✅ Created worktree force-no-hooks based off main @ [REPO].force-no-hooks
💡 Run wt config shell install to enable automatic cd
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 1f0face7e..e3d9c0839 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
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature-from-main from main at [REPO].feature-from-main
+✅ Created worktree feature-from-main based off main @ [REPO].feature-from-main
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap
index 04b250e8c..8ab4a0e70 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for branch-a at [REPO].branch-a; cannot cd (no shell integration)
+🟡 Worktree for branch-a at [REPO].branch-a; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap
index e083f2e95..f27c1b6ea 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for branch-a at [REPO].branch-a
+✅ Switched to branch-a @ [REPO].branch-a
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap
index 312d9222c..71fafea18 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for branch-b at [REPO].branch-b
+✅ Switched to branch-b @ [REPO].branch-b
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
index a3f3597c9..592184e30 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -24,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
+🟡 Worktree for existing-branch at [REPO].existing-branch; cd unavailable (no shell integration)
💡 Run wt config shell install to enable automatic cd
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 c5c2a4627..7e8c6b988 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -27,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature-with-base from main at [REPO].feature-with-base
+✅ Created worktree feature-with-base based off main @ [REPO].feature-with-base
💡 Run wt config shell install to enable automatic cd
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 7261d6686..3222d27cb 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 094c55fcd..abf4cae8b 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running user post-start bg:
  echo 'USER_POST_START' > user_bg.txt
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 c636fa50f..629a6cd77 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running user post-create vars:
  echo 'repo=repo branch=feature' > template_vars.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 188909f58..eddbc49c0 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
@@ -28,5 +28,5 @@ exit_code: 0
  echo 'USER_HOOK' >> hook_order.txt
🔄 Running project post-create:
  echo 'PROJECT_HOOK' >> hook_order.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 6387d2978..9cc38a408 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running user post-create setup:
  echo 'NO_APPROVAL_NEEDED' > no_approval.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 4d66babdc..15f01da7a 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running user post-create log:
  echo 'USER_POST_CREATE_RAN' > user_hook_marker.txt
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 c09454092..b1b48a550 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
@@ -27,5 +27,5 @@ exit_code: 0
🔄 Running user post-create failing:
  exit 1
🟡 Command failing failed: exit status: 1
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
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 3ce19570e..a530a9c56 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running user post-start bg:
  echo 'USER_POST_START_RAN' > user_bg_marker.txt
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 7261d6686..3222d27cb 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
+✅ Created worktree feature based off main @ [REPO].feature
💡 Run wt config shell install to enable automatic cd