Skip to content

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

Align user messages with output formatting guidelines (#631)

Maximilian Roosf039f4a6ab72
diff --git a/.claude/rules/cli-output-formatting.md b/.claude/rules/cli-output-formatting.md
index 05d11001b..62ced8666 100644
--- a/.claude/rules/cli-output-formatting.md
+++ b/.claude/rules/cli-output-formatting.md
@@ -255,11 +255,11 @@ each type.
**Hint vs Info:** Hints suggest user action. Info acknowledges what happened.
-| Hint ↳ | Info ○ |
-| ----------------------------- | ------------------------------------- |
-| "Run `wt merge` to continue" | "Already up to date with main" |
-| "Use `--yes` to override" | "Skipping hooks (--no-verify)" |
-| "Branch can be deleted" | "Worktree preserved (main worktree)" |
+| Hint ↳ | Info ○ |
+| ----------------------------------- | ------------------------------------- |
+| "To continue, run `wt merge`" | "Already up to date with main" |
+| "Commit or stash changes first" | "Skipping hooks (--no-verify)" |
+| "Branch can be deleted" | "Worktree preserved (main worktree)" |
**Warning placement:** When something unexpected happens, warn somewhere. Where
depends on the nature of the issue:
@@ -313,8 +313,8 @@ log::warn!("Failed to parse CI JSON for {}: {}", branch, e);
return None;
```
-**Command suggestions in hints:** Use "To X, run Y" pattern. End with the
-command for easy copying:
+**Command suggestions in hints:** When a hint includes a runnable command, use
+"To X, run Y" pattern. End with the command for easy copying:
```rust
// GOOD - command at end for easy copying
@@ -322,7 +322,7 @@ command for easy copying:
"To rebase onto main, run wt step rebase or wt merge"
// GOOD - recovery command after shadowing a remote branch
-"To switch to the remote branch, remove this added branch and then run without --create: wt remove feature && wt switch feature"
+"To switch to the remote branch, delete this branch and run without --create: wt remove feature && wt switch feature"
// BAD - command without context
"wt remove feature -D deletes unmerged branches"
@@ -331,6 +331,18 @@ command for easy copying:
"Run wt switch feature (without --create) to switch to the remote branch"
```
+For general action guidance without a specific command, direct imperatives are
+clearer:
+
+```rust
+// GOOD - direct imperative for general guidance
+"Commit or stash changes first"
+"Run from inside a worktree, or specify a branch name"
+
+// VERBOSE - "To proceed" adds nothing
+"To proceed, commit or stash changes first"
+```
+
**Multiple suggestions in one hint:** When combining suggestions with semicolons,
put the more commonly needed command last for easy terminal copying:
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
index 8e482c414..be66adfe0 100644
--- a/src/commands/commit.rs
+++ b/src/commands/commit.rs
@@ -69,7 +69,7 @@ impl<'a> CommitGenerator<'a> {
pub fn emit_hint_if_needed(&self) -> anyhow::Result<()> {
if !self.config.is_configured() {
crate::output::print(hint_message(cformat!(
- "Using fallback commit message. Run <bright-black>wt config --help</> for LLM setup guide"
+ "Using fallback commit message. For LLM setup guide, run <bright-black>wt config --help</>"
)))?;
}
Ok(())
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rs
index a17ed9c08..f188dc801 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -1816,7 +1816,7 @@ pub fn collect(
let msg =
cformat!("Configured default branch <bold>{configured}</> does not exist locally");
crate::output::print(warning_message(msg))?;
- let hint = cformat!("Run <bright-black>wt config state default-branch clear</> to reset");
+ let hint = cformat!("To reset, run <bright-black>wt config state default-branch clear</>");
crate::output::print(worktrunk::styling::hint_message(hint))?;
}
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index eb3c3cce7..dc9f3bbca 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -521,7 +521,7 @@ pub fn plan_switch(
let remove_cmd = suggest_command("remove", &[&resolved_branch], &[]);
let switch_cmd = suggest_command("switch", &[&resolved_branch], &[]);
crate::output::print(hint_message(cformat!(
- "To switch to the remote branch, delete this branch and switch without --create: <bright-black>{remove_cmd} && {switch_cmd}</>"
+ "To switch to the remote branch, delete this branch and run without <bright-black>--create</>: <bright-black>{remove_cmd} && {switch_cmd}</>"
)))?;
}
}
@@ -614,7 +614,7 @@ pub fn plan_switch(
"Configured default branch <bold>{configured}</> does not exist locally"
)))?;
crate::output::print(hint_message(cformat!(
- "Run <bright-black>wt config state default-branch clear</> to reset"
+ "To reset, run <bright-black>wt config state default-branch clear</>"
)))?;
}
diff --git a/src/config/deprecation.rs b/src/config/deprecation.rs
index 690aa0d0e..9a8c938b1 100644
--- a/src/config/deprecation.rs
+++ b/src/config/deprecation.rs
@@ -218,7 +218,7 @@ pub fn check_and_migrate(
eprintln!(
"{}",
hint_message(cformat!(
- "to regenerate, rerun after <bright-black>wt config state hints clear {}</>",
+ "To regenerate, rerun after <bright-black>wt config state hints clear {}</>",
HINT_DEPRECATED_PROJECT_CONFIG
))
);
diff --git a/src/git/error.rs b/src/git/error.rs
index ece1cbae6..c3d1f7808 100644
--- a/src/git/error.rs
+++ b/src/git/error.rs
@@ -199,7 +199,7 @@ impl std::fmt::Display for GitError {
"{}\n{}",
error_message(cformat!("Branch <bold>{branch}</> already exists")),
hint_message(cformat!(
- "To switch to the existing branch, remove <bright-black>--create</>; run <bright-black>{switch_cmd}</>"
+ "To switch to the existing branch, remove <bright-black>--create</> and run <bright-black>{switch_cmd}</>"
))
)
}
@@ -227,7 +227,7 @@ impl std::fmt::Display for GitError {
"{}\n{}",
error_message(&message),
hint_message(cformat!(
- "Run this command from inside a worktree, or specify a branch name"
+ "Run from inside a worktree, or specify a branch name"
))
)
}
@@ -466,7 +466,7 @@ impl std::fmt::Display for GitError {
"{}\n{}",
error_message(cformat!("Branch not rebased onto <bold>{target_branch}</>")),
hint_message(cformat!(
- "Remove <bright-black>--no-rebase</>; or to rebase first, run <bright-black>{rebase_cmd}</>"
+ "To rebase first, run <bright-black>{rebase_cmd}</>; or remove <bright-black>--no-rebase</>"
))
)
}
@@ -736,7 +736,7 @@ mod tests {
let downcast = err.downcast_ref::<GitError>().expect("Should downcast");
assert_snapshot!(downcast.to_string(), @"
✗ Branch main already exists
- ↳ To switch to the existing branch, remove --create; run wt switch main
+ ↳ To switch to the existing branch, remove --create and run wt switch main
");
}
diff --git a/src/git/repository/worktrees.rs b/src/git/repository/worktrees.rs
index 44a1763f6..fe016591f 100644
--- a/src/git/repository/worktrees.rs
+++ b/src/git/repository/worktrees.rs
@@ -2,6 +2,7 @@
use std::path::{Path, PathBuf};
+use color_print::cformat;
use normalize_path::NormalizePath;
use super::{GitError, Repository, ResolvedWorktree, WorktreeInfo};
@@ -132,16 +133,18 @@ impl Repository {
// Read from worktrunk.history (recorded by wt switch operations)
self.get_switch_previous().ok_or_else(|| {
GitError::Other {
- message:
- "No previous branch found in history. Use 'wt list' to see available worktrees."
- .into(),
+ message: cformat!(
+ "No previous branch found in history. Run <bright-black>wt list</> to see available worktrees."
+ ),
}
.into()
})
}
"^" => self.default_branch().ok_or_else(|| {
GitError::Other {
- message: "Cannot determine default branch. Specify target explicitly or run 'wt config state default-branch set <branch>'.".into(),
+ message: cformat!(
+ "Cannot determine default branch. Specify target explicitly or run <bright-black>wt config state default-branch set <bold>BRANCH</></>"
+ ),
}
.into()
}),
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 21c863cd7..43fdea336 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -395,7 +395,7 @@ pub fn handle_switch_output(
.unwrap_or(false);
if !has_custom_config && !repo.has_shown_hint("worktree-path") {
let hint = hint_message(cformat!(
- "Customize worktree locations: <bright-black>wt config create</>"
+ "To customize worktree locations, run <bright-black>wt config create</>"
));
super::print(hint)?;
let _ = repo.mark_hint_shown("worktree-path");
@@ -1089,6 +1089,6 @@ mod tests {
fn test_git_subcommand_warning() {
let warning = git_subcommand_warning();
assert!(warning.contains("git-wt"));
- assert!(warning.contains("shell function"));
+ assert!(warning.contains("with the"));
}
}
diff --git a/src/output/shell_integration.rs b/src/output/shell_integration.rs
index c3fa97d07..cdb76c652 100644
--- a/src/output/shell_integration.rs
+++ b/src/output/shell_integration.rs
@@ -88,7 +88,9 @@ fn shell_integration_unsupported_shell(shell_path: &str) -> String {
/// Warning message when running as git subcommand (cd cannot work).
pub(crate) fn git_subcommand_warning() -> String {
- cformat!("Use <bright-black>git-wt</> directly (via shell function) for automatic cd")
+ cformat!(
+ "For automatic cd, invoke directly (with the <bright-black>-</>): <bright-black>git-wt</>"
+ )
}
/// Compute the shell warning reason for display in messages.
@@ -429,7 +431,7 @@ mod tests {
fn test_git_subcommand_warning() {
let warning = git_subcommand_warning();
assert!(warning.contains("git-wt"));
- assert!(warning.contains("shell function"));
+ assert!(warning.contains("with the"));
}
#[test]
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap
index 763b9131a..7009724da 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap
@@ -3,4 +3,4 @@ source: tests/integration_tests/git_error_display.rs
expression: err.to_string()
---
✗ Branch feature already exists
-↳ To switch to the existing branch, remove --create; run wt switch feature
+↳ To switch to the existing branch, remove --create and run wt switch feature
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index 88481f15d..847aca5b1 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -13,5 +13,5 @@ y
  echo 'test command'
test command
✓ Created branch test-approve from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index 1a8af0d9c..000e93835 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -11,5 +11,5 @@ n
❯ Allow and remember? [y/N]
○ Commands declined, continuing worktree creation
✓ Created branch test-decline from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 31f67e77f..8b4ed08d9 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -21,5 +21,5 @@ y
  echo 'Third command'
Third command
✓ Created branch test-mixed-accept from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 04bd31f4e..b787b519e 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -13,5 +13,5 @@ n
❯ Allow and remember? [y/N]
○ Commands declined, continuing worktree creation
✓ Created branch test-mixed-decline from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index fc4570295..51256c49f 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -23,5 +23,5 @@ y
  echo 'Third command'
Third command
✓ Created branch test-multi from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 4e0a491f6..fd6ae39a2 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -23,5 +23,5 @@ y
  echo 'Running tests...'
Running tests...
✓ Created branch test-named from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 20bf012c5..0c533bfd5 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -15,5 +15,5 @@ y
  echo 'test command'
test command
✓ Created branch test-permission from main and worktree @ _REPO_/repo.BRANCH
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — ran [BIN]; shell integration wraps wt
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 5cfa659ba..214612199 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -36,6 +36,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.test-approved:
  echo 'approved' > output.txt
✓ Created branch test-approved from main and worktree @ _REPO_.test-approved
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap
index e90677409..c1d0b0a4b 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap
@@ -38,6 +38,6 @@ exit_code: 0
  echo 'test command'
test command
✓ Created branch test-yes-tty from main and worktree @ _REPO_.test-yes-tty
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap
index 50d2fef0b..a029726e0 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap
@@ -37,6 +37,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.test-yes:
  echo 'test command' > output.txt
✓ Created branch test-yes from main and worktree @ _REPO_.test-yes
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap
index a2a945bd8..149eec338 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -36,4 +36,4 @@ exit_code: 0
----- stderr -----
▲ Project config uses deprecated template variables: main_worktree → repo
-↳ to regenerate, rerun after wt config state hints clear deprecated-project-config
+↳ To regenerate, rerun after wt config state hints clear deprecated-project-config
diff --git a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
index 9dac7db81..45009fe23 100644
--- a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
@@ -37,4 +37,4 @@ exit_code: 0
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
-↳ Run wt config state default-branch clear to reset
+↳ To reset, run wt config state default-branch clear
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
index 1d9953a60..bff01a801 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
@@ -36,4 +36,4 @@ exit_code: 0
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
-↳ Run wt config state default-branch clear to reset
+↳ To reset, run wt config state default-branch clear
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap
index 4786a7a72..111083c75 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -39,4 +40,4 @@ exit_code: 0
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — ran git wt; running through git prevents cd
-↳ Use git-wt directly (via shell function) for automatic cd
+↳ For automatic cd, invoke directly (with the -): git-wt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 6c5b8d46a..8f033ada4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -34,7 +35,7 @@ exit_code: 0
◎ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
↳ Backup created @ 183cc8b
◎ Generating squash commit message...
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Squash commits from main
 
  Combined commits:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 88701313d..d94d24d15 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -34,7 +35,7 @@ exit_code: 0
▲ Auto-staging 1 untracked path:
  dirty.txt
◎ Committing changes with default message... (1 file, +1, no squashing needed)
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Changes to dirty.txt
✓ Committed changes @ [HASH]
◎ Merging 1 commit to main @ [HASH] (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes_in_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes_in_target.snap
index e9bcc5cd6..b4f9ac4d6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes_in_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes_in_target.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_with_no_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_with_no_commit.snap
index ebd64c3d5..4ba130fb6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_with_no_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_with_no_commit.snap
@@ -10,7 +10,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -23,6 +23,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_with_dirty_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_with_dirty_tree.snap
index 25f6b5e18..58fa2e63a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_with_dirty_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_with_dirty_tree.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 5b07807d1..caf7670d4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -34,7 +35,7 @@ exit_code: 0
▲ Auto-staging 1 untracked path:
  newfile.txt
◎ Committing changes with default message... (1 file, +1, no squashing needed)
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Changes to newfile.txt
✓ Committed changes @ [HASH]
◎ Merging 1 commit to main @ [HASH] (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_not_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_not_rebased.snap
index f38dc6881..c8cd67eab 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_not_rebased.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_not_rebased.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,4 +34,4 @@ exit_code: 1
----- stderr -----
✗ Branch not rebased onto main
-↳ Remove --no-rebase; or to rebase first, run wt step rebase main
+↳ To rebase first, run wt step rebase main; or remove --no-rebase
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 67ae94d32..c24171f88 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -38,7 +39,7 @@ exit_code: 0
  echo 'Pre-commit check passed'
Pre-commit check passed
◎ Committing changes with default message... (1 file, +1, no squashing needed)
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Changes to feature.txt
✓ Committed changes @ [HASH]
◎ Merging 1 commit to main @ [HASH] (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 5af5f8ac6..1c2d21142 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,7 +34,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 3 commits into a single commit (3 files, +3)...
◎ Generating squash commit message...
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Squash commits from main
 
  Combined commits:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 65ff15a2f..203257edd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,7 +34,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 3 commits into a single commit...
◎ Generating squash commit message...
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Squash commits from main
 
  Combined commits:
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 596fe2706..91cd40d12 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
@@ -34,6 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch fix-auth from main and worktree @ _REPO_.fix-auth
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index 02d28d4ba..d4da79666 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -36,7 +36,7 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'Setup done' > setup.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:server @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 92ded7208..9e5ff626c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -36,7 +36,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'Execute flag' > execute.txt @ _REPO_.feature, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_base_variables.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_base_variables.snap
index 858fcc46e..d8e97442f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_base_variables.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_base_variables.snap
@@ -40,6 +40,6 @@ exit_code: 0
◎ Running post-create project:base_path @ _REPO_.feature:
  echo 'Base Path: _REPO_' >> base_info.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
index 68edeb47d..5e7ecda79 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
@@ -37,6 +37,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'Default: main' > default.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index fe7eeb885..0b391b909 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -37,6 +37,6 @@ exit_code: 0
  exit 1
✗ Command failed: exit status: 1
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
index 8b09d0f42..1eb93a950 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
@@ -43,6 +43,6 @@ exit_code: 0
◎ Running post-create project:worktree_name @ _REPO_.feature:
  echo 'Worktree Name: repo.feature' >> git_vars.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index 93270b0c1..7715c77d5 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -40,6 +40,6 @@ exit_code: 0
  echo 'Running setup'
Running setup
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
index 4400599cb..44fa0a54f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
@@ -34,6 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 5c9946475..30876b0a4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -37,6 +37,6 @@ exit_code: 0
  echo 'Setup complete'
Setup complete
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
index 5f06fa96a..cb00ec6d6 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
@@ -37,6 +37,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'Upstream: ' > upstream.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index cce08249e..cf1d6e4ce 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index 55a277fe9..2e442fc41 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index b120b631d..19e21f0eb 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 4c80575e1..eaf484f1f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index cb0641722..f5addfddf 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:task1 @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index 1a1a6ab21..e700a41b2 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project:task1 @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index cf577c24b..f3cb82f99 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start project hook @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
index 64cf42af6..10af3bf01 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap
index a99710241..7ea2ef71f 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap
index 699cf13c6..d4e427613 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -34,4 +34,4 @@ exit_code: 0
----- stderr -----
◎ Removing feature-git-subcmd worktree & branch in background (same commit as main, _)
▲ Cannot change directory — ran git wt; running through git prevents cd
-↳ Use git-wt directly (via shell function) for automatic cd
+↳ For automatic cd, invoke directly (with the -): git-wt
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
index ecdf2e868..d02e04171 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
diff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
index ea16267e9..aa9d42301 100644
--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"
@@ -34,4 +35,4 @@ exit_code: 1
----- stderr -----
✗ Branch __WORKTRUNK_CD__/tmp already exists
-↳ To switch to the existing branch, remove --create; run wt switch __WORKTRUNK_CD__/tmp
+↳ To switch to the existing branch, remove --create and run wt switch __WORKTRUNK_CD__/tmp
diff --git a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap
index b0a2437cb..8f09b49a0 100644
--- a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap
+++ b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_accept.snap
@@ -5,7 +5,7 @@ expression: normalized
y
✓ Created branch feature from main and worktree @ [REPO]/repo.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
❯ Install shell integration? [y/N/?]
diff --git a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap
index f3f8773f6..796b2eaf6 100644
--- a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap
+++ b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_decline.snap
@@ -5,7 +5,7 @@ expression: normalized
n
✓ Created branch feature from main and worktree @ [REPO]/repo.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
❯ Install shell integration? [y/N/?]
diff --git a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap
index d275c3a61..a7e1c9e58 100644
--- a/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap
+++ b/tests/snapshots/integration__integration_tests__shell_integration_prompt__pty_tests__prompt_preview_decline.snap
@@ -6,7 +6,7 @@ expression: normalized
n
✓ Created branch feature from main and worktree @ [REPO]/repo.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
❯ Install shell integration? [y/N/?]
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index 3b8730083..7a9c8df59 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch bash-test from main and worktree @ [TMPDIR]/repo.bash-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
index ff6b4768a..540cf91b0 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✗ Branch existing already exists
-↳ To switch to the existing branch, remove --create; run wt switch existing
+↳ To switch to the existing branch, remove --create and run wt switch existing
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index 7e4adfc61..03a8d5a68 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fish-multiline from main and worktree @ [TMPDIR]/repo.fish-multiline
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index 824a18077..a8b4f3126 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fish-minimal from main and worktree @ [TMPDIR]/repo.fish-minimal
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 267e0a79b..2b253b432 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fish-bg from main and worktree @ [TMPDIR]/repo.fish-bg
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Running post-start project hook:
  echo 'fish background task'
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index dda5f6aeb..38f505552 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -8,6 +8,6 @@ expression: output.normalized()
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
✓ Created branch feature-x from main and worktree @ [TMPDIR]/repo.feature-x
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Running post-start project:dev:
  uv run dev
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index ac5182bc9..47c7d8553 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch fix-auth from main and worktree @ [TMPDIR]/repo.fix-auth
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 68f2e5752..58a392240 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch feature from main and worktree @ [TMPDIR]/repo.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 6f5c023e0..bb43bfd2d 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch test-exec from main and worktree @ [TMPDIR]/repo.test-exec
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
  echo executed
executed
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 6f5c023e0..bb43bfd2d 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch test-exec from main and worktree @ [TMPDIR]/repo.test-exec
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
  echo executed
executed
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 48b49c78c..ef03f3e13 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -9,7 +9,7 @@ Installing dependencies...
  echo 'Building project...'
Building project...
✓ Created branch feature-hooks from main and worktree @ [TMPDIR]/repo.feature-hooks
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Running post-start project:server:
  echo 'Starting dev server on port 3000'
◎ Running post-start project:watch:
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 0527ca1b5..b6d3b7764 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch feature-with-hooks from main and worktree @ [TMPDIR]/repo.feature-with-hooks
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Running post-start project hook:
  echo 'test command executed'
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 9cb10e9c1..d0ad8917f 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
✓ Created branch feature-bg from main and worktree @ [TMPDIR]/repo.feature-bg
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Running post-start project hook:
  echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
index 4feebd73b..44e8ef582 100644
--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch new-feature from main and worktree @ _REPO_.new-feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__switch__switch_as_git_subcommand.snap
index 79d12026f..beecb0a4e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_as_git_subcommand.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_as_git_subcommand.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,4 +34,4 @@ exit_code: 0
----- stderr -----
▲ Worktree for git-subcommand-test @ _REPO_.git-subcommand-test, but cannot change directory — ran git wt; running through git prevents cd
-↳ Use git-wt directly (via shell function) for automatic cd
+↳ For automatic cd, invoke directly (with the -): git-wt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap
index afd6c9eac..5e456f10c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
▲ Moving _REPO_.clobber-ext.txt to _REPO_.clobber-ext.txt.bak.20250102-000000 (--clobber)
✓ Created branch clobber-ext.txt from main and worktree @ _REPO_.clobber-ext.txt
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap
index 27fcc7fff..b418feac6 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
▲ Moving _REPO_.clobber-dir-test to _REPO_.clobber-dir-test.bak.20250102-000000 (--clobber)
✓ Created branch clobber-dir-test from main and worktree @ _REPO_.clobber-dir-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap
index 67e665340..3c9b55f25 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
▲ Moving _REPO_.clobber-file-test to _REPO_.clobber-file-test.bak.20250102-000000 (--clobber)
✓ Created branch clobber-file-test from main and worktree @ _REPO_.clobber-file-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
index 60f548906..94f5b210c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,4 +34,4 @@ exit_code: 1
----- stderr -----
✗ Branch feature-y already exists
-↳ To switch to the existing branch, remove --create; run wt switch feature-y
+↳ To switch to the existing branch, remove --create and run wt switch feature-y
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 10cf5d33a..0e9904e12 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -34,6 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature-x from main and worktree @ _REPO_.feature-x
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index 526c54f27..1a3ff0d9e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
@@ -34,6 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index a680abe5b..78d76894b 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
@@ -34,8 +34,8 @@ exit_code: 0
----- stderr -----
▲ Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
-↳ To switch to the remote branch, delete this branch and switch without --create: wt remove remote-feature && wt switch remote-feature
+↳ To switch to the remote branch, delete this branch and run without --create: wt remove remote-feature && wt switch remote-feature
✓ Created branch remote-feature from main and worktree @ _REPO_.remote-feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_arg_template_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_arg_template_error.snap
index 6d70dab8a..88963cf16 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_arg_template_error.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_arg_template_error.snap
@@ -39,7 +39,7 @@ exit_code: 1
----- stderr -----
✓ Created branch arg-error-test from main and worktree @ _REPO_.arg-error-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo @ _REPO_.arg-error-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
✗ Failed to expand argument template: Template syntax error: syntax error: unexpected end of input, expected end of variable block (in <string>:1)
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 9af3f0bf2..e8841ff0f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -36,7 +36,7 @@ exit_code: 0
----- stderr -----
✓ Created branch file-test from main and worktree @ _REPO_.file-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'test content' > test.txt @ _REPO_.file-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index 86380a077..17a4f4579 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -36,7 +36,7 @@ exit_code: 1
----- stderr -----
✓ Created branch fail-test from main and worktree @ _REPO_.fail-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing exit 1 @ _REPO_.fail-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index 842d68e39..079450c18 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -39,7 +39,7 @@ line3
----- stderr -----
✓ Created branch multiline-test from main and worktree @ _REPO_.multiline-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'line1'
echo 'line2'
echo 'line3' @ _REPO_.multiline-test, but shell directory unchanged — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index bb3704425..2a92956f1 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -37,7 +37,7 @@ test output
----- stderr -----
✓ Created branch exec-test from main and worktree @ _REPO_.exec-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'test output' @ _REPO_.exec-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap
index 503fc161d..6c0e2b229 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap
@@ -39,7 +39,7 @@ base=main
----- stderr -----
✓ Created branch from-main from main and worktree @ _REPO_.from-main
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'base={{ base }}' @ _REPO_.from-main, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap
index a50704e77..980f37df1 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap
@@ -37,7 +37,7 @@ branch=template-test
----- stderr -----
✓ Created branch template-test from main and worktree @ _REPO_.template-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'branch={{ branch }}' @ _REPO_.template-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_error.snap
index 45badf68e..7032256f3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_error.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_error.snap
@@ -36,7 +36,7 @@ exit_code: 1
----- stderr -----
✓ Created branch error-test from main and worktree @ _REPO_.error-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo {{ unclosed @ _REPO_.error-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
✗ Failed to expand --execute template: Template syntax error: syntax error: unexpected end of input, expected end of variable block (in <string>:1)
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_in_args.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_in_args.snap
index 0f186d76c..bdbd1c5cf 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_in_args.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_in_args.snap
@@ -40,7 +40,7 @@ branch=args-test repo=repo
----- stderr -----
✓ Created branch args-test from main and worktree @ _REPO_.args-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo @ _REPO_.args-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap
index d320dcfea..184f30a6f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap
@@ -37,7 +37,7 @@ feat;id
----- stderr -----
✓ Created branch feat;id from main and worktree @ _REPO_.feat;id
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo {{ branch }} @ _REPO_.feat;id, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap
index ffc0f7028..1557b1145 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap
@@ -37,7 +37,7 @@ sanitized=feature-with-slash
----- stderr -----
✓ Created branch feature/with-slash from main and worktree @ _REPO_.feature-with-slash
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'sanitized={{ branch | sanitize }}' @ _REPO_.feature-with-slash, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap
index 05fd56b99..6cfeab24e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap
@@ -37,7 +37,7 @@ path=_REPO_.path-test
----- stderr -----
✓ Created branch path-test from main and worktree @ _REPO_.path-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'path={{ worktree_path }}' @ _REPO_.path-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index a96ce3094..b6ecf9a25 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -37,6 +37,6 @@ exit_code: 0
----- stderr -----
✓ Created branch exit-code-test from main and worktree @ _REPO_.exit-code-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
  exit 42
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index ddce56376..ecae510cc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -37,7 +37,7 @@ exit_code: 0
----- stderr -----
✓ Created branch output-exit-test from main and worktree @ _REPO_.output-exit-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
  echo 'doing work'
  exit 7
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index 8776133f6..5a3533039 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
@@ -35,4 +35,4 @@ exit_code: 0
----- stderr -----
✓ Created branch internal-test from main and worktree @ _REPO_.internal-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 25ff8b989..28c5e3fcc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -37,7 +37,7 @@ exit_code: 0
----- stderr -----
✓ Created branch exec-internal from main and worktree @ _REPO_.exec-internal
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
index 9b8fb3a65..ba1bf95e2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
@@ -38,7 +38,7 @@ execute command runs
----- stderr -----
✓ Created branch no-hooks-test from main and worktree @ _REPO_.no-hooks-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Executing echo 'execute command runs' @ _REPO_.no-hooks-test, but shell directory unchanged — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
index a43aca254..5aa57c070 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
@@ -35,6 +35,6 @@ exit_code: 0
----- stderr -----
✓ Created branch no-post-start from main and worktree @ _REPO_.no-post-start
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap
index 410a47fdc..00a437df7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_yes.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch yes-no-hooks from main and worktree @ _REPO_.yes-no-hooks
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap
index d1019022b..68f7e36b2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_no_path_with_shell_integration.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch post-hook-shell-test from main and worktree @ _REPO_.post-hook-shell-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
◎ Running post-switch project hook:
  echo switched
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap
index 9b1627b0d..faf3aaeae 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_post_hook_path_annotation.snap
@@ -35,7 +35,7 @@ exit_code: 0
----- stderr -----
✓ Created branch post-hook-test from main and worktree @ _REPO_.post-hook-test
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-switch project hook @ _REPO_.post-hook-test:
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap
index 5183a80a4..2327ea113 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,4 +32,4 @@ exit_code: 1
----- stdout -----
----- stderr -----
-✗ No previous branch found in history. Use 'wt list' to see available worktrees.
+✗ No previous branch found in history. Run wt list to see available worktrees.
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 841f7a889..439a33447 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
@@ -34,6 +34,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature-from-main from main and worktree @ _REPO_.feature-from-main
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index 334627748..0be1f7f8e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -36,6 +36,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature-with-base from main and worktree @ _REPO_.feature-with-base
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
index 3beb9bc6e..83a090483 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
@@ -35,6 +35,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
index dab9367e7..d0455d1ed 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start user:bg @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
index d114dda29..cba976903 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
@@ -36,6 +36,6 @@ exit_code: 0
◎ Running post-create user:vars @ _REPO_.feature:
  echo 'repo=repo branch=feature' > template_vars.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
index 0633dc378..b0a4bba52 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
@@ -38,6 +38,6 @@ exit_code: 0
◎ Running post-create project hook @ _REPO_.feature:
  echo 'PROJECT_HOOK' >> hook_order.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
index a0e77ce6a..3620bac24 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
@@ -36,6 +36,6 @@ exit_code: 0
◎ Running post-create user:setup @ _REPO_.feature:
  echo 'NO_APPROVAL_NEEDED' > no_approval.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
index 797e358eb..4e1af5868 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
@@ -36,6 +36,6 @@ exit_code: 0
◎ Running post-create user:log @ _REPO_.feature:
  echo 'USER_POST_CREATE_RAN' > user_hook_marker.txt
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
index c4e6b8bca..cb10d3613 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
@@ -37,6 +37,6 @@ exit_code: 0
  exit 1
✗ Command failing failed: exit status: 1
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
index 4906fbbb4..917935ce3 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
@@ -34,7 +34,7 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-start user:bg @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
index 3beb9bc6e..83a090483 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
@@ -35,6 +35,6 @@ exit_code: 0
----- stderr -----
✓ Created branch feature from main and worktree @ _REPO_.feature
-↳ Customize worktree locations: wt config create
+↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
index a66cb2af4..ececdfb9a 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
@@ -10,7 +10,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -23,6 +23,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -38,7 +39,7 @@ exit_code: 0
◎ Running pre-commit user:lint:
  echo 'USER_PRE_COMMIT_RAN' > user_precommit.txt
◎ Committing changes with default message... (1 file, +1, no squashing needed)
-↳ Using fallback commit message. Run wt config --help for LLM setup guide
+↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Changes to uncommitted.txt
✓ Committed changes @ [HASH]
◎ Merging 1 commit to main @ [HASH] (no rebase needed)