Skip to content

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

refactor(styling): end bash-gutter lines at their content, not a reopened dim (#3056)

Maximilian Roosf2a8cb696d7b
diff --git a/.gitattributes b/.gitattributes
index affb30a8f..6968f82b1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,6 @@ skills/worktrunk/reference/troubleshooting.md linguist-generated=false
docs/static/*.md linguist-generated=true
docs/static/llms.txt linguist-generated=true
docs/static/.well-known/agent-skills/index.json linguist-generated=true
+# Shell templates are embedded into the binary at compile time (askama); a
+# CRLF checkout would leak \r into the shell code Windows-built binaries emit.
+templates/* text eol=lf
diff --git a/src/styling/format.rs b/src/styling/format.rs
index 3d6ccb387..77300d6ec 100644
--- a/src/styling/format.rs
+++ b/src/styling/format.rs
@@ -248,9 +248,11 @@ fn format_bash_with_gutter_impl(content: &str, width_override: Option<usize>) ->
// Normalize line endings: CRLF to LF, and trim trailing newlines.
// Trailing newlines would create spurious blank gutter lines because
// style restoration after newlines produces `\n[DIM]` which becomes
- // its own line when split.
+ // its own line when split. The trim also covers a bare trailing \r:
+ // askama strips a template's final newline, so a CRLF checkout leaves
+ // renders ending in a lone \r that the pair replacement can't catch.
let content = content.replace("\r\n", "\n");
- let content = content.trim_end_matches('\n');
+ let content = content.trim_end_matches(['\n', '\r']);
// Replace Jinja template delimiters with identifier placeholders before parsing.
// Tree-sitter can't parse `{{` and `}}` (especially when split across lines),
@@ -398,9 +400,21 @@ fn format_bash_with_gutter_impl(content: &str, width_override: Option<usize>) ->
}
}
- // Phase 2: Split into lines, wrap each, add gutters
+ // Phase 2: Split into lines, wrap each, add gutters.
+ //
+ // Phase 1 reopens dim after every highlight close (and at line starts) to
+ // restore the base style for following text. At end of line that reopened
+ // dim has nothing left to style — strip it so lines end at their content
+ // and the closing reset, with no dangling SGR open at the line break.
+ let reopened_dim = format!("{reset}{dim}");
+ let dim_open = format!("{dim}");
styled
.lines()
+ .map(|line| {
+ line.strip_suffix(reopened_dim.as_str())
+ .or_else(|| line.strip_suffix(dim_open.as_str()))
+ .unwrap_or(line)
+ })
.flat_map(|line| wrap_styled_text(line, available_width))
.map(|wrapped| format!("{gutter} {gutter:#} {wrapped}{reset}"))
.collect::<Vec<_>>()
@@ -567,7 +581,7 @@ mod tests {
);
assert_snapshot!(
format_bash_with_gutter_at_width("npm install && cargo build --release", 100),
- @"  npm install && cargo build --release"
+ @"  npm install && cargo build --release"
);
}
@@ -696,4 +710,23 @@ mod tests {
assert!(stripped.contains("WTO"), "{stripped}");
assert!(!stripped.contains("{{"), "{stripped}");
}
+ /// A bare trailing \r is normalized away rather than parsed as content.
+ ///
+ /// Askama strips a template's final newline; on a CRLF checkout (Windows
+ /// builds without eol control) that leaves the render ending in a lone \r,
+ /// which tree-sitter would otherwise emit as a trailing token that defeats
+ /// the end-of-line SGR cleanup below.
+ #[test]
+ #[cfg(feature = "syntax-highlighting")]
+ fn test_trailing_cr_is_normalized() {
+ assert_eq!(
+ format_bash_with_gutter_at_width("echo hello\r", 80),
+ format_bash_with_gutter_at_width("echo hello", 80),
+ );
+ // The failure shape: last line ends in a highlighted token.
+ assert_eq!(
+ format_bash_with_gutter_at_width("function wt\n wt $argv\nend\r", 80),
+ format_bash_with_gutter_at_width("function wt\n wt $argv\nend", 80),
+ );
+ }
}
diff --git a/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap b/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap
index 653681702..8b96555c5 100644
--- a/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap
+++ b/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap
@@ -2,11 +2,11 @@
source: src/styling/mod.rs
expression: result
---
-  [ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] &&
-  mkdir -p {{ worktree }}/target/debug/deps &&
+  [ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] &&
+  mkdir -p {{ worktree }}/target/debug/deps &&
  cp -c {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root 
  }}/target/debug/deps/*.rmeta {{ worktree
-  }}/target/debug/deps/ &&
+  }}/target/debug/deps/ &&
  cp -cR {{ repo_root }}/target/debug/.fingerprint {{ repo_root 
  }}/target/debug/build {{ worktree
  }}/target/debug/
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index ec69b3d4a..37f3fe0ad 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -1128,7 +1128,12 @@ fn setup_snapshot_settings_for_paths_with_home(
);
// Remove trailing ANSI reset codes at end of lines for cross-platform consistency
- // Windows terminal strips these trailing resets that Unix includes
+ // Windows terminal strips these trailing resets that Unix includes.
+ //
+ // CAUTION: this means committed snapshots never show the line-final `[0m`
+ // the binary actually emits, so a styled line-end in a `.snap` looks like
+ // an unclosed SGR attribute when it isn't. Don't diagnose color/dim-bleed
+ // bugs from snapshot bytes — capture fresh output (`cat -v`) instead.
settings.add_filter(r"\x1b\[0m$", "");
settings.add_filter(r"\x1b\[0m\n", "\n");
diff --git a/tests/integration_tests/config_show_theme.rs b/tests/integration_tests/config_show_theme.rs
index a9698cb8e..a95cc98e5 100644
--- a/tests/integration_tests/config_show_theme.rs
+++ b/tests/integration_tests/config_show_theme.rs
@@ -1,10 +1,14 @@
-use crate::common::wt_command;
+use crate::common::{add_standard_env_redactions, wt_command};
use insta_cmd::assert_cmd_snapshot;
#[test]
fn test_show_theme() {
- let mut cmd = wt_command();
- cmd.arg("config").arg("shell").arg("show-theme");
+ let mut settings = insta::Settings::clone_current();
+ add_standard_env_redactions(&mut settings);
+ settings.bind(|| {
+ let mut cmd = wt_command();
+ cmd.arg("config").arg("shell").arg("show-theme");
- assert_cmd_snapshot!(cmd);
+ assert_cmd_snapshot!(cmd);
+ });
}
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index c95f2277b..a2211c0ec 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -37,7 +37,7 @@ fn test_configure_shell_with_yes(repo: TestRepo, temp_home: TempDir) {
✓ Configured 1 shell
▲ Completions require compinit; add to ~/.zshrc before the wt line:
-   autoload -Uz compinit && compinit
+   autoload -Uz compinit && compinit
↳ Restart shell to activate shell integration
");
});
@@ -78,7 +78,7 @@ fn test_configure_shell_specific_shell(repo: TestRepo, temp_home: TempDir) {
✓ Configured 1 shell
▲ Completions require compinit; add to ~/.zshrc before the wt line:
-   autoload -Uz compinit && compinit
+   autoload -Uz compinit && compinit
↳ Restart shell to activate shell integration
");
});
@@ -772,7 +772,7 @@ fn test_configure_shell_multiple_configs(repo: TestRepo, temp_home: TempDir) {
✓ Configured 2 shells
▲ Completions require compinit; add to ~/.zshrc before the wt line:
-   autoload -Uz compinit && compinit
+   autoload -Uz compinit && compinit
↳ Restart shell to activate shell integration
");
});
@@ -830,7 +830,7 @@ fn test_configure_shell_mixed_states(repo: TestRepo, temp_home: TempDir) {
✓ Configured 1 shell
▲ Completions require compinit; add to ~/.zshrc before the wt line:
-   autoload -Uz compinit && compinit
+   autoload -Uz compinit && compinit
↳ Restart shell to activate shell integration
");
});
@@ -1289,7 +1289,7 @@ fn test_configure_shell_create_zshrc_when_missing(repo: TestRepo, temp_home: Tem
✓ Configured 1 shell
▲ Completions require compinit; add to ~/.zshrc before the wt line:
-   autoload -Uz compinit && compinit
+   autoload -Uz compinit && compinit
↳ Restart shell to activate shell integration
");
});
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap b/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap
index 76850c015..ad0582666 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap
@@ -12,21 +12,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -48,11 +54,11 @@ exit_code: 0
  command = "llm --model claude"
○ Gutter formatting (shell code):
-  eval "$(wt config shell init bash)"
-  echo 'This is a long command that will wrap to the next line when the terminal is narrow enough to require wrapping.'
+  eval "$(wt config shell init bash)"
+  echo 'This is a long command that will wrap to the next line when the terminal is narrow enough to require wrapping.'
  echo 'hello
-  world'
-  cargo build --release &&
+  world'
+  cargo build --release &&
  cargo test
  cp {{ repo_root }}/target {{ worktree }}/target
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 e1af7a28d..6ac70cd91 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
@@ -4,11 +4,11 @@ expression: "&output"
---
▲ repo needs approval to execute 1 command:
○ pre-start:
-  echo 'test command'
+  echo 'test command'
❯ Allow and remember? [y/N] y
◎ Running pre-start project hook @ _REPO_.test-approve
-  echo 'test command'
+  echo 'test command'
test command
✓ Created branch test-approve from main and worktree @ _REPO_.test-approve
↳ To customize worktree locations, run wt config create
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 8b92d8238..ed7e6d7d5 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
@@ -4,7 +4,7 @@ expression: "&output"
---
▲ repo needs approval to execute 1 command:
○ pre-start:
-  echo 'test command'
+  echo 'test command'
❯ Allow and remember? [y/N] n
○ Commands declined, continuing worktree creation without hooks
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 2fecbf9f1..af34fb244 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
@@ -4,19 +4,19 @@ expression: "&output"
---
▲ repo needs approval to execute 2 commands:
○ pre-start first:
-  echo 'First command'
+  echo 'First command'
○ pre-start third:
-  echo 'Third command'
+  echo 'Third command'
❯ Allow and remember? [y/N] y
◎ Running pre-start project:first @ _REPO_.test-mixed-accept
-  echo 'First command'
+  echo 'First command'
First command
◎ Running pre-start project:second @ _REPO_.test-mixed-accept
-  echo 'Second command'
+  echo 'Second command'
Second command
◎ Running pre-start project:third @ _REPO_.test-mixed-accept
-  echo 'Third command'
+  echo 'Third command'
Third command
✓ Created branch test-mixed-accept from main and worktree @ _REPO_.test-mixed-accept
↳ To customize worktree locations, run wt config create
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 acc3810cc..184787ce5 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
@@ -4,9 +4,9 @@ expression: "&output"
---
▲ repo needs approval to execute 2 commands:
○ pre-start first:
-  echo 'First command'
+  echo 'First command'
○ pre-start third:
-  echo 'Third command'
+  echo 'Third command'
❯ Allow and remember? [y/N] n
○ Commands declined, continuing worktree creation without hooks
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 b1f00710b..abcb9e0c9 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
@@ -4,21 +4,21 @@ expression: "&output"
---
▲ repo needs approval to execute 3 commands:
○ pre-start first:
-  echo 'First command'
+  echo 'First command'
○ pre-start second:
-  echo 'Second command'
+  echo 'Second command'
○ pre-start third:
-  echo 'Third command'
+  echo 'Third command'
❯ Allow and remember? [y/N] y
◎ Running pre-start project:first @ _REPO_.test-multi
-  echo 'First command'
+  echo 'First command'
First command
◎ Running pre-start project:second @ _REPO_.test-multi
-  echo 'Second command'
+  echo 'Second command'
Second command
◎ Running pre-start project:third @ _REPO_.test-multi
-  echo 'Third command'
+  echo 'Third command'
Third command
✓ Created branch test-multi from main and worktree @ _REPO_.test-multi
↳ To customize worktree locations, run wt config create
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 70df98529..bdc0727f4 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
@@ -4,21 +4,21 @@ expression: "&output"
---
▲ repo needs approval to execute 3 commands:
○ pre-start install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
○ pre-start build:
-  echo 'Building project...'
+  echo 'Building project...'
○ pre-start test:
-  echo 'Running tests...'
+  echo 'Running tests...'
❯ Allow and remember? [y/N] y
◎ Running pre-start project:install @ _REPO_.test-named
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
◎ Running pre-start project:build @ _REPO_.test-named
-  echo 'Building project...'
+  echo 'Building project...'
Building project...
◎ Running pre-start project:test @ _REPO_.test-named
-  echo 'Running tests...'
+  echo 'Running tests...'
Running tests...
✓ Created branch test-named from main and worktree @ _REPO_.test-named
↳ To customize worktree locations, run wt config create
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 5d4372e85..b6b86a6cf 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
@@ -4,13 +4,13 @@ expression: "&output"
---
▲ repo needs approval to execute 1 command:
○ pre-start:
-  echo 'test command'
+  echo 'test command'
❯ Allow and remember? [y/N] y
▲ Failed to save command approval: Failed to open lock file: Permission denied (os error 13)
↳ Approval will be requested again next time
◎ Running pre-start project hook @ _REPO_.test-permission
-  echo 'test command'
+  echo 'test command'
test command
✓ Created branch test-permission from main and worktree @ _REPO_.test-permission
↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap
index 92ad7e93b..d81844edd 100644
--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap
+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap
@@ -4,7 +4,7 @@ expression: "&output"
---
▲ repo needs approval to execute 1 command:
○ pre-remove:
-  echo 'pre-remove hook'
+  echo 'pre-remove hook'
❯ Allow and remember? [y/N] n
○ Commands declined, continuing removal without hooks
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index cc1b1bca2..c879c75e2 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
@@ -30,7 +30,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -59,6 +58,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ pre-start:
-  echo 'test command'
+  echo 'test command'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index 66b9b90f1..065a4672e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
@@ -8,8 +8,8 @@ exit_code: 1
----- stderr -----
▲ repo needs approval to execute 2 commands:
○ pre-start first:
-  echo 'First command'
+  echo 'First command'
○ pre-start third:
-  echo 'Third command'
+  echo 'Third command'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index a991a9278..b1dd658e4 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -8,12 +8,12 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 4 commands:
○ pre-start branch:
-  echo 'Branch: {{ branch }}'
+  echo 'Branch: {{ branch }}'
○ pre-start worktree:
-  echo 'Worktree: {{ worktree_path }}'
+  echo 'Worktree: {{ worktree_path }}'
○ pre-start repo:
-  echo 'Repo: {{ repo }}'
+  echo 'Repo: {{ repo }}'
○ pre-start pwd:
-  cd {{ worktree_path }} && pwd
+  cd {{ worktree_path }} && pwd
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 79220b8c2..168c85495 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -8,10 +8,10 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 3 commands:
○ pre-start install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
○ pre-start build:
-  echo 'Building project...'
+  echo 'Building project...'
○ pre-start test:
-  echo 'Running tests...'
+  echo 'Running tests...'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 35034f56c..1efd092eb 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -8,6 +8,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ pre-start:
-  echo 'Worktree path: {{ worktree_path }}'
+  echo 'Worktree path: {{ worktree_path }}'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index 66b9b90f1..065a4672e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
@@ -8,8 +8,8 @@ exit_code: 1
----- stderr -----
▲ repo needs approval to execute 2 commands:
○ pre-start first:
-  echo 'First command'
+  echo 'First command'
○ pre-start third:
-  echo 'Third command'
+  echo 'Third command'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap
index bc505b50e..e61d41bf1 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap
@@ -8,8 +8,8 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 2 commands:
○ pre-merge test:
-  echo 'Running project test'
+  echo 'Running project test'
○ pre-merge lint:
-  echo 'Running project lint'
+  echo 'Running project lint'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap
index abaa3329c..129faf68e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap
@@ -8,6 +8,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ pre-merge test:
-  echo 'Running project test'
+  echo 'Running project test'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index b9d5b8388..d316c9db0 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
@@ -8,6 +8,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ post-merge:
-  echo 'Post-merge cleanup for {{ branch }}'
+  echo 'Post-merge cleanup for {{ branch }}'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 5c85fad11..c2a75c505 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
@@ -8,6 +8,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ pre-merge:
-  echo 'Running pre-merge checks on {{ branch }}'
+  echo 'Running pre-merge checks on {{ branch }}'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snap
index 3710cea02..73014a39e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,5 +57,5 @@ exit_code: 0
----- stderr -----
◎ Running pre-merge user:test
-  echo 'user test'
+  echo 'user test'
user test
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 8ff28129e..88e056533 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
@@ -31,7 +31,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -59,7 +58,7 @@ exit_code: 0
----- stderr -----
◎ Running pre-start project hook @ _REPO_.test-yes-tty
-  echo 'test command'
+  echo 'test command'
test command
✓ Created branch test-yes-tty from main and worktree @ _REPO_.test-yes-tty
↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
index 40dfe8248..335f4702d 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
@@ -31,7 +31,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -60,6 +59,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ pre-start:
-  echo 'test'
+  echo 'test'
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_includes_aliases.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_includes_aliases.snap
index 2fe8e36df..1d2970bf5 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_includes_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_includes_aliases.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: false
@@ -47,6 +58,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ alias deploy:
-  echo deploying {{ branch }}
+  echo deploying {{ branch }}
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap
index 77cb8ff58..ffc7fc8af 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: /bin/bash
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -68,8 +67,8 @@ exit_code: 0
  $SHELL: /bin/bash
○ bash: Already configured shell extension & completions @ ~/.bashrc:2
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
-  eval "$(wt config shell init bash)"
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+  eval "$(wt config shell init bash)"
↳ Creates shell function wt. Aliases should use wt, not wt
↳ To verify wrapper loaded: type wt
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap
index 3688cc427..f98a4494a 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -66,7 +65,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
○ fish: Already configured shell extension @ ~/.config/fish/functions/wt.fish:7
-  command wt config shell init fish | source
+  command wt config shell init fish | source
○ fish: Already configured completions @ ~/.config/fish/completions/wt.fish
OTHER
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap
index 188b00245..e4c044a5f 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -66,7 +65,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
○ fish: Already configured shell extension @ ~/.config/fish/functions/wt.fish:7
-  command wt config shell init fish | source
+  command wt config shell init fish | source
▲ fish: Completions not configured @ ~/.config/fish/completions/wt.fish
↳ To configure completions, run wt config shell install fish
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
index a8c8a4142..ec7dd9718 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: /bin/zsh
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -69,7 +68,7 @@ exit_code: 0
○ bash: Not configured shell extension & completions
○ zsh: Already configured shell extension & completions @ ~/.zshrc:2
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
↳ To verify wrapper loaded: type wt
↳ To configure, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap
index 535274ae4..c8bc72185 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: "C:\\Users\\user\\Documents\\PowerShell\\Modules"
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,7 +66,7 @@ exit_code: 0
  Detected shell: powershell (via PSModulePath)
○ bash: Already configured shell extension & completions @ ~/.bashrc:1
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap
index 49f5a4c6b..2050b5065 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -69,7 +68,7 @@ exit_code: 0
○ bash: Not configured shell extension & completions
▲ Found wt in ~/.bashrc:2 but not detected as integration:
-  export WT_BIN="/c/Program Files/wt"
+  export WT_BIN="/c/Program Files/wt"
↳ Note: wt creates shell function wt. Aliases should use wt, not wt
↳ If `export WT_BIN="/c/Program Files/wt"` is meant to load Worktrunk shell integration, report a false negative: https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20integration%20detection%20false%20negative&body=Shell%20integration%20not%20detected%20despite%20config%20containing%20%60wt%60.%0A%0A%2A%2AUnmatched%20lines%3A%2A%2A%0A%60%60%60%0Aexport%20WT_BIN%3D%22%2Fc%2FProgram%20Files%2Fwt%22%0A%60%60%60%0A%0A%2A%2AExpected%20behavior%3A%2A%2A%20These%20lines%20should%20be%20detected%20as%20shell%20integration.
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap
index 3a759166a..04af143fc 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -71,7 +70,7 @@ exit_code: 0
↳ To update, run wt config shell install fish
↳ To configure, run wt config shell install
▲ Found wt in ~/.bashrc:2 but not detected as integration:
-  alias wt="git worktree"
+  alias wt="git worktree"
↳ If `alias wt="git worktree"` is meant to load Worktrunk shell integration, report a false negative: https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20integration%20detection%20false%20negative&body=Shell%20integration%20not%20detected%20despite%20config%20containing%20%60wt%60.%0A%0A%2A%2AUnmatched%20lines%3A%2A%2A%0A%60%60%60%0Aalias%20wt%3D%22git%20worktree%22%0A%60%60%60%0A%0A%2A%2AExpected%20behavior%3A%2A%2A%20These%20lines%20should%20be%20detected%20as%20shell%20integration.
OTHER
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap
index 11d7ec1c1..3fbb8104b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -69,7 +68,7 @@ exit_code: 0
○ bash: Not configured shell extension & completions
▲ Found wt in ~/.bashrc:3 but not detected as integration:
-  alias wt="git worktree"
+  alias wt="git worktree"
↳ If `alias wt="git worktree"` is meant to load Worktrunk shell integration, report a false negative: https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20integration%20detection%20false%20negative&body=Shell%20integration%20not%20detected%20despite%20config%20containing%20%60wt%60.%0A%0A%2A%2AUnmatched%20lines%3A%2A%2A%0A%60%60%60%0Aalias%20wt%3D%22git%20worktree%22%0A%60%60%60%0A%0A%2A%2AExpected%20behavior%3A%2A%2A%20These%20lines%20should%20be%20detected%20as%20shell%20integration.
OTHER
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
index dae59b626..3c5d122c3 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,7 +66,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
○ zsh: Already configured shell extension & completions @ ~/.zshrc:5
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
OTHER
○ wt: [VERSION]
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
index 1cfd2b507..c48a479a9 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,7 +66,7 @@ exit_code: 0
  Invoked as: [PROJECT_ROOT]/target/[BUILD_MODE]/wt
○ zsh: Already configured shell extension & completions @ ~/.zshrc:2
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
▲ Completions won't work; add to ~/.zshrc before the wt line:
  autoload -Uz compinit && compinit
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
index 4cf06bdf0..b7caae94f 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
@@ -11,32 +11,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -56,14 +67,14 @@ exit_code: 0
▲ User config: template variable main_worktree is deprecated in favor of repo
↳ To see details, run wt config show; to apply updates, run wt config update
○ Expanding worktree-path
-  ../{{ main_worktree }}.{{ branch }}
+  ../{{ main_worktree }}.{{ branch }}
  →
-  ../repo.feature-a
+  ../repo.feature-a
○ Expanding worktree-path
-  ../{{ main_worktree }}.{{ branch }}
+  ../{{ main_worktree }}.{{ branch }}
  →
-  ../repo.feature-b
+  ../repo.feature-b
○ Expanding worktree-path
-  ../{{ main_worktree }}.{{ branch }}
+  ../{{ main_worktree }}.{{ branch }}
  →
-  ../repo.feature-c
+  ../repo.feature-c
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run.snap
index cef68efca..1cd6b0b43 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run.snap
@@ -14,32 +14,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: /bin/zsh
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -48,4 +59,4 @@ exit_code: 0
----- stderr -----
○ Will add shell extension & completions for zsh @ ~/.zshrc
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run_multiple.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run_multiple.snap
index 3dd49ee09..2e1184e9a 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run_multiple.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_dry_run_multiple.snap
@@ -13,32 +13,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: /bin/zsh
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -47,7 +58,7 @@ exit_code: 0
----- stderr -----
○ Will add shell extension & completions for bash @ ~/.bashrc
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
○ Will add shell extension & completions for zsh @ ~/.zshrc
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run.snap
index 475e2c889..3b356cda7 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run.snap
@@ -14,32 +14,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: /bin/fish
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -48,22 +59,22 @@ exit_code: 0
----- stderr -----
○ Will create shell extension for fish @ ~/.config/fish/functions/wt.fish
-  # worktrunk shell integration for fish
-  # Sources full integration from binary on first use.
-  # Docs: https://worktrunk.dev/config/#shell-integration
-  # Check: wt config show | Uninstall: wt config shell uninstall
-  
+  # worktrunk shell integration for fish
+  # Sources full integration from binary on first use.
+  # Docs: https://worktrunk.dev/config/#shell-integration
+  # Check: wt config show | Uninstall: wt config shell uninstall
+ 
  function wt
   command wt config shell init fish | source
-   # Check both command exit code ($pipestatus[1]) and source exit code ($pipestatus[2])
-   # If source fails, the function isn't replaced and we'd infinite-loop calling ourselves
-   set -l wt_status $pipestatus[1]
+   # Check both command exit code ($pipestatus[1]) and source exit code ($pipestatus[2])
+   # If source fails, the function isn't replaced and we'd infinite-loop calling ourselves
+   set -l wt_status $pipestatus[1]
   set -l source_status $pipestatus[2]
   test $wt_status -eq 0; or return $wt_status
   test $source_status -eq 0; or return $source_status
   wt $argv
-  end
+  end
○ Will create completions for fish @ ~/.config/fish/completions/wt.fish
-  # worktrunk completions for fish
-  complete --keep-order --exclusive --command wt --arguments "(test -n /"/$WORKTRUNK_BIN/"; or set -l WORKTRUNK_BIN (type -P wt 2>/dev/null); and COMPLETE=fish /$WORKTRUNK_BIN -- (commandline --current-process --tokenize --cut-at-cursor) (commandline --current-token))"
+  # worktrunk completions for fish
+  complete --keep-order --exclusive --command wt --arguments "(test -n /"/$WORKTRUNK_BIN/"; or set -l WORKTRUNK_BIN (type -P wt 2>/dev/null); and COMPLETE=fish /$WORKTRUNK_BIN -- (commandline --current-process --tokenize --cut-at-cursor) (commandline --current-token))"
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run_does_not_delete_legacy.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run_does_not_delete_legacy.snap
index 1d4be19ba..307b1cbae 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run_does_not_delete_legacy.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_dry_run_does_not_delete_legacy.snap
@@ -14,32 +14,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: /bin/fish
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -48,5 +59,5 @@ exit_code: 0
----- stderr -----
○ Will add completions for fish @ ~/.config/fish/completions/wt.fish
-  # worktrunk completions for fish
-  complete --keep-order --exclusive --command wt --arguments "(test -n /"/$WORKTRUNK_BIN/"; or set -l WORKTRUNK_BIN (type -P wt 2>/dev/null); and COMPLETE=fish /$WORKTRUNK_BIN -- (commandline --current-process --tokenize --cut-at-cursor) (commandline --current-token))"
+  # worktrunk completions for fish
+  complete --keep-order --exclusive --command wt --arguments "(test -n /"/$WORKTRUNK_BIN/"; or set -l WORKTRUNK_BIN (type -P wt 2>/dev/null); and COMPLETE=fish /$WORKTRUNK_BIN -- (commandline --current-process --tokenize --cut-at-cursor) (commandline --current-token))"
diff --git a/tests/snapshots/integration__integration_tests__directives__switch_no_cd_execute_runs_in_target_worktree.snap b/tests/snapshots/integration__integration_tests__directives__switch_no_cd_execute_runs_in_target_worktree.snap
index f05fbfffa..7baeb1faa 100644
--- a/tests/snapshots/integration__integration_tests__directives__switch_no_cd_execute_runs_in_target_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__directives__switch_no_cd_execute_runs_in_target_worktree.snap
@@ -15,19 +15,24 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -36,13 +41,19 @@ info:
WORKTRUNK_DIRECTIVE_CD_FILE: "[DIRECTIVE_CD_FILE]"
WORKTRUNK_DIRECTIVE_EXEC_FILE: "[DIRECTIVE_EXEC_FILE]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -53,4 +64,4 @@ exit_code: 0
✓ Created branch exec-test from main and worktree @ _REPO_.exec-test
↳ To customize worktree locations, run wt config create
◎ Executing (--execute) @ _REPO_.exec-test:
-  pwd
+  pwd
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
index 38a489a99..303f6321a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
@@ -73,7 +73,7 @@ Clear approvals for current project:
  wt config approvals clear
Clear global approvals:
-  wt config approvals clear --global
+  wt config approvals clear --global
How approvals work
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 46cb7cbcd..b2bf893a4 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -81,7 +81,7 @@ Create user config file with documented examples:
Create project config file (.config/wt.toml) for hooks:
-  wt config create --project
+  wt config create --project
Show current configuration and file locations:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_show.snap b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
index 2d04f5530..14cdae62f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_show.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
@@ -80,7 +80,7 @@ If a config file doesn't exist, shows defaults that would be used.
Use --full to run diagnostic checks:
-  wt config show --full
+  wt config show --full
This tests:
- CI tool status — Whether gh (GitHub) or glab (GitLab) is installed and authenticated
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
index 861e94465..d42ae6344 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
@@ -126,10 +126,10 @@ Query the command log:
  tail -5 .git/wt/logs/commands.jsonl | jq .
Path to one hook log (e.g. the post-start server hook for the current branch):
-  wt config state logs --format=json | jq -r '.hook_output[] | select(.source == "user" and .hook_type == "post-start" and (.name | startswith("server"))) | .path'
+  wt config state logs --format=json | jq -r '.hook_output[] | select(.source == "user" and .hook_type == "post-start" and (.name | startswith("server"))) | .path'
Logs for a specific branch:
-  wt config state logs --format=json | jq '.hook_output[] | select(.branch | startswith("feature"))'
+  wt config state logs --format=json | jq '.hook_output[] | select(.branch | startswith("feature"))'
Clear all logs:
  wt config state logs clear
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap
index 549b39f97..89fa18482 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap
@@ -86,7 +86,7 @@ Markers appear at the end of the Status column, after git symbols:
Stored in git config as worktrunk.state.<branch>.marker. Set directly with:
-  git config worktrunk.state.feature.marker '{"marker":"🚧","set_at":0}'
+  git config worktrunk.state.feature.marker '{"marker":"🚧","set_at":0}'
Without a subcommand, runs get for the current branch. For --branch, use get --branch=NAME.
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index 64f3a5140..2b668ee95 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -98,36 +98,36 @@ List all worktrees:
  ^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
  + fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
  + fix-typos _| | 41ee0834 4d Merge fix-auth: hardened to…
-  
+  
  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
Include CI status, line diffs, and LLM summaries:
-  wt list --full
+  wt list --full
   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
-  ^ main ^⇅ ⇡1 ⇣1 # 41ee0834
-  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
-  + fix-typos _| | #410 41ee0834
-  
+  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+  ^ main ^⇅ ⇡1 ⇣1 # 41ee0834
+  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
+  + fix-typos _| | #410 41ee0834
+  
  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
Include branches that don't have worktrees:
-  wt list --branches --full
+  wt list --branches --full
   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
-  ^ main ^⇅ ⇡1 ⇣1 # 41ee0834
-  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
-  + fix-typos _| | #410 41ee0834
+  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+  ^ main ^⇅ ⇡1 ⇣1 # 41ee0834
+  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
+  + fix-typos _| | #410 41ee0834
   exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
   wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
-  
+  
  ○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
Output as JSON for scripting:
-  wt list --format=json
+  wt list --format=json
Columns
@@ -219,29 +219,29 @@ These appear across all columns while the table is loading:
Query structured data with --format=json:
-  # Current worktree path (for scripts)
-  wt list --format=json | jq -r '.[] | select(.is_current) | .path'
-  
-  # Branches with uncommitted changes
-  wt list --format=json | jq '.[] | select(.working_tree.modified)'
-  
-  # Worktrees with merge conflicts
-  wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'
-  
-  # Branches ahead of main (needs merging)
-  wt list --format=json | jq '.[] | select(.main.ahead > 0) | .branch'
-  
-  # Integrated branches (safe to remove)
-  wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_state == "empty") | .branch'
-  
-  # Branches without worktrees
-  wt list --format=json --branches | jq '.[] | select(.kind == "branch") | .branch'
-  
-  # Worktrees ahead of remote (needs pushing)
-  wt list --format=json | jq '.[] | select(.remote.ahead > 0) | {branch, ahead: .remote.ahead}'
-  
-  # Stale CI (local changes not reflected in CI)
-  wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'
+  # Current worktree path (for scripts)
+  wt list --format=json | jq -r '.[] | select(.is_current) | .path'
+  
+  # Branches with uncommitted changes
+  wt list --format=json | jq '.[] | select(.working_tree.modified)'
+  
+  # Worktrees with merge conflicts
+  wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'
+  
+  # Branches ahead of main (needs merging)
+  wt list --format=json | jq '.[] | select(.main.ahead > 0) | .branch'
+  
+  # Integrated branches (safe to remove)
+  wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_state == "empty") | .branch'
+  
+  # Branches without worktrees
+  wt list --format=json --branches | jq '.[] | select(.kind == "branch") | .branch'
+  
+  # Worktrees ahead of remote (needs pushing)
+  wt list --format=json | jq '.[] | select(.remote.ahead > 0) | {branch, ahead: .remote.ahead}'
+  
+  # Stale CI (local changes not reflected in CI)
+  wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'
Fields:
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
index 1eac7d12e..969c16d64 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
@@ -111,48 +111,48 @@ List all worktrees:
  secure token storage
  + fix-typos _| | 41ee0834 4d Merge 
  fix-auth: hardened to…
-  
+  
  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
Include CI status, line diffs, and LLM summaries:
-  wt list --full
+  wt list --full
   Branch Status HEAD± main↕ main…± Summary 
   Remote⇅ CI Commit
  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST 
-  architecture with middleware ⇡3 #412 6814f02a
+  architecture with middleware ⇡3 #412 6814f02a
  ^ main ^⇅ 
-   ⇡1 ⇣1 # 41ee0834
+   ⇡1 ⇣1 # 41ee0834
  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with 
-  constant-time token validation | #408 b772e68b
+  constant-time token validation | #408 b772e68b
  + fix-typos _| 
-   | #410 41ee0834
-  
+   | #410 41ee0834
+  
  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
Include branches that don't have worktrees:
-  wt list --branches --full
+  wt list --branches --full
   Branch Status HEAD± main↕ main…± Summary 
   Remote⇅ CI Commit
  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST 
-  architecture with middleware ⇡3 #412 6814f02a
+  architecture with middleware ⇡3 #412 6814f02a
  ^ main ^⇅ 
-   ⇡1 ⇣1 # 41ee0834
+   ⇡1 ⇣1 # 41ee0834
  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with 
-  constant-time token validation | #408 b772e68b
+  constant-time token validation | #408 b772e68b
  + fix-typos _| 
-   | #410 41ee0834
+   | #410 41ee0834
   exp /↕ ↑2 ↓1 +137 Explore GraphQL schema
   and resolvers 96379229
   wip /↕ ↑1 ↓1 +33 Start API 
  documentation b40716dc
-  
+  
  ○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
Output as JSON for scripting:
-  wt list --format=json
+  wt list --format=json
Columns
@@ -265,32 +265,32 @@ These appear across all columns while the table is loading:
Query structured data with --format=json:
-  # Current worktree path (for scripts)
-  wt list --format=json | jq -r '.[] | select(.is_current) | .path'
-  
-  # Branches with uncommitted changes
-  wt list --format=json | jq '.[] | select(.working_tree.modified)'
-  
-  # Worktrees with merge conflicts
-  wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'
-  
-  # Branches ahead of main (needs merging)
-  wt list --format=json | jq '.[] | select(.main.ahead > 0) | .branch'
-  
-  # Integrated branches (safe to remove)
+  # Current worktree path (for scripts)
+  wt list --format=json | jq -r '.[] | select(.is_current) | .path'
+  
+  # Branches with uncommitted changes
+  wt list --format=json | jq '.[] | select(.working_tree.modified)'
+  
+  # Worktrees with merge conflicts
+  wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'
+  
+  # Branches ahead of main (needs merging)
+  wt list --format=json | jq '.[] | select(.main.ahead > 0) | .branch'
+  
+  # Integrated branches (safe to remove)
  wt list --format=json | jq '.[] | select(.main_state == "integrated" or 
-  .main_state == "empty") | .branch'
-  
-  # Branches without worktrees
+  .main_state == "empty") | .branch'
+  
+  # Branches without worktrees
  wt list --format=json --branches | jq '.[] | select(.kind == "branch") | 
-  .branch'
-  
-  # Worktrees ahead of remote (needs pushing)
+  .branch'
+  
+  # Worktrees ahead of remote (needs pushing)
  wt list --format=json | jq '.[] | select(.remote.ahead > 0) | {branch, ahead: 
-  .remote.ahead}'
-  
-  # Stale CI (local changes not reflected in CI)
-  wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'
+  .remote.ahead}'
+  
+  # Stale CI (local changes not reflected in CI)
+  wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'
Fields:
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
index 5ce4f51f9..26f03e6b3 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
@@ -112,7 +112,7 @@ Merge to the default branch:
  wt merge
  ◎ Running pre-merge project:test
   cargo nextest run
-   Finished `test` profile [unoptimized + debuginfo] target(s) in 0.02s
+   Finished `test` profile [unoptimized + debuginfo] target(s) in 0.02s
   Summary [ 0.002s] 2 tests run: 2 passed, 0 skipped
  ◎ Merging 1 commit to main @ a1b2c3d (no commit/squash/rebase needed)
   * a1b2c3d feat: add hook registration
@@ -128,19 +128,19 @@ Merge to a different branch:
Keep the worktree after merging:
-  wt merge --no-remove
+  wt merge --no-remove
Preserve commit history (no squash):
-  wt merge --no-squash
+  wt merge --no-squash
Create a merge commit — semi-linear history:
-  wt merge --no-ff
+  wt merge --no-ff
Skip committing/squashing (rebase still runs unless --no-rebase):
-  wt merge --no-commit
+  wt merge --no-commit
Pipeline
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
index bfae5a642..5e45c5835 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -144,9 +144,9 @@ Worktrunk has two force flags for different situations:
--force (-f) Worktree Worktree has uncommitted changes
--force-delete (-D) Branch Branch has unmerged commits
-  wt remove feature --force # Remove dirty worktree
-  wt remove feature -D # Delete unmerged branch
-  wt remove feature --force -D # Both
+  wt remove feature --force # Remove dirty worktree
+  wt remove feature -D # Delete unmerged branch
+  wt remove feature --force -D # Both
Use --no-delete-branch to keep the branch regardless of merge status.
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_promote.snap b/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
index 9cf606202..894f60e96 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
@@ -70,7 +70,7 @@ Usage: wt step promote [OPTIONS] [BRANCH]
Example
-  # from ~/project (main worktree)
+  # from ~/project (main worktree)
  wt step promote feature
Before:
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index 5da8b3eb0..b392b94f5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -126,12 +126,12 @@ Worktrees are addressed by branch name; paths are computed from a configurable t
Examples
-  wt switch feature-auth # Switch to worktree
-  wt switch - # Previous worktree (like cd -)
-  wt switch --create new-feature # Create new branch and worktree
+  wt switch feature-auth # Switch to worktree
+  wt switch - # Previous worktree (like cd -)
+  wt switch --create new-feature # Create new branch and worktree
  wt switch --create hotfix --base production
-  wt switch pr:123 # Switch to PR #123's branch
-  wt switch https://github.com/owner/repo/pull/123 # ...or paste the PR's URL
+  wt switch pr:123 # Switch to PR #123's branch
+  wt switch https://github.com/owner/repo/pull/123 # ...or paste the PR's URL
Creating a branch
@@ -147,10 +147,10 @@ If the branch already has a worktree, wt switch changes directories to i
4. Runs pre-start hooks, blocking until complete
5. Spawns post-start and post-switch hooks in the background
-  wt switch feature # Existing branch → creates worktree
-  wt switch --create feature # New branch and worktree
-  wt switch --create fix --base release # New branch from release
-  wt switch --create temp --no-hooks # Skip hooks
+  wt switch feature # Existing branch → creates worktree
+  wt switch --create feature # New branch and worktree
+  wt switch --create fix --base release # New branch from release
+  wt switch --create temp --no-hooks # Skip hooks
Shortcuts
@@ -162,12 +162,12 @@ If the branch already has a worktree, wt switch changes directories to i
pr:{N} GitHub PR #N's branch
mr:{N} GitLab MR !N's branch
-  wt switch - # Back to previous
-  wt switch ^ # Default branch worktree
-  wt switch --create fix --base=@ # Branch from current HEAD
-  wt switch --create fix --base=pr:123 # Branch from PR #123's head
-  wt switch pr:123 # PR #123's branch
-  wt switch mr:101 # MR !101's branch
+  wt switch - # Back to previous
+  wt switch ^ # Default branch worktree
+  wt switch --create fix --base=@ # Branch from current HEAD
+  wt switch --create fix --base=pr:123 # Branch from PR #123's head
+  wt switch pr:123 # PR #123's branch
+  wt switch mr:101 # MR !101's branch
Shortcuts also apply to --base. For a fork PR/MR, the head commit is fetched and used as the base SHA without creating a tracking branch.
@@ -207,10 +207,10 @@ Available on Unix only (macOS, Linux). On Windows, use wt list or wt
The pr:<number> / mr:<number> shortcut and the PR/MR's web URL both resolve to its branch. For same-repo PRs/MRs, worktrunk switches to the branch directly. For fork PRs/MRs, it fetches the ref (refs/pull/N/head or refs/merge-requests/N/head) and configures pushRemote to the fork URL.
-  wt switch pr:101 # GitHub PR #101
-  wt switch https://github.com/owner/repo/pull/101 # ...the same PR, by URL
-  wt switch mr:101 # GitLab MR !101
-  wt switch https://gitlab.com/owner/repo/-/merge_requests/101 # ...the same MR, by URL
+  wt switch pr:101 # GitHub PR #101
+  wt switch https://github.com/owner/repo/pull/101 # ...the same PR, by URL
+  wt switch mr:101 # GitLab MR !101
+  wt switch https://gitlab.com/owner/repo/-/merge_requests/101 # ...the same MR, by URL
Both work anywhere a branch is accepted, including --base.
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap
index 581aee256..74c0901b7 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_syntax_error.snap
@@ -13,32 +13,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -49,7 +60,7 @@ exit_code: 0
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit broken: (requires approval)
-  # Failed to expand hook preview: syntax error: unexpected end of input, expected end of variable block @ line 1
+  # Failed to expand hook preview: syntax error: unexpected end of input, expected end of variable block @ line 1
  echo {{ branch
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap
index 67479a0ba..1e5040342 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_undefined_var.snap
@@ -13,32 +13,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -49,7 +60,7 @@ exit_code: 0
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit optional-var: (requires approval)
-  # Failed to expand hook preview: undefined value @ line 1
-  echo {{ base }}
+  # Failed to expand hook preview: undefined value @ line 1
+  echo {{ base }}
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap
index be2cc3f1b..7d09397b4 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_merge.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -48,6 +59,6 @@ exit_code: 0
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-merge deploy: (requires approval)
-  scripts/deploy.sh
+  scripts/deploy.sh
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap
index 02299cb8c..e49a48bb9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,7 +57,7 @@ exit_code: 0
----- stderr -----
◎ Running pre-commit project hook
-  echo 'Pre-commit from squash'
+  echo 'Pre-commit from squash'
Pre-commit from squash
◎ Squashing 3 commits into a single commit (3 files, +3)...
◎ Generating squash commit message...
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 c06bd473e..40a387578 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
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -48,7 +59,7 @@ exit_code: 0
▲ Auto-staging 1 untracked path:
  feature.txt
◎ Running pre-commit project hook
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
Pre-commit check passed
◎ Committing changes with default message... (1 file, +1, no squashing needed)
↳ Using fallback commit message. For LLM setup guide, run wt config --help
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index b09e54adc..06a7e3ec0 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,7 +57,7 @@ exit_code: 0
----- stderr -----
◎ Running pre-commit project hook
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
Pre-commit check passed
◎ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_dry_run.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_dry_run.snap
index 64d816dda..ccc1eb2b8 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_dry_run.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_dry_run.snap
@@ -24,25 +24,31 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -89,7 +95,7 @@ Branch: main
</context>
COMMAND
-  sh -c 'cat >/dev/null && echo '\''feat: add new_file'\'''
+  sh -c 'cat >/dev/null && echo '\''feat: add new_file'\'''
MESSAGE
  feat: add new_file
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_dry_run.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_dry_run.snap
index 9d6a3521d..fae609752 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_dry_run.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_dry_run.snap
@@ -24,25 +24,31 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -96,7 +102,7 @@ index 0000000..9f8f8ac
</diff>
COMMAND
-  sh -c 'cat >/dev/null && echo '\''feat: combined feature work'\'''
+  sh -c 'cat >/dev/null && echo '\''feat: combined feature work'\'''
MESSAGE
  feat: combined feature work
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_control_structure.snap
index ba3a4af7d..8ceeb59f2 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_control_structure.snap
@@ -30,7 +30,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -58,11 +57,11 @@ exit_code: 0
----- stderr -----
◎ Running pre-start project hook @ _REPO_.feature
-  if [ ! -f test.txt ]; then
+  if [ ! -f test.txt ]; then
   echo 'File does not exist' > result.txt
-  else
+  else
   echo 'File exists' > result.txt
-  fi
+  fi
✓ Created branch feature from main and worktree @ _REPO_.feature
▲ 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_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_named_commands.snap
index 40f951313..4ebd77907 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_named_commands.snap
@@ -58,9 +58,9 @@ exit_code: 0
----- stderr -----
◎ Running pre-start project:install @ _REPO_.feature
-  echo 'Installing deps'
+  echo 'Installing deps'
◎ Running pre-start project:setup @ _REPO_.feature
-  echo 'Running setup'
+  echo 'Running setup'
install │ Installing deps
setup  │ Running setup
✓ Created branch feature from main and worktree @ _REPO_.feature
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_command.snap
index 2548276c9..beabbdb98 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_command.snap
@@ -30,7 +30,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -58,7 +57,7 @@ exit_code: 0
----- stderr -----
◎ Running pre-start project hook @ _REPO_.feature
-  echo 'Setup complete'
+  echo 'Setup complete'
Setup complete
✓ Created branch feature from main and worktree @ _REPO_.feature
↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_output.snap
index 48b7fac53..1b97dc642 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_output.snap
@@ -58,9 +58,9 @@ exit_code: 0
----- stderr -----
○ Expanding worktree-path
-  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
+  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
  →
-  _REPO_/../repo.feature
+  _REPO_/../repo.feature
✓ Created branch feature from main and worktree @ _REPO_.feature
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_template_expansion.snap
index 39b559bd4..86a048188 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_verbose_template_expansion.snap
@@ -31,7 +31,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -59,13 +58,13 @@ exit_code: 0
----- stderr -----
○ Expanding worktree-path
-  ../{{ repo }}.{{ branch | sanitize }}
+  ../{{ repo }}.{{ branch | sanitize }}
  →
-  ../repo.verbose-hooks
+  ../repo.verbose-hooks
○ Expanding project:setup
-  echo 'Setting up {{ branch | sanitize }} in {{ worktree_path }}'
+  echo 'Setting up {{ branch | sanitize }} in {{ worktree_path }}'
  →
-  echo 'Setting up verbose-hooks in _REPO_.verbose-hooks'
+  echo 'Setting up verbose-hooks in _REPO_.verbose-hooks'
○ template variables:
  branch = verbose-hooks
  worktree_path = _REPO_.verbose-hooks
@@ -90,7 +89,7 @@ exit_code: 0
  hook_type = pre-start
  hook_name = setup
◎ Running pre-start project:setup @ _REPO_.verbose-hooks
-  echo 'Setting up verbose-hooks in _REPO_.verbose-hooks'
+  echo 'Setting up verbose-hooks in _REPO_.verbose-hooks'
Setting up verbose-hooks in _REPO_.verbose-hooks
✓ Created branch verbose-hooks from main and worktree @ _REPO_.verbose-hooks
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
index c67a9032d..16a03dffb 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,7 +57,7 @@ exit_code: 0
----- stderr -----
◎ Running pre-remove project hook @ _REPO_.feature-hook
-  echo 'About to remove worktree'
+  echo 'About to remove worktree'
About to remove worktree
◎ Removing feature-hook worktree...
✓ Removed feature-hook worktree & branch (same commit as main, _) (4 files · [BYTES] B)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
index 0e05d887e..86b86550b 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,13 +57,13 @@ exit_code: 0
----- stderr -----
◎ Running pre-remove project:branch @ _REPO_.feature-templates
-  echo 'Branch: feature-templates'
+  echo 'Branch: feature-templates'
Branch: feature-templates
◎ Running pre-remove project:worktree @ _REPO_.feature-templates
-  echo 'Worktree: _REPO_.feature-templates'
+  echo 'Worktree: _REPO_.feature-templates'
Worktree: _REPO_.feature-templates
◎ Running pre-remove project:worktree_name @ _REPO_.feature-templates
-  echo 'Name: repo.feature-templates'
+  echo 'Name: repo.feature-templates'
Name: repo.feature-templates
◎ Removing feature-templates worktree...
✓ Removed feature-templates worktree & branch (same commit as main, _) (4 files · [BYTES] B)
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 249808b0c..5edd8cfcd 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
@@ -8,7 +8,7 @@ expression: "&output"
❯ Install shell integration? [y/N/?] ?
○ Will add shell extension & completions for bash @ ~/.bashrc
-  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
❯ Install shell integration? [y/N/?] n
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
index 390dda3ba..1c1c41737 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
@@ -8,7 +8,7 @@ expression: "&output.combined"
✓ Created branch fish-multiline from main and worktree @ _REPO_.fish-multiline
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo 'line 1'; echo 'line 2'; echo 'line 3'
+  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
line 3
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_bash.snap
index 82d83493c..ad0a6108e 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_bash.snap
@@ -4,7 +4,7 @@ expression: "&output.combined"
---
◎ Running pre-merge project:format
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
◎ Running pre-merge project:test
  echo '✗ Test suite failed: 3 tests failing' && exit 1
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_zsh.snap
index 82d83493c..ad0a6108e 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_failure_zsh.snap
@@ -4,7 +4,7 @@ expression: "&output.combined"
---
◎ Running pre-merge project:format
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
◎ Running pre-merge project:test
  echo '✗ Test suite failed: 3 tests failing' && exit 1
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap
index 3fb138910..a44c5c660 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap
@@ -4,13 +4,13 @@ expression: "&output.combined"
---
◎ Running pre-merge project:format
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
◎ Running pre-merge project:lint
-  echo '✓ Linting passed - no warnings'
+  echo '✓ Linting passed - no warnings'
✓ Linting passed - no warnings
◎ Running pre-merge project:test
-  echo '✓ All 47 tests passed in 2.3s'
+  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
◎ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature file
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap
index 3fb138910..a44c5c660 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap
@@ -4,13 +4,13 @@ expression: "&output.combined"
---
◎ Running pre-merge project:format
-  echo '✓ Code formatting check passed'
+  echo '✓ Code formatting check passed'
✓ Code formatting check passed
◎ Running pre-merge project:lint
-  echo '✓ Linting passed - no warnings'
+  echo '✓ Linting passed - no warnings'
✓ Linting passed - no warnings
◎ Running pre-merge project:test
-  echo '✓ All 47 tests passed in 2.3s'
+  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
◎ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature file
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_fish.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_fish.snap
index 057720d70..69476358f 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_fish.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_fish.snap
@@ -6,5 +6,5 @@ expression: "&output.combined"
✓ Created branch test-exec from main and worktree @ _REPO_.test-exec
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo 'executed'
+  echo 'executed'
executed
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_hooks_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_hooks_zsh.snap
index 3ceb1698a..a2233ea0d 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_hooks_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_hooks_zsh.snap
@@ -4,10 +4,10 @@ expression: "&output.combined"
---
◎ Running pre-start project:install
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
◎ Running pre-start project:build
-  echo 'Building project...'
+  echo 'Building project...'
Building project...
✓ Created branch feature-hooks from main and worktree @ _REPO_.feature-hooks
↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__step_alias__alias_approval_project_config_prompts.snap b/tests/snapshots/integration__integration_tests__step_alias__alias_approval_project_config_prompts.snap
index b0f6cb2d8..ed9774651 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__alias_approval_project_config_prompts.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__alias_approval_project_config_prompts.snap
@@ -11,32 +11,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: false
@@ -46,6 +57,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ alias deploy:
-  echo deploying {{ branch }}
+  echo deploying {{ branch }}
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__step_alias__alias_help_flag_after_double_dash_forwards.snap b/tests/snapshots/integration__integration_tests__step_alias__alias_help_flag_after_double_dash_forwards.snap
index fef9bfd3c..cbc946dab 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__alias_help_flag_after_double_dash_forwards.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__alias_help_flag_after_double_dash_forwards.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: false
@@ -47,6 +58,6 @@ exit_code: 1
----- stderr -----
▲ origin needs approval to execute 1 command:
○ alias deploy:
-  echo {{ args }}
+  echo {{ args }}
✗ Cannot prompt for approval in non-interactive environment
↳ To skip prompts in CI/CD, add --yes; to pre-approve commands, run wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_args_shell_escaped.snap b/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_args_shell_escaped.snap
index f4daf813c..6e8a29cd8 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_args_shell_escaped.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_args_shell_escaped.snap
@@ -25,25 +25,31 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -70,6 +76,6 @@ hello foo bar baz
  args = foo 'bar baz'
◎ Running alias greet
○ Expanding greet
-  echo hello {{ args }}
+  echo hello {{ args }}
  →
-  echo hello foo 'bar baz'
+  echo hello foo 'bar baz'
diff --git a/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_variable_table.snap b/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_variable_table.snap
index d22a7f0e8..72829e6cf 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_variable_table.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__alias_verbose_variable_table.snap
@@ -24,25 +24,31 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -69,6 +75,6 @@ hello world
  args = world
◎ Running alias greet
○ Expanding greet
-  echo hello {{ args }}
+  echo hello {{ args }}
  →
  echo hello world
diff --git a/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_positional_args.snap b/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_positional_args.snap
index 02502d65b..c09df91ac 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_positional_args.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_positional_args.snap
@@ -15,39 +15,50 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias s (project) would run:
-  # args: target-branch
+  # args: target-branch
  wt switch target-branch
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_vars_across_steps.snap b/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_vars_across_steps.snap
index 54465cdfa..4c823940a 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_vars_across_steps.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__config_alias_dry_run_vars_across_steps.snap
@@ -13,40 +13,51 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias deploy (project) would run:
-  git config worktrunk.state.main.vars.target 'prod'
-  # publish
-  echo deploying to {{ vars.target }}
+  git config worktrunk.state.main.vars.target 'prod'
+  # publish
+  echo deploying to {{ vars.target }}
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_lists_all.snap b/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_lists_all.snap
index 1fc682c70..f33947099 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_lists_all.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_lists_all.snap
@@ -24,12 +24,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +38,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -57,7 +59,7 @@ exit_code: 0
○ Alias deploy (project):
  echo from project
○ Alias greet (user):
-  echo hi {{ branch }}
+  echo hi {{ branch }}
○ Alias list (project):
  echo custom list
○ Alias only-project (project):
diff --git a/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_pipeline.snap b/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_pipeline.snap
index 67a8ffc6b..d911e672f 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_pipeline.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_pipeline.snap
@@ -13,43 +13,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias release (project):
-  # install
+  # install
  npm install
-  # build
+  # build
  npm run build
-  # lint
+  # lint
  npm run lint
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_single.snap b/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_single.snap
index 98517cad6..b18cfec5a 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_single.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__config_alias_show_single.snap
@@ -13,38 +13,49 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias deploy (project):
-  make deploy BRANCH={{ branch }}
+  make deploy BRANCH={{ branch }}
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_referenced_var.snap b/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_referenced_var.snap
index 9e3d4b50e..8e84f0d99 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_referenced_var.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_referenced_var.snap
@@ -15,39 +15,50 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias greet (project) would run:
-  # bound: name=World
+  # bound: name=World
  echo Hello World from feature
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_space_separated_var.snap b/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_space_separated_var.snap
index 90131e6a1..a78aacee0 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_space_separated_var.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_alias_binds_space_separated_var.snap
@@ -16,39 +16,50 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias greet (project) would run:
-  # bound: name=World
+  # bound: name=World
  echo Hello World from feature
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__top_level_alias_positional_expands_in_dry_run.snap b/tests/snapshots/integration__integration_tests__step_alias__top_level_alias_positional_expands_in_dry_run.snap
index 02502d65b..c09df91ac 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__top_level_alias_positional_expands_in_dry_run.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__top_level_alias_positional_expands_in_dry_run.snap
@@ -15,39 +15,50 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
○ Alias s (project) would run:
-  # args: target-branch
+  # args: target-branch
  wt switch target-branch
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_compatible.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_compatible.snap
index 8971c821e..f3b611d8f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_compatible.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_compatible.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -63,4 +62,4 @@ exit_code: 0
----- stderr -----
✓ Created branch dep-ok from main and worktree @ _REPO_.dep-ok
◎ Executing (--execute):
-  git
+  git
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap
index c130f427a..53bfdfdda 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -66,4 +65,4 @@ exit_code: 0
✓ Created branch dep-shell from main and worktree @ _REPO_.dep-shell
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo hi && ls
+  echo hi && ls
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 ef5d434b2..e8a8b6b4b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -71,6 +70,6 @@ echo '\''line3'\'''
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.multiline-test:
-  echo 'line1'
-  echo 'line2'
-  echo 'line3'
+  echo 'line1'
+  echo 'line2'
+  echo 'line3'
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 5894155e2..7e8d1ce39 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,4 +66,4 @@ test output
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.exec-test:
-  echo 'test output'
+  echo 'test output'
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 500822d32..0d9c00a57 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
@@ -34,7 +34,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -69,4 +68,4 @@ base=main
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.from-main:
-  echo 'base=main'
+  echo 'base=main'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap
index 56956e079..ea3f857c0 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap
@@ -31,7 +31,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -64,4 +63,4 @@ base=main
▲ Worktree for existing @ _REPO_.existing, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.existing:
-  echo 'base=main'
+  echo 'base=main'
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 b987c0cb2..9cf18650b 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
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,4 +66,4 @@ branch=template-test
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.template-test:
-  echo 'branch=template-test'
+  echo 'branch=template-test'
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 0346aa477..10caf721f 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
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,4 +66,4 @@ feat;id
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ '_REPO_.feat;id':
-  echo 'feat;id'
+  echo 'feat;id'
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 112619229..06f7b09fb 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
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,4 +66,4 @@ sanitized=feature-with-slash
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.feature-with-slash:
-  echo 'sanitized=feature-with-slash'
+  echo 'sanitized=feature-with-slash'
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 75eb448fc..08edb3512 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
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,4 +66,4 @@ path=_REPO_.path-test
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.path-test:
-  echo 'path=_REPO_.path-test'
+  echo 'path=_REPO_.path-test'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap
index ccd0a9df3..846fbf045 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap
@@ -33,7 +33,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -63,9 +62,9 @@ repo=repo
----- stderr -----
○ Expanding worktree-path
-  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
+  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
  →
-  _REPO_/../repo.multiline-test
+  _REPO_/../repo.multiline-test
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c '{% if branch %}
echo '\''branch={{ branch }}'\''
@@ -77,14 +76,14 @@ echo '\''repo={{ repo }}'\''
↳ To enable automatic cd, run wt config shell install
○ Expanding --execute command
  {% if branch %}
-  echo 'branch={{ branch }}'
-  echo 'repo={{ repo }}'
+  echo 'branch={{ branch }}'
+  echo 'repo={{ repo }}'
  {% endif %}
  →
-  
-  echo 'branch=multiline-test'
-  echo 'repo=repo'
+ 
+  echo 'branch=multiline-test'
+  echo 'repo=repo'
◎ Executing (--execute) @ _REPO_.multiline-test:
-  
-  echo 'branch=multiline-test'
-  echo 'repo=repo'
+ 
+  echo 'branch=multiline-test'
+  echo 'repo=repo'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap
index 0235d16fd..275e5166b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap
@@ -33,7 +33,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -62,9 +61,9 @@ branch=verbose-test
----- stderr -----
○ Expanding worktree-path
-  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
+  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
  →
-  _REPO_/../repo.verbose-test
+  _REPO_/../repo.verbose-test
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''branch={{ branch }}'\'''
✓ Created branch verbose-test from main and worktree @ _REPO_.verbose-test
@@ -72,8 +71,8 @@ branch=verbose-test
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
○ Expanding --execute command
-  echo 'branch={{ branch }}'
+  echo 'branch={{ branch }}'
  →
-  echo 'branch=verbose-test'
+  echo 'branch=verbose-test'
◎ Executing (--execute) @ _REPO_.verbose-test:
-  echo 'branch=verbose-test'
+  echo 'branch=verbose-test'
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 7dbb8ca6f..2de791353 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,5 +66,5 @@ exit 7'
✓ Created branch output-exit-test from main and worktree @ _REPO_.output-exit-test
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo 'doing work'
+  echo 'doing work'
  exit 7
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 67e60c349..91d53a86a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -67,5 +66,5 @@ echo '\''line2'\'''
✓ Created branch exec-internal from main and worktree @ _REPO_.exec-internal
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo 'line1'
-  echo 'line2'
+  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 2921da327..e0aec7e4d 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
@@ -33,7 +33,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -68,4 +67,4 @@ execute command runs
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.no-hooks-test:
-  echo 'execute command runs'
+  echo 'execute command runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
index 48cdddcef..d0ba80619 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
@@ -32,7 +32,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -65,4 +64,4 @@ execute still runs
▲ Worktree for existing-no-hooks @ _REPO_.existing-no-hooks, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.existing-no-hooks:
-  echo 'execute still runs'
+  echo 'execute still runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_powershell_stderr.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_powershell_stderr.snap
index 3760d15ca..b3a93f480 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_powershell_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_powershell_stderr.snap
@@ -35,7 +35,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -68,4 +67,4 @@ exit_code: 0
✓ Created branch exec-trailing-psh from main and worktree @ _REPO_.exec-trailing-psh
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo '$x''s hello' 'with space'
+  echo '$x''s hello' 'with space'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_stderr.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_stderr.snap
index 3afe275ac..02c322bf0 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_execute_trailing_args_metachars_stderr.snap
@@ -35,7 +35,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -50,6 +49,7 @@ info:
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -66,4 +66,4 @@ exit_code: 0
✓ Created branch exec-trailing from main and worktree @ _REPO_.exec-trailing
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
-  echo '$x'\''s hello' 'with space'
+  echo '$x'\''s hello' 'with space'
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap b/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap
index 886265e2f..5700db03a 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap
@@ -58,9 +58,9 @@ exit_code: 0
----- stderr -----
○ Expanding worktree-path
-  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
+  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
  →
-  _REPO_/../repo.feature
+  _REPO_/../repo.feature
◎ Removing feature worktree & branch in background (--force-delete)
▲ 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__hook_dry_run_named_hooks.snap b/tests/snapshots/integration__integration_tests__user_hooks__hook_dry_run_named_hooks.snap
index 32bbda1e6..d9b4b31fa 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__hook_dry_run_named_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__hook_dry_run_named_hooks.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,6 +57,6 @@ exit_code: 0
----- stderr -----
○ pre-merge project:lint would run:
-  pre-commit run --all-files
+  pre-commit run --all-files
○ pre-merge project:test would run:
  cargo test
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_background_dedup.snap b/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_background_dedup.snap
index 253723391..de5574fa2 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_background_dedup.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_background_dedup.snap
@@ -58,9 +58,9 @@ exit_code: 0
----- stderr -----
○ Expanding worktree-path
-  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
+  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
  →
-  _REPO_/../repo.feature
+  _REPO_/../repo.feature
✓ Created branch feature from main and worktree @ _REPO_.feature
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_variable_table.snap b/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_variable_table.snap
index 60de3faf7..a639dd15b 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_variable_table.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__hook_verbose_variable_table.snap
@@ -12,32 +12,43 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -46,9 +57,9 @@ exit_code: 0
----- stderr -----
○ Expanding user:noop
-  true
+  true
  →
-  true
+  true
○ template variables:
  branch = feature
  worktree_path = _REPO_.feature
@@ -73,10 +84,10 @@ exit_code: 0
  hook_type = pre-switch
  hook_name = noop
◎ Running pre-switch user:noop
-  true
+  true
○ Expanding worktree-path
-  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
+  {{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}
  →
-  _REPO_/../repo.feature
+  _REPO_/../repo.feature
▲ Worktree for feature @ _REPO_.feature, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install