Skip to content

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

Route --help output to stdout (#2155)

Maximilian Roos5279d1f67118
diff --git a/src/commands/config/show.rs b/src/commands/config/show.rs
index 33220ab13..3f5972913 100644
--- a/src/commands/config/show.rs
+++ b/src/commands/config/show.rs
@@ -80,8 +80,7 @@ pub fn handle_config_show(full: bool, format: SwitchFormat) -> anyhow::Result<()
// Display through pager (config show is always long-form output)
if let Err(e) = show_help_in_pager(&show_output, true) {
log::debug!("Pager invocation failed: {}", e);
- // Fall back to direct output via eprintln (matches help behavior)
- worktrunk::styling::eprintln!("{}", show_output);
+ worktrunk::styling::println!("{}", show_output);
}
Ok(())
diff --git a/src/commands/config/state.rs b/src/commands/config/state.rs
index 6ff07d789..a82321679 100644
--- a/src/commands/config/state.rs
+++ b/src/commands/config/state.rs
@@ -463,9 +463,9 @@ pub fn handle_logs_get(
let mut out = String::new();
render_all_log_sections(&mut out, &repo)?;
- // Display through pager (fall back to stderr if pager unavailable)
+ // Display through pager; fall back to direct stdout if pager unavailable
if show_help_in_pager(&out, true).is_err() {
- eprintln!("{}", out);
+ println!("{}", out);
}
}
Some(hook_spec) => {
@@ -1179,11 +1179,10 @@ fn handle_state_show_table(repo: &Repository) -> anyhow::Result<()> {
// Show log files
render_all_log_sections(&mut out, repo)?;
- // Display through pager (fall back to stderr if pager unavailable)
+ // Display through pager; fall back to direct stdout if pager unavailable
if let Err(e) = show_help_in_pager(&out, true) {
log::debug!("Pager invocation failed: {}", e);
- // Fall back to direct output via eprintln (matches help behavior)
- eprintln!("{}", out);
+ println!("{}", out);
}
Ok(())
diff --git a/src/commands/hook_commands.rs b/src/commands/hook_commands.rs
index 4b001da55..b1715ff0b 100644
--- a/src/commands/hook_commands.rs
+++ b/src/commands/hook_commands.rs
@@ -559,9 +559,9 @@ pub fn handle_hook_show(hook_type_filter: Option<&str>, expanded: bool) -> anyho
ctx.as_ref(),
)?;
- // Display through pager (fall back to stderr if pager unavailable)
+ // Display through pager; fall back to direct stdout if pager unavailable
if show_help_in_pager(&output, true).is_err() {
- worktrunk::styling::eprintln!("{}", output);
+ worktrunk::styling::println!("{}", output);
}
Ok(())
diff --git a/src/help.rs b/src/help.rs
index da655dcfc..8f9e4b90a 100644
--- a/src/help.rs
+++ b/src/help.rs
@@ -51,7 +51,7 @@ use ansi_str::AnsiStr;
use clap::ColorChoice;
use clap::error::ErrorKind;
use worktrunk::docs::convert_dollar_console_to_terminal;
-use worktrunk::styling::eprintln;
+use worktrunk::styling::{eprintln, println};
use crate::cli;
@@ -159,7 +159,7 @@ pub fn maybe_handle_help_with_pager() -> bool {
// use_pager=false for -h (short help), true for --help (long help)
if let Err(e) = crate::help_pager::show_help_in_pager(&help, use_pager) {
log::debug!("Pager invocation failed: {}", e);
- eprintln!("{}", help);
+ println!("{}", help);
}
process::exit(0);
}
diff --git a/src/help_pager.rs b/src/help_pager.rs
index 8d1c563bf..22101edbe 100644
--- a/src/help_pager.rs
+++ b/src/help_pager.rs
@@ -24,6 +24,7 @@
use std::io::{IsTerminal, Write};
use std::process::Stdio;
use worktrunk::shell_exec::ShellConfig;
+use worktrunk::styling::print;
use crate::pager::{git_config_pager, parse_pager_value};
@@ -66,41 +67,38 @@ fn detect_help_pager() -> Option<String> {
///
/// The `use_pager` flag controls whether to attempt pager display:
/// - `true` (--help): Uses pager when available and terminal is detected
-/// - `false` (-h): Always prints directly to stderr, never uses pager
+/// - `false` (-h): Always prints directly to stdout, never uses pager
///
/// This follows git's convention where `-h` never opens a pager (muscle-memory safe)
/// while `--help` uses a pager for longer content.
///
/// Even when `use_pager=true`, falls back to direct output if:
-/// - No pager configured (prints to stderr)
-/// - Neither stdout nor stderr is a TTY (prints to stderr)
-/// - Pager spawn fails (prints to stderr)
+/// - No pager configured (prints to stdout)
+/// - stdout is not a TTY (prints to stdout)
+/// - Pager spawn fails (prints to stdout)
///
-/// Note: All fallbacks output to stderr for consistency with pager behavior
-/// (which sends output to stderr via `>&2`). This ensures `config show`
-/// works correctly since stdout is reserved for data output.
+/// Help text goes to stdout — POSIX convention (`wt --help | less` should work
+/// without redirection), matching `cargo`, `curl`, `python`, `git <cmd> -h`,
+/// and `--version` (see #2072).
pub(crate) fn show_help_in_pager(help_text: &str, use_pager: bool) -> std::io::Result<()> {
// Short help (-h) never uses a pager
if !use_pager {
- log::debug!("Short help (-h) requested, printing directly to stderr");
- eprint!("{}", help_text);
+ log::debug!("Short help (-h) requested, printing directly to stdout");
+ print!("{}", help_text);
return Ok(());
}
let Some(pager_cmd) = detect_help_pager() else {
- log::debug!("No pager configured, printing help directly to stderr");
- eprint!("{}", help_text);
+ log::debug!("No pager configured, printing help directly to stdout");
+ print!("{}", help_text);
return Ok(());
};
- // Check if stdout OR stderr is a TTY
- // stdout check: direct invocation (cargo run -- --help)
- // stderr check: shell wrapper (wt --help) redirects stdout but preserves stderr
- let is_tty = std::io::stdout().is_terminal() || std::io::stderr().is_terminal();
-
- if !is_tty {
- log::debug!("Neither stdout nor stderr is a TTY, skipping pager");
- eprint!("{}", help_text);
+ // Only page when our output destination is a terminal.
+ // If stdout is piped/redirected (e.g., `wt --help | grep foo`), print directly.
+ if !std::io::stdout().is_terminal() {
+ log::debug!("stdout is not a TTY, skipping pager");
+ print!("{}", help_text);
return Ok(());
}
@@ -108,24 +106,19 @@ pub(crate) fn show_help_in_pager(help_text: &str, use_pager: bool) -> std::io::R
let less_flags = compute_less_flags(std::env::var("LESS").ok().as_deref());
- // Always send pager output to stderr (standard for help text, like git)
- // This works in all cases: direct invocation, shell wrapper, piping, etc.
- // Note: pager_cmd is expected to be valid shell code (like git's core.pager).
- // Users with paths containing special chars must quote them in their config.
- let final_cmd = format!("{} >&2", pager_cmd);
-
- // Spawn pager with TTY access (interactive, unlike detached diff renderer)
+ // Spawn pager with TTY access (interactive, unlike detached diff renderer).
+ // Pager output inherits our stdout — no redirection needed.
// Falls back to direct output if pager unavailable (e.g., less not installed)
let shell = match ShellConfig::get() {
Ok(shell) => shell,
Err(e) => {
log::debug!("Shell unavailable for pager: {}", e);
- eprint!("{}", help_text);
+ print!("{}", help_text);
return Ok(());
}
};
log::debug!("$ {} (pager)", pager_cmd);
- let mut cmd = shell.command(&final_cmd);
+ let mut cmd = shell.command(&pager_cmd);
worktrunk::shell_exec::scrub_directive_env_vars(&mut cmd);
let mut child = match cmd.stdin(Stdio::piped()).env("LESS", &less_flags).spawn() {
Ok(child) => child,
@@ -136,7 +129,7 @@ pub(crate) fn show_help_in_pager(help_text: &str, use_pager: bool) -> std::io::R
shell.name,
e
);
- eprint!("{}", help_text);
+ print!("{}", help_text);
return Ok(());
}
};
diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rs
index 4fdb83717..3162629c9 100644
--- a/tests/integration_tests/config_show.rs
+++ b/tests/integration_tests/config_show.rs
@@ -248,16 +248,16 @@ my-lint = "my-lint-tool"
String::from_utf8_lossy(&output.stderr)
);
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
// Both hooks should be present (deep merge preserves differently-named keys)
assert!(
- stderr.contains("company-lint-tool"),
- "System hook should be preserved with different name, got:\n{stderr}"
+ stdout.contains("company-lint-tool"),
+ "System hook should be preserved with different name, got:\n{stdout}"
);
assert!(
- stderr.contains("my-lint-tool"),
- "User hook should be present, got:\n{stderr}"
+ stdout.contains("my-lint-tool"),
+ "User hook should be present, got:\n{stdout}"
);
}
@@ -300,16 +300,16 @@ lint = "my-lint-tool"
String::from_utf8_lossy(&output.stderr)
);
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
// User's command should replace system's for the same name
assert!(
- stderr.contains("my-lint-tool"),
- "User's hook command should be present, got:\n{stderr}"
+ stdout.contains("my-lint-tool"),
+ "User's hook command should be present, got:\n{stdout}"
);
assert!(
- !stderr.contains("company-lint-tool"),
- "System's hook command should be replaced by user's same-named hook, got:\n{stderr}"
+ !stdout.contains("company-lint-tool"),
+ "System's hook command should be replaced by user's same-named hook, got:\n{stdout}"
);
}
@@ -355,10 +355,10 @@ my-lint = "my-lint-tool"
String::from_utf8_lossy(&output.stderr)
);
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
assert!(
- stderr.contains("company-format-tool"),
- "System's pre-commit hook should be preserved when user doesn't override it, got:\n{stderr}"
+ stdout.contains("company-format-tool"),
+ "System's pre-commit hook should be preserved when user doesn't override it, got:\n{stdout}"
);
}
@@ -382,18 +382,18 @@ fn test_config_show_system_config_hint_under_user_config(repo: TestRepo, temp_ho
cmd.arg("config").arg("show").current_dir(repo.root_path());
let output = cmd.output().unwrap();
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
// Should NOT show a full SYSTEM CONFIG heading
assert!(
- !stderr.contains("SYSTEM CONFIG"),
- "Should not show SYSTEM CONFIG section when absent, got:\n{stderr}"
+ !stdout.contains("SYSTEM CONFIG"),
+ "Should not show SYSTEM CONFIG section when absent, got:\n{stdout}"
);
// Should show a system config hint under USER CONFIG
assert!(
- stderr.contains("Optional system config not found")
- && stderr.contains("worktrunk/config.toml"),
- "Expected system config hint in output, got:\n{stderr}"
+ stdout.contains("Optional system config not found")
+ && stdout.contains("worktrunk/config.toml"),
+ "Expected system config hint in output, got:\n{stdout}"
);
}
@@ -891,10 +891,10 @@ if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)
let output = cmd.output().unwrap();
assert!(output.status.success());
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
assert!(
- stderr.contains("Completions won't work; add to"),
- "Expected compinit warning, got:\n{stderr}"
+ stdout.contains("Completions won't work; add to"),
+ "Expected compinit warning, got:\n{stdout}"
);
});
}
@@ -940,10 +940,10 @@ if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)
let output = cmd.output().unwrap();
assert!(output.status.success());
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
assert!(
- !stderr.contains("Completions won't work; add to"),
- "Expected no compinit warning, got:\n{stderr}"
+ !stdout.contains("Completions won't work; add to"),
+ "Expected no compinit warning, got:\n{stdout}"
);
});
}
diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rs
index f27c88667..6d18c6bbb 100644
--- a/tests/integration_tests/config_state.rs
+++ b/tests/integration_tests/config_state.rs
@@ -533,16 +533,7 @@ fn test_state_get_logs_empty(repo: TestRepo) {
let output = wt_state_cmd(&repo, "logs", "get", &[]).output().unwrap();
assert!(output.status.success());
state_get_settings().bind(|| {
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"
- COMMAND LOG @ <PATH>
-   (none)
-
- HOOK OUTPUT @ <PATH>
-   (none)
-
- DIAGNOSTIC @ <PATH>
-   (none)
- ");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"");
});
}
@@ -572,7 +563,7 @@ fn test_state_get_logs_with_files(repo: TestRepo) {
// File sizes and ages vary across environments
settings.add_filter(r"(?m)\d+[BK]\s+\S+[ \t]*$", "<SIZE> <AGE>");
settings.bind(|| {
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"
+ assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"
COMMAND LOG @ <PATH>
File Size Age
────────────── ──── ──────
@@ -602,16 +593,7 @@ fn test_state_get_logs_dir_exists_no_log_files(repo: TestRepo) {
let output = wt_state_cmd(&repo, "logs", "get", &[]).output().unwrap();
assert!(output.status.success());
state_get_settings().bind(|| {
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"
- COMMAND LOG @ <PATH>
-   (none)
-
- HOOK OUTPUT @ <PATH>
-   (none)
-
- DIAGNOSTIC @ <PATH>
-   (none)
- ");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"");
});
}
@@ -629,21 +611,21 @@ fn test_state_get_logs_diagnostic_files(repo: TestRepo) {
let output = wt_state_cmd(&repo, "logs", "get", &[]).output().unwrap();
assert!(output.status.success());
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
// Diagnostic files appear under DIAGNOSTIC, not HOOK OUTPUT
- assert!(stderr.contains("DIAGNOSTIC"), "Expected DIAGNOSTIC heading");
+ assert!(stdout.contains("DIAGNOSTIC"), "Expected DIAGNOSTIC heading");
assert!(
- stderr.contains("verbose.log"),
+ stdout.contains("verbose.log"),
"Expected verbose.log in output"
);
assert!(
- stderr.contains("diagnostic.md"),
+ stdout.contains("diagnostic.md"),
"Expected diagnostic.md in output"
);
// Hook output should have the remove log but not the diagnostic files
- let hook_section = stderr
+ let hook_section = stdout
.split("DIAGNOSTIC")
.next()
.unwrap()
@@ -899,34 +881,7 @@ fn test_state_get_empty(repo: TestRepo) {
let output = wt_state_get_cmd(&repo).output().unwrap();
assert!(output.status.success());
state_get_settings().bind(|| {
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"
- DEFAULT BRANCH
-   main
-
- PREVIOUS BRANCH
-   (none)
-
- BRANCH MARKERS
-   (none)
-
- VARS
-   (none)
-
- CI STATUS CACHE
-   (none)
-
- HINTS
-   (none)
-
- COMMAND LOG @ <PATH>
-   (none)
-
- HOOK OUTPUT @ <PATH>
-   (none)
-
- DIAGNOSTIC @ <PATH>
-   (none)
- ");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"");
});
}
@@ -960,7 +915,7 @@ fn test_state_get_with_ci_entries(repo: TestRepo) {
let output = wt_state_get_cmd(&repo).output().unwrap();
assert!(output.status.success());
state_get_settings().bind(|| {
- assert_snapshot!(String::from_utf8_lossy(&output.stderr));
+ assert_snapshot!(String::from_utf8_lossy(&output.stdout));
});
}
@@ -1027,7 +982,7 @@ fn test_state_get_comprehensive(repo: TestRepo) {
let output = wt_state_get_cmd(&repo).output().unwrap();
assert!(output.status.success());
state_get_settings().bind(|| {
- assert_snapshot!(String::from_utf8_lossy(&output.stderr));
+ assert_snapshot!(String::from_utf8_lossy(&output.stdout));
});
}
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index cf8ac25f0..7aa5fc970 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -1988,9 +1988,9 @@ fn test_config_show_detects_nushell_integration(mut repo: TestRepo, temp_home: T
cmd.args(["config", "show"]).current_dir(repo.root_path());
let output = cmd.output().expect("Failed to execute config show");
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
assert!(
- stderr.contains("wt.nu") || stderr.contains("nushell"),
- "config show should detect nushell integration:\n{stderr}"
+ stdout.contains("wt.nu") || stdout.contains("nushell"),
+ "config show should detect nushell integration:\n{stdout}"
);
}
diff --git a/tests/integration_tests/help.rs b/tests/integration_tests/help.rs
index 559d515ef..594ee886d 100644
--- a/tests/integration_tests/help.rs
+++ b/tests/integration_tests/help.rs
@@ -27,9 +27,9 @@ fn snapshot_help(test_name: &str, args: &[&str]) {
// Double blanks indicate formatting issues (e.g., HTML comments like
// `<!-- demo: file.gif -->` with blank lines on both sides).
let output = cmd.output().expect("failed to run command");
- let stderr = String::from_utf8_lossy(&output.stderr);
+ let stdout = String::from_utf8_lossy(&output.stdout);
assert!(
- !stderr.contains("\n\n\n"),
+ !stdout.contains("\n\n\n"),
"Double blank line in help output for `wt {}`",
args.join(" ")
);
@@ -110,6 +110,50 @@ fn test_version() {
});
}
+/// `--help` must write to stdout, not stderr. POSIX convention — matches
+/// `cargo`, `curl`, `python`, and `git <cmd> -h`. Lets users do
+/// `wt --help | less` or `wt --help > help.txt` without redirection.
+#[test]
+fn test_help_goes_to_stdout() {
+ for args in [&["--help"][..], &["-h"][..], &["merge", "--help"][..]] {
+ let output = wt_command()
+ .args(args)
+ .output()
+ .unwrap_or_else(|e| panic!("failed to run wt {args:?}: {e}"));
+
+ let stdout = String::from_utf8_lossy(&output.stdout);
+ let stderr = String::from_utf8_lossy(&output.stderr);
+
+ assert!(
+ stdout.contains("Usage:"),
+ "wt {args:?} should write help to stdout, but stdout was: {stdout:?} (stderr: {stderr:?})"
+ );
+ assert!(
+ stderr.trim().is_empty(),
+ "wt {args:?} should not write to stderr, but stderr was: {stderr:?}"
+ );
+ }
+}
+
+/// When stdout is piped, help must be plain text — no ANSI escapes leaking into
+/// `wt --help > file.txt` or `wt --help | less`. Uses the raw binary so
+/// `CLICOLOR_FORCE` (set by `wt_command`) doesn't override color detection.
+#[test]
+fn test_help_strips_ansi_when_piped() {
+ let output = std::process::Command::new(env!("CARGO_BIN_EXE_wt"))
+ .arg("--help")
+ .env_remove("CLICOLOR_FORCE")
+ .env("NO_COLOR", "1")
+ .output()
+ .expect("failed to run wt --help");
+
+ let stdout = String::from_utf8_lossy(&output.stdout);
+ assert!(
+ !stdout.contains('\x1b'),
+ "wt --help piped to a file must not contain ANSI escapes; got: {stdout:?}"
+ );
+}
+
/// `--version` must write to stdout, not stderr. This is the POSIX convention
/// and what scripts expect — e.g., `version=$(wt --version)` or test harnesses
/// that grep for a version string from stdout. See #2072.
diff --git a/tests/integration_tests/output_system_guard.rs b/tests/integration_tests/output_system_guard.rs
index 63d93f3c4..29a1070f0 100644
--- a/tests/integration_tests/output_system_guard.rs
+++ b/tests/integration_tests/output_system_guard.rs
@@ -1,14 +1,16 @@
//! Guard test to prevent stdout leaks in command code
//!
-//! stdout is reserved for data output (e.g., JSON). User-visible messages go to stderr.
-//! When shell integration is active (directive env vars set), directives are written
-//! to files, not stdout.
+//! stdout carries content the user may want to pipe, redirect, or capture:
+//! data (JSON, tables), rendered views (`wt config show`, `wt hook show`),
+//! and shell integration output. Interactive status, progress, and errors
+//! go to stderr. When shell integration is active (directive env vars set),
+//! directives are written to files, not stdout.
//!
//! This test enforces: **No accidental stdout writes in command code**
//!
//! Allowed:
//! - `eprintln!` / `eprint!` (stderr is safe)
-//! - `println!` / `print!` in files listed in `STDOUT_ALLOWED_PATHS` (data output)
+//! - `println!` / `print!` in files listed in `STDOUT_ALLOWED_PATHS`
//!
//! When adding stdout output:
//! - Use `worktrunk::styling::println` for color-aware output
@@ -48,6 +50,8 @@ const STDOUT_ALLOWED_PATHS: &[&str] = &[
"for_each.rs",
// JSON output for wt merge --format=json
"merge.rs",
+ // Hook listing output for wt hook show (paged)
+ "hook_commands.rs",
];
/// Substrings that indicate the line is a special case (e.g., in a comment or test reference)
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap
index f7a98d10f..07157d209 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_always_regenerates_migration_file.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
@@ -73,3 +71,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap
index cd0c047b9..a5d705ee0 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -68,3 +66,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap
index 53899e278..0e90950da 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config: template variable repo_root is deprecated in favor of repo_path
▲ User config: template variable main_worktree is deprecated in favor of repo
@@ -77,3 +75,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap
index 9ee789ad3..0dc122f2d 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config: switch.no-cd is deprecated in favor of switch.cd (inverted)
↳ To apply: wt config update
@@ -74,3 +72,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap
index 3674f2447..78c4b3ff5 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config: merge.no-ff is deprecated in favor of merge.ff (inverted)
↳ To apply: wt config update
@@ -74,3 +72,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_pre_hook_table_form_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_pre_hook_table_form_deprecation.snap
index 5e8158de5..e9d32f537 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_pre_hook_table_form_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_pre_hook_table_form_deprecation.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
@@ -83,3 +81,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap
index 9513313f8..df2046864 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config: [projects."github.com/example/repo".commit-generation] is deprecated in favor of [projects."github.com/example/repo".commit.generation]
↳ To apply: wt config update
@@ -76,3 +74,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap
index 9dd89e84a..e4e8ba97c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config: [select] is deprecated in favor of [switch.picker]
↳ To apply: wt config update
@@ -74,3 +72,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap
index 831a3a2aa..e20c0ad4b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap
index 724dd69b5..3d2502c22 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
SYSTEM CONFIG @ [PROJECT_ID]
↳ Empty file (no system defaults)
@@ -66,3 +64,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap
index 1e5dd37af..106e0b5c3 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 683fa88ce..ddd1cf73d 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
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -66,3 +64,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 bc38c4fae..55b68efd9 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
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -67,3 +65,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap
index 487c204ee..67b12a8dd 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_from_linked_worktree_shows_main_worktree_hint.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
@@ -65,3 +63,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
index f76319808..817f2f77f 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
@@ -34,7 +34,7 @@ info:
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
- WORKTRUNK_TEST_LATEST_VERSION: 0.34.1
+ WORKTRUNK_TEST_LATEST_VERSION: 0.36.0
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -44,8 +44,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
 
@@ -78,3 +76,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
index 147d6744c..458e727bd 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
@@ -34,7 +34,7 @@ info:
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
- WORKTRUNK_TEST_LATEST_VERSION: 0.34.1
+ WORKTRUNK_TEST_LATEST_VERSION: 0.36.0
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -44,8 +44,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -71,3 +69,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap
index cfab2e581..01a1dd486 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap
@@ -44,8 +44,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -71,3 +69,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap
index 252041463..7626fda5c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap
@@ -44,8 +44,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -71,3 +69,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap
index ecef0eeb8..5caa960e8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap
index ecef0eeb8..5caa960e8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap
index a534ef295..a11e6f54c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -70,3 +68,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap
index 56000697e..e72752661 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
SYSTEM CONFIG @ [PROJECT_ID]
✗ Invalid config
  TOML parse error at line 1, column 16
@@ -72,3 +70,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap
index 77a31c778..c9300e438 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_user_toml.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
✗ Invalid config
  TOML parse error at line 1, column 6
@@ -70,3 +68,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
index ecef0eeb8..5caa960e8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap
index 34210f397..4a381fa82 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_user_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
@@ -63,3 +61,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap
index eb17371b2..4c781f8c5 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap
index 7847f3338..c3a5ce2fb 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -67,3 +65,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap
index 52d4e08f3..e9193dd47 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -67,3 +65,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap
index 8dbeee701..7fdfd379c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -67,3 +65,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
index 6956f2e6b..6ff0e0c8c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
@@ -37,8 +37,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -58,3 +56,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 12876d4c4..dbd13e5a5 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
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -67,3 +65,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap
index 189366947..c474016e4 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -68,3 +66,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 f7d2a5197..07cdd6613 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
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -66,3 +64,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap
index bb50673fb..bdc71fed8 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap
index c21dd30f4..f218c60a6 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap
index 46f5b02a3..f9d31a46b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -68,3 +66,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap
index 38ef6b59c..f518d67d5 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ User config: [ci] is deprecated in favor of [forge]
↳ To apply: wt config update
@@ -79,3 +77,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap
index c0964e144..fd801ee8a 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -77,3 +75,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 d7abc4226..c9a4c042e 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
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -69,3 +67,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 50d2cb695..73fd3e12d 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
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -68,3 +66,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
index 5d508010a..c058751c7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -66,3 +64,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
index 8538d95f5..7bf810f4e 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
▲ Unknown key commit-gen will be ignored
  worktree-path = "../{{ repo }}.{{ branch }}"
@@ -68,3 +66,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
index 831a3a2aa..e20c0ad4b 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -64,3 +62,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
index 417fab43f..e9839fff4 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
@@ -76,3 +74,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap
index bd0cdd637..c1f4f75e7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
SYSTEM CONFIG @ [PROJECT_ID]
  [merge]
  squash = true
@@ -71,3 +69,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 c9267991a..b344260c8 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
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -66,3 +64,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
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 10a3c07c3..8abc901b5 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Empty file (using defaults)
@@ -68,3 +66,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap b/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
index 5635ed6f9..074369682 100644
--- a/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
+++ b/tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap
@@ -1,6 +1,6 @@
---
source: tests/integration_tests/config_state.rs
-expression: "String::from_utf8_lossy(&output.stderr)"
+expression: "String::from_utf8_lossy(&output.stdout)"
---
DEFAULT BRANCH
  main
diff --git a/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap b/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
index 529d418db..421d82227 100644
--- a/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
+++ b/tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap
@@ -1,6 +1,6 @@
---
source: tests/integration_tests/config_state.rs
-expression: "String::from_utf8_lossy(&output.stderr)"
+expression: "String::from_utf8_lossy(&output.stdout)"
---
DEFAULT BRANCH
  main
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap b/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap
index 0722a146e..bf84ff84c 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__config_show_detects_fish_legacy_conf_d.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
@@ -65,3 +63,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap b/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap
index c9c83fac0..fb6146b51 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__config_show_fish_legacy_with_functions_dir.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER CONFIG @ ~/.config/worktrunk/config.toml
↳ Not found; to create one, run wt config create
@@ -65,3 +63,5 @@ exit_code: 0
○ wt: [VERSION]
○ git: [VERSION]
○ Hyperlinks: inactive
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index e9154ea9c..f232f521a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -31,8 +31,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config create - Create configuration file
Usage: wt config create [OPTIONS]
@@ -359,3 +357,5 @@ With --project, creates .config/wt.toml in the current repositor
  # url = "echo http://localhost:{{ branch | hash_port }}"
  #
  # Aliases defined here are shared with teammates. For personal aliases, use the user config (https://worktrunk.dev/config/#aliases) `[aliases]` section instead.
+
+----- stderr -----
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 b43d78281..52464affd 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config - Manage user & project configs
Includes shell integration, hooks, and saved state.
@@ -450,4 +448,6 @@ Override the LLM command in CI to use a mock:
WORKTRUNK_SHELL Internal: set by shell wrappers to indicate shell type (e.g., powershell)
WORKTRUNK_MAX_CONCURRENT_COMMANDS Max parallel git commands (default: 32). Lower if hitting file descriptor limits.
NO_COLOR Disable colored output (standard)
- CLICOLOR_FORCE Force colored output even when not a TTY
+ CLICOLOR_FORCE Force colored output even when not a TTY
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
index df47cb5c1..adf0fd18d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
@@ -31,8 +31,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config shell - Shell integration setup
Usage: wt config shell [OPTIONS] <COMMAND>
@@ -50,3 +48,5 @@ Usage: wt config shell [OPTIONS] <COMMAND>
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_short.snap b/tests/snapshots/integration__integration_tests__help__help_config_short.snap
index 6a81df18f..2a4da7f36 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_short.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config - Manage user & project configs
Usage: wt config [OPTIONS] <COMMAND>
@@ -51,3 +49,5 @@ Usage: wt config [OPTIONS] <COMMAND>
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
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 afd9ae6fa..d39797ecf 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_show.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
@@ -31,8 +31,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config show - Show configuration files & locations
Usage: wt config show [OPTIONS]
@@ -79,3 +77,5 @@ This tests:
- CI tool status — Whether gh (GitHub) or glab (GitLab) is installed and authenticated
- Commit generation — Whether the LLM command can generate commit messages
- Version check — Whether a newer version is available on GitHub
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state.snap b/tests/snapshots/integration__integration_tests__help__help_config_state.snap
index 5d7d3b733..319fd7dc6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state.snap
@@ -31,8 +31,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state - Manage internal data and cache
Usage: wt config state [OPTIONS] <COMMAND>
@@ -95,3 +93,5 @@ Show all stored state:
Clear all stored state:
  wt config state clear
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
index 5eec3a23a..7fbd7cbfa 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state ci-status - CI status cache
Usage: wt config state ci-status [OPTIONS] [COMMAND]
@@ -82,3 +80,5 @@ Results cache for 30-60 seconds. Indicators dim when local changes haven't been
See wt list CI status for display symbols and colors.
Without a subcommand, runs get for the current branch. Use clear to reset cache for a branch or clear --all to reset all.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
index a33ca9a77..0c5c0f6c4 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state clear - Clear all stored state
Usage: wt config state clear [OPTIONS]
@@ -65,3 +63,5 @@ Clears all stored state:
Use individual subcommands (default-branch clear, ci-status clear --all, etc.)
to clear specific state.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap
index 81228e2a4..cd5090502 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state default-branch - Default branch detection and override
Usage: wt config state default-branch [OPTIONS] [COMMAND]
@@ -79,3 +77,5 @@ The local inference fallback uses these heuristics in order:
- For bare repos or empty repos, checks symbolic-ref HEAD
- Checks git config init.defaultBranch
- Looks for common names: main, master, develop, trunk
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
index fae7ab427..fa5e3777a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state get - Get all stored state
Usage: wt config state get [OPTIONS]
@@ -68,3 +66,5 @@ Shows all stored state including:
- Log files: Operation and debug logs
CI cache entries show status, age, and the commit SHA they were fetched for.
+
+----- stderr -----
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 d71c2f9cb..8acdcc6ed 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
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state logs - Operation and debug logs
Usage: wt config state logs [OPTIONS] [COMMAND]
@@ -118,3 +116,5 @@ View a specific hook log:
Clear all logs:
  wt config state logs clear
+
+----- stderr -----
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 b17a2dd3b..bde2c488a 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
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state marker - Branch markers
Usage: wt config state marker [OPTIONS] [COMMAND]
@@ -82,3 +80,5 @@ Stored in git config as worktrunk.state.<branch>.marker. Set directly wi
  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.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap
index 57437d346..ec378a043 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt config state previous-branch - Previous branch (for wt switch -)
Usage: wt config state previous-branch [OPTIONS] [COMMAND]
@@ -64,3 +62,5 @@ Enables wt switch - to return to the previous worktree, similar to c
Updated automatically on every wt switch. Stored in git config as worktrunk.history.
Without a subcommand, runs get. Use set to override or clear to reset.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_hook_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_hook_approvals.snap
index b8aba6629..375c27821 100644
--- a/tests/snapshots/integration__integration_tests__help__help_hook_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_hook_approvals.snap
@@ -31,8 +31,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt hook approvals - Manage command approvals
Usage: wt hook approvals [OPTIONS] <COMMAND>
@@ -71,3 +69,5 @@ Clear global approvals:
How approvals work
Approved commands are saved to ~/.config/worktrunk/approvals.toml. Re-approval is required when the command template changes or the project moves. Use --yes to bypass prompts in CI.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snap b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snap
index b290ca0a2..ed71b2548 100644
--- a/tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt hook approvals add - Store approvals in approvals.toml
Usage: wt hook approvals add [OPTIONS]
@@ -59,3 +57,5 @@ Prompts for approval of all project commands and saves them to approvals.toml.
By default, shows only unapproved commands. Use --all to review all commands
including previously approved ones.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snap b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snap
index 94ffa4cdc..25770ec9a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snap
@@ -32,8 +32,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt hook approvals clear - Clear approved commands from approvals.toml
Usage: wt hook approvals clear [OPTIONS]
@@ -59,3 +57,5 @@ Removes saved approvals, requiring re-approval on next command run.
By default, clears approvals for the current project. Use --global to clear
all approvals across all projects.
+
+----- stderr -----
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 e84628eab..b94b513c9 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt list - List worktrees and their status
Usage: wt list [OPTIONS]
@@ -309,3 +307,5 @@ Missing a field that would be generally useful? Open an issue at https://github.
See also
- wt switch — Switch worktrees or open interactive picker
+
+----- stderr -----
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 e9ff89485..31056f06b 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
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt list - List worktrees and their status
Usage: wt list [OPTIONS]
@@ -347,3 +345,5 @@ https://github.com/max-sixty/worktrunk.
See also
- wt switch — Switch worktrees or open interactive picker
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
index bab99a7ba..4e14c9fd1 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt list - List worktrees and their status
Usage: wt list [OPTIONS]
@@ -52,3 +50,5 @@ Usage: wt list [OPTIONS]
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
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 b9be4b1a0..4825ce7b5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt merge - Merge current branch into the target branch
Squash & rebase, fast-forward the target branch, remove the worktree.
@@ -161,3 +159,5 @@ The full workflow: start an agent (one of many) on a task, work elsewhere, retur
- wt step — Run individual operations (commit, squash, rebase, push)
- wt remove — Remove worktrees without merging
- wt switch — Navigate to other worktrees
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
index b3369551f..a8c945052 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt merge - Merge current branch into the target branch
Usage: wt merge [OPTIONS] [TARGET]
@@ -57,3 +55,5 @@ Usage: wt merge [OPTIONS] [TARGET]
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_no_args.snap b/tests/snapshots/integration__integration_tests__help__help_no_args.snap
index 4feaf6ba0..5d1e60c9a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_no_args.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_no_args.snap
@@ -28,8 +28,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt - Git worktree management for parallel AI agent workflows
Usage: wt [OPTIONS] [COMMAND]
@@ -51,3 +49,5 @@ Usage: wt [OPTIONS] [COMMAND]
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
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 b7f74270b..5347c8b66 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt remove - Remove worktree; delete branch if merged
Defaults to the current worktree.
@@ -157,3 +155,5 @@ Detached worktrees have no branch name. Pass the worktree path instead: wt r
- wt merge — Remove worktree after merging
- wt list — View all worktrees
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
index 1e9200302..78e45e812 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt remove - Remove worktree; delete branch if merged
Usage: wt remove [OPTIONS] [BRANCHES]...
@@ -55,3 +53,5 @@ Usage: wt remove [OPTIONS] [BRANCHES]...
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_long.snap b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
index 6e80fff48..4f4bafaf6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
@@ -29,8 +29,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt - Git worktree management for parallel AI agent workflows
Usage: wt [OPTIONS] [COMMAND]
@@ -73,3 +71,5 @@ Run wt config create to customize worktree locations.
Docs: https://worktrunk.dev
GitHub: https://github.com/max-sixty/worktrunk
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_short.snap b/tests/snapshots/integration__integration_tests__help__help_root_short.snap
index f085f2ce2..3d24eef66 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_short.snap
@@ -29,8 +29,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt - Git worktree management for parallel AI agent workflows
Usage: wt [OPTIONS] [COMMAND]
@@ -52,3 +50,5 @@ Usage: wt [OPTIONS] [COMMAND]
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
index 9fcf7434b..9ffe21760 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt step - Run individual operations
The building blocks of wt merge — commit, squash, rebase, push — plus standalone utilities.
@@ -150,3 +148,5 @@ When defined in both user and project config, both run — user first, then proj
Inside an alias body, an inner wt switch (or wt switch --create) passes its cd through to the parent shell, so an alias wrapping wt switch --create lands the shell in the new worktree just like running it directly.
Alias names that match a built-in step command (commit, squash, etc.) are shadowed by the built-in and will never run.
+
+----- stderr -----
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 3b8b78d59..9e74fb05c 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
@@ -31,8 +31,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt step promote - [experimental] Swap a branch into the main worktree
Exchanges branches and gitignored files between two worktrees.
@@ -92,3 +90,5 @@ Without an argument, promotes the current branch — or restores the default bra
Gitignored files (build artifacts, node_modules/, .env) are swapped along with the branches so each worktree keeps the artifacts that belong to its branch. Files are discovered using the same mechanism as copy-ignored and can be filtered with .worktreeinclude.
The swap uses rename() for each entry — fast regardless of entry size, since only filesystem metadata changes. If the worktree is on a different filesystem from .git/, it falls back to reflink copy.
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_short.snap b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
index 356271738..cd1d64fe9 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt step - Run individual operations
Usage: wt step [OPTIONS] <COMMAND>
@@ -56,3 +54,5 @@ Usage: wt step [OPTIONS] <COMMAND>
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
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 04a0796eb..01edf1a55 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt switch - Switch to a worktree; create if needed
Usage: wt switch [OPTIONS] [BRANCH] [-- <EXECUTE_ARGS>...]
@@ -221,3 +219,5 @@ To change which branch a worktree is on, use git switch inside that work
- wt list — View all worktrees
- wt remove — Delete worktrees when done
- wt merge — Integrate changes back to the default branch
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
index d36e725b1..bf3a6e39e 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
@@ -30,8 +30,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt switch - Switch to a worktree; create if needed
Usage: wt switch [OPTIONS] [BRANCH] [-- <EXECUTE_ARGS>...]
@@ -61,3 +59,5 @@ Usage: wt switch [OPTIONS] [BRANCH] [--
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
index 1ca11a714..fc30e68bb 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ ~/.config/worktrunk/config.toml
↳ (none configured)
@@ -52,3 +50,5 @@ exit_code: 0
  cargo build
❯ pre-merge test: (requires approval)
  cargo test
+
+----- stderr -----
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 07388d5bc..581aee256 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
@@ -44,8 +44,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
@@ -53,3 +51,5 @@ exit_code: 0
❯ pre-commit broken: (requires approval)
  # 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 ba9def503..67479a0ba 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
@@ -44,8 +44,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
@@ -53,3 +51,5 @@ exit_code: 0
❯ pre-commit optional-var: (requires approval)
  # Failed to expand hook preview: undefined value @ line 1
  echo {{ base }}
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap
index 48bd2c967..006e284d6 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_expanded_valid_template.snap
@@ -44,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-commit valid: (requires approval)
  echo branch=main repo=repo
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap
index 4c41be514..8af8f7449 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap
@@ -43,8 +43,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
@@ -53,3 +51,5 @@ exit_code: 0
  cargo build
❯ pre-merge test: (requires approval)
  cargo test
+
+----- 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 20c60acbf..be2cc3f1b 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
@@ -43,11 +43,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-merge deploy: (requires approval)
  scripts/deploy.sh
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap
index 007127c97..3659ca463 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_post_remove.snap
@@ -43,11 +43,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ post-remove notify: (requires approval)
  echo removed
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap
index d537b8b61..d95a4e01e 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_pre_remove.snap
@@ -43,11 +43,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
PROJECT HOOKS @ _REPO_/.config/wt.toml
❯ pre-remove cleanup: (requires approval)
  echo cleanup
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap
index 7290a40f8..b1835b1c2 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap
@@ -42,10 +42,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
PROJECT HOOKS @ _REPO_/.config/wt.toml
↳ (not found)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap
index 45f15fb48..8e7b8a532 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_project_config_no_hooks.snap
@@ -42,10 +42,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
PROJECT HOOKS @ _REPO_/.config/wt.toml
↳ (none configured)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap
index 82864d0ce..65ff2c03c 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
USER HOOKS @ [TEST_CONFIG]
↳ (none configured)
@@ -54,3 +52,5 @@ exit_code: 0
  cargo build
❯ pre-merge test: (requires approval)
  cargo test
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap
index f29aac4c0..06d747474 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap
@@ -42,8 +42,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt step - Run individual operations
Usage: wt step [OPTIONS] <COMMAND>
@@ -71,3 +69,5 @@ Usage: wt step [OPTIONS] <COMMAND>
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap
index 3ab0dddca..97357a4fa 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap
@@ -41,8 +41,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt step - Run individual operations
Usage: wt step [OPTIONS] <COMMAND>
@@ -67,3 +65,5 @@ Usage: wt step [OPTIONS] <COMMAND>
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap
index b6e60b56f..31b122988 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap
@@ -41,8 +41,6 @@ info:
success: true
exit_code: 0
----- stdout -----
-
------ stderr -----
wt step - Run individual operations
Usage: wt step [OPTIONS] <COMMAND>
@@ -72,3 +70,5 @@ Usage: wt step [OPTIONS] <COMMAND>
-C <path> Working directory for this command
--config <path> User config file path
-v, --verbose... Verbose output (-v: info logs + hook/template output; -vv: debug logs + diagnostic report; -vvv: trace logs)
+
+----- stderr -----