Skip to content

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

Introduce new output functions and consistent emoji use

Maximilian Roosb718f5903484
diff --git a/CLAUDE.md b/CLAUDE.md
index 4291951dc..334ebf31e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -527,13 +527,22 @@ output::execute("git pull")?;
The output module (`src/output/global.rs`) provides these functions:
-- `success(message)` - Emit success messages (both modes)
-- `progress(message)` - Emit progress updates (interactive only, suppressed in directive)
+- `success(message)` - Emit success messages (βœ…, both modes)
+- `progress(message)` - Emit progress updates (πŸ”„, both modes)
+- `info(message)` - Emit info messages (βšͺ, both modes)
+- `warning(message)` - Emit warning messages (🟑, both modes)
+- `hint(message)` - Emit hint messages (πŸ’‘, interactive only, suppressed in directive)
- `change_directory(path)` - Request directory change (directive) or store for execution (interactive)
- `execute(command)` - Execute command (interactive) or emit directive (directive mode)
-- `command_output(stdout, stderr)` - Display output from external commands
- `flush()` - Flush output buffers
+**When to use each function:**
+- `success()` - Successful completion (e.g., "βœ… Committed changes")
+- `progress()` - Operations in progress (e.g., "πŸ”„ Squashing commits...")
+- `info()` - Neutral status/metadata (e.g., "βšͺ No changes detected")
+- `warning()` - Non-blocking issues (e.g., "🟑 Uncommitted changes detected")
+- `hint()` - Actionable suggestions for users (e.g., "πŸ’‘ Run 'wt config help'")
+
For the complete API, see `src/output/global.rs`.
### Adding New Output Functions
diff --git a/src/commands/dev.rs b/src/commands/dev.rs
index 692252c8d..adda95bf7 100644
--- a/src/commands/dev.rs
+++ b/src/commands/dev.rs
@@ -283,10 +283,9 @@ pub fn handle_dev_squash(
// Check if there are actually any changes to commit
if !repo.has_staged_changes()? {
- use worktrunk::styling::INFO_EMOJI;
let dim = AnstyleStyle::new().dimmed();
- crate::output::progress(format!(
- "{INFO_EMOJI} {dim}No changes after squashing {commit_count} {commit_text} (commits resulted in no net changes){dim:#}"
+ crate::output::info(format!(
+ "{dim}No changes after squashing {commit_count} {commit_text} (commits resulted in no net changes){dim:#}"
))?;
return Ok(false);
}
@@ -302,10 +301,10 @@ pub fn handle_dev_squash(
.to_string();
// Show success immediately after completing the squash
- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
+ use worktrunk::styling::GREEN;
let green_dim = GREEN.dimmed();
crate::output::success(format!(
- "{SUCCESS_EMOJI} {GREEN}Squashed @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"
+ "{GREEN}Squashed @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"
))?;
Ok(true)
@@ -383,10 +382,10 @@ pub fn handle_dev_rebase(target: Option<&str>) -> Result<bool, GitError> {
}
// Success
- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
+ use worktrunk::styling::GREEN;
let green_bold = GREEN.bold();
crate::output::success(format!(
- "{SUCCESS_EMOJI} {GREEN}Rebased onto {green_bold}{target_branch}{green_bold:#}{GREEN:#}"
+ "{GREEN}Rebased onto {green_bold}{target_branch}{green_bold:#}{GREEN:#}"
))?;
Ok(true)
@@ -428,14 +427,11 @@ pub fn handle_dev_ask_approval(force: bool) -> Result<(), GitError> {
// Show result
if approved {
- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
- crate::output::success(format!(
- "{SUCCESS_EMOJI} {GREEN}Commands approved!{GREEN:#}"
- ))?;
+ use worktrunk::styling::GREEN;
+ crate::output::success(format!("{GREEN}Commands approved!{GREEN:#}"))?;
} else {
- use worktrunk::styling::INFO_EMOJI;
let dim = worktrunk::styling::AnstyleStyle::new().dimmed();
- crate::output::success(format!("{INFO_EMOJI} {dim}Commands declined{dim:#}"))?;
+ crate::output::info(format!("{dim}Commands declined{dim:#}"))?;
}
Ok(())
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index c0c272eff..bbdb3a90f 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -2,7 +2,7 @@ use worktrunk::HookType;
use worktrunk::config::{Command, CommandPhase, ProjectConfig, WorktrunkConfig};
use worktrunk::git::{GitError, GitResultExt, Repository};
use worktrunk::styling::{
- AnstyleStyle, CYAN, CYAN_BOLD, ERROR, ERROR_EMOJI, HINT, HINT_EMOJI, WARNING, WARNING_EMOJI,
+ AnstyleStyle, CYAN, CYAN_BOLD, ERROR, ERROR_EMOJI, HINT, HINT_EMOJI, WARNING,
format_bash_with_gutter, format_with_gutter,
};
@@ -95,8 +95,8 @@ fn show_untracked_warning(repo: &Repository) -> Result<(), GitError> {
// Format file list (comma-separated)
let file_list = untracked.join(", ");
- crate::output::progress(format!(
- "{WARNING_EMOJI} {WARNING}Auto-staging untracked files: {file_list}{WARNING:#}"
+ crate::output::warning(format!(
+ "{WARNING}Auto-staging untracked files: {file_list}{WARNING:#}"
))?;
Ok(())
@@ -266,7 +266,7 @@ pub fn handle_merge(
}
// STEP 4: Remove worktree and delete branch
- crate::output::progress(format!("πŸ”„ {CYAN}Removing worktree & branch...{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}Removing worktree & branch...{CYAN:#}"))?;
let worktree_root = repo.worktree_root()?;
repo.remove_worktree(&worktree_root)
.git_context("Failed to remove worktree")?;
@@ -508,7 +508,7 @@ pub fn run_pre_merge_commands(
)?;
for prepared in commands {
let label = crate::commands::format_command_label("pre-merge", prepared.name.as_deref());
- crate::output::progress(format!("πŸ”„ {CYAN}{label}{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}{label}{CYAN:#}"))?;
crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
@@ -577,19 +577,18 @@ pub fn execute_post_merge_commands(
// Execute each command sequentially in the main worktree
for prepared in commands {
let label = crate::commands::format_command_label("post-merge", prepared.name.as_deref());
- crate::output::progress(format!("πŸ”„ {CYAN}{label}{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}{label}{CYAN:#}"))?;
crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(main_worktree_path, &prepared.expanded) {
- use worktrunk::styling::WARNING_EMOJI;
let warning_bold = WARNING.bold();
let message = match &prepared.name {
Some(name) => format!(
- "{WARNING_EMOJI} {WARNING}Command {warning_bold}{name}{warning_bold:#} failed: {e}{WARNING:#}"
+ "{WARNING}Command {warning_bold}{name}{warning_bold:#} failed: {e}{WARNING:#}"
),
- None => format!("{WARNING_EMOJI} {WARNING}Command failed: {e}{WARNING:#}"),
+ None => format!("{WARNING}Command failed: {e}{WARNING:#}"),
};
- crate::output::progress(message)?;
+ crate::output::warning(message)?;
// Continue with other commands even if one fails
}
}
@@ -647,7 +646,7 @@ pub fn run_pre_commit_commands(
// Execute each command sequentially
for prepared in commands {
let label = crate::commands::format_command_label("pre-commit", prepared.name.as_deref());
- crate::output::progress(format!("πŸ”„ {CYAN}{label}{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}{label}{CYAN:#}"))?;
crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 9edb97f39..411dd0f4c 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -104,7 +104,7 @@ use std::path::PathBuf;
use worktrunk::config::{CommandPhase, ProjectConfig, WorktrunkConfig};
use worktrunk::git::{GitError, GitResultExt, Repository};
use worktrunk::styling::{
- ADDITION, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, SUCCESS_EMOJI, WARNING, WARNING_EMOJI,
+ ADDITION, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, SUCCESS_EMOJI, WARNING,
format_bash_with_gutter,
};
@@ -179,8 +179,8 @@ pub fn handle_switch(
// Check if base flag was provided without create flag
if resolved_base.is_some() && !create {
- crate::output::progress(format!(
- "{WARNING_EMOJI} {WARNING}--base flag is only used with --create, ignoring{WARNING:#}"
+ crate::output::warning(format!(
+ "{WARNING}--base flag is only used with --create, ignoring{WARNING:#}"
))?;
}
@@ -488,18 +488,18 @@ pub fn execute_post_create_commands(
// Execute each command sequentially
for prepared in commands {
let label = crate::commands::format_command_label("post-create", prepared.name.as_deref());
- crate::output::progress(format!("πŸ”„ {CYAN}{label}{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}{label}{CYAN:#}"))?;
crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
let warning_bold = WARNING.bold();
let message = match &prepared.name {
Some(name) => format!(
- "{WARNING_EMOJI} {WARNING}Command {warning_bold}{name}{warning_bold:#} failed: {e}{WARNING:#}"
+ "{WARNING}Command {warning_bold}{name}{warning_bold:#} failed: {e}{WARNING:#}"
),
- None => format!("{WARNING_EMOJI} {WARNING}Command failed: {e}{WARNING:#}"),
+ None => format!("{WARNING}Command failed: {e}{WARNING:#}"),
};
- crate::output::progress(message)?;
+ crate::output::warning(message)?;
// Continue with other commands even if one fails
}
}
@@ -538,7 +538,7 @@ pub fn spawn_post_start_commands(
// Spawn each command as a detached background process
for prepared in commands {
let label = crate::commands::format_command_label("post-start", prepared.name.as_deref());
- crate::output::progress(format!("πŸ”„ {CYAN}{label}{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}{label}{CYAN:#}"))?;
crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;
let name = prepared.name.as_deref().unwrap_or("cmd");
@@ -550,13 +550,13 @@ pub fn spawn_post_start_commands(
Err(e) => {
let message = match &prepared.name {
Some(name) => {
- format!("{WARNING_EMOJI} {WARNING}Failed to spawn '{name}': {e}{WARNING:#}")
+ format!("{WARNING}Failed to spawn '{name}': {e}{WARNING:#}")
}
None => {
- format!("{WARNING_EMOJI} {WARNING}Failed to spawn command: {e}{WARNING:#}")
+ format!("{WARNING}Failed to spawn command: {e}{WARNING:#}")
}
};
- crate::output::progress(message)?;
+ crate::output::warning(message)?;
}
}
}
@@ -595,17 +595,17 @@ pub fn execute_post_start_commands_sequential(
// Execute sequentially for testing
for prepared in commands {
let label = crate::commands::format_command_label("post-start", prepared.name.as_deref());
- crate::output::progress(format!("πŸ”„ {CYAN}{label}{CYAN:#}"))?;
+ crate::output::progress(format!("{CYAN}{label}{CYAN:#}"))?;
crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
let message = match &prepared.name {
Some(name) => {
- format!("{WARNING_EMOJI} {WARNING}Failed to execute '{name}': {e}{WARNING:#}")
+ format!("{WARNING}Failed to execute '{name}': {e}{WARNING:#}")
}
- None => format!("{WARNING_EMOJI} {WARNING}Command failed: {e}{WARNING:#}"),
+ None => format!("{WARNING}Command failed: {e}{WARNING:#}"),
};
- crate::output::progress(message)?;
+ crate::output::warning(message)?;
}
}
diff --git a/src/output/directive.rs b/src/output/directive.rs
index e1acf3d99..f58b797e6 100644
--- a/src/output/directive.rs
+++ b/src/output/directive.rs
@@ -31,6 +31,7 @@
use std::io::{self, Write};
use std::path::Path;
+use worktrunk::styling::{INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI};
/// Directive output mode for shell integration
///
@@ -45,15 +46,14 @@ impl DirectiveOutput {
}
pub fn success(&mut self, message: String) -> io::Result<()> {
- // Don't strip colors - users see this output and need styling
- write!(io::stdout(), "{}\0", message)?;
+ // Success messages automatically include the βœ… emoji
+ write!(io::stdout(), "{SUCCESS_EMOJI} {message}\0")?;
io::stdout().flush()
}
pub fn progress(&mut self, message: String) -> io::Result<()> {
- // Progress messages are for humans - output them just like success messages
- // The shell wrapper will display these to users with colors preserved
- write!(io::stdout(), "{}\0", message)?;
+ // Progress messages automatically include the πŸ”„ emoji
+ write!(io::stdout(), "{PROGRESS_EMOJI} {message}\0")?;
io::stdout().flush()
}
@@ -63,6 +63,18 @@ impl DirectiveOutput {
Ok(())
}
+ pub fn info(&mut self, message: String) -> io::Result<()> {
+ // Info messages automatically include the βšͺ emoji
+ write!(io::stdout(), "{INFO_EMOJI} {message}\0")?;
+ io::stdout().flush()
+ }
+
+ pub fn warning(&mut self, message: String) -> io::Result<()> {
+ // Warning messages automatically include the 🟑 emoji
+ write!(io::stdout(), "{WARNING_EMOJI} {message}\0")?;
+ io::stdout().flush()
+ }
+
pub fn change_directory(&mut self, path: &Path) -> io::Result<()> {
write!(io::stdout(), "__WORKTRUNK_CD__{}\0", path.display())?;
io::stdout().flush()
diff --git a/src/output/global.rs b/src/output/global.rs
index cc461a6e1..fbf5e960e 100644
--- a/src/output/global.rs
+++ b/src/output/global.rs
@@ -96,6 +96,34 @@ pub fn hint(message: impl Into<String>) -> io::Result<()> {
})
}
+/// Emit an info message
+///
+/// Info messages are neutral status updates like "βšͺ No changes detected"
+/// They use INFO_EMOJI (βšͺ) and dimmed styling.
+pub fn info(message: impl Into<String>) -> io::Result<()> {
+ OUTPUT_CONTEXT.with(|ctx| {
+ let msg = message.into();
+ match &mut *ctx.borrow_mut() {
+ OutputHandler::Interactive(i) => i.info(msg),
+ OutputHandler::Directive(d) => d.info(msg),
+ }
+ })
+}
+
+/// Emit a warning message
+///
+/// Warning messages are non-blocking issues like "🟑 Uncommitted changes detected"
+/// They use WARNING_EMOJI (🟑) and warning styling.
+pub fn warning(message: impl Into<String>) -> io::Result<()> {
+ OUTPUT_CONTEXT.with(|ctx| {
+ let msg = message.into();
+ match &mut *ctx.borrow_mut() {
+ OutputHandler::Interactive(i) => i.warning(msg),
+ OutputHandler::Directive(d) => d.warning(msg),
+ }
+ })
+}
+
/// Request directory change (for shell integration)
pub fn change_directory(path: impl AsRef<Path>) -> io::Result<()> {
OUTPUT_CONTEXT.with(|ctx| {
diff --git a/src/output/interactive.rs b/src/output/interactive.rs
index 3cd940f5e..1adc102f6 100644
--- a/src/output/interactive.rs
+++ b/src/output/interactive.rs
@@ -2,7 +2,9 @@
use std::io::{self, Write};
use std::path::Path;
-use worktrunk::styling::{println, stderr, stdout};
+use worktrunk::styling::{
+ HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI, println, stderr, stdout,
+};
use super::handlers::execute_streaming;
@@ -21,21 +23,36 @@ impl InteractiveOutput {
}
pub fn success(&mut self, message: String) -> io::Result<()> {
- // Messages now include emoji and color directly for consistency across modes
- println!("{message}");
+ // Success messages automatically include the βœ… emoji
+ println!("{SUCCESS_EMOJI} {message}");
stdout().flush()?;
Ok(())
}
pub fn progress(&mut self, message: String) -> io::Result<()> {
- println!("{message}");
+ // Progress messages automatically include the πŸ”„ emoji
+ println!("{PROGRESS_EMOJI} {message}");
stdout().flush()?;
Ok(())
}
pub fn hint(&mut self, message: String) -> io::Result<()> {
- // Hints are suggestions for interactive users (like "run wt configure-shell")
- println!("{message}");
+ // Hint messages automatically include the πŸ’‘ emoji
+ println!("{HINT_EMOJI} {message}");
+ stdout().flush()?;
+ Ok(())
+ }
+
+ pub fn info(&mut self, message: String) -> io::Result<()> {
+ // Info messages automatically include the βšͺ emoji
+ println!("{INFO_EMOJI} {message}");
+ stdout().flush()?;
+ Ok(())
+ }
+
+ pub fn warning(&mut self, message: String) -> io::Result<()> {
+ // Warning messages automatically include the 🟑 emoji
+ println!("{WARNING_EMOJI} {message}");
stdout().flush()?;
Ok(())
}
diff --git a/src/output/mod.rs b/src/output/mod.rs
index baa159ac5..091adf54b 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -63,8 +63,8 @@ pub mod interactive;
// Re-export the public API
pub use global::{
- OutputMode, change_directory, execute, flush, hint, initialize, progress, success,
- terminate_output,
+ OutputMode, change_directory, execute, flush, hint, info, initialize, progress, success,
+ terminate_output, warning,
};
// Re-export output handlers
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 834248a18..f75bf11fd 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -80,7 +80,7 @@ fn test_remove_internal_directive() {
.arg("remove")
.current_dir(repo.root_path());
- assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\nπŸ”„ \u{1b}[36mRemoving worktree...\u{1b}[0m\0βœ… \u{1b}[32mAlready on default branch \u{1b}[1m\u{1b}[32mmain\u{1b}[0m\u{1b}[0m\0\n----- stderr -----");
+ assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\nπŸ”„ πŸ”„ \u{1b}[36mRemoving worktree...\u{1b}[0m\0βœ… βœ… \u{1b}[32mAlready on default branch \u{1b}[1m\u{1b}[32mmain\u{1b}[0m\u{1b}[0m\0\n----- stderr -----");
});
}
@@ -102,8 +102,8 @@ fn test_remove_without_internal() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Removing worktree...
- βœ… Already on default branch main
+ πŸ”„ πŸ”„ Removing worktree...
+ βœ… βœ… Already on default branch main
----- stderr -----
");
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 6996c5a6b..7628882dd 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1972,15 +1972,15 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+ πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
- * [SHA] (HEAD -> feature) Add feature file
+ πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+ πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
- βœ… Merged to main (1 commit, 1 file, +1)
- βœ… Worktree preserved (--no-remove)
+ πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+ βœ… βœ… Worktree preserved (--no-remove)
----- stderr -----
");
@@ -2079,15 +2079,15 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+ πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
- * [SHA] (HEAD -> feature) Add feature file
+ πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+ πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
- βœ… Merged to main (1 commit, 1 file, +1)
- βœ… Worktree preserved (--no-remove)
+ πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+ βœ… βœ… Worktree preserved (--no-remove)
----- stderr -----
");
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index 3d12ce5ad..a4cba61e0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for bash-test from main: [TMPDIR]/test-repo.bash-test
+βœ… βœ… Created new worktree for bash-test from main: [TMPDIR]/test-repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index 1bd3de242..fb7539ab8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -2,9 +2,9 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fish-multiline from main: [TMPDIR]/test-repo.fish-multiline
-πŸ”„ Executing (--execute):
-  echo 'line 1'; echo 'line 2'; echo 'line 3'
+βœ… βœ… Created new worktree for fish-multiline from main: [TMPDIR]/test-repo.fish-multiline
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index 57540710b..12cdac785 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fish-minimal from main: [TMPDIR]/test-repo.fish-minimal
+βœ… βœ… Created new worktree for fish-minimal from main: [TMPDIR]/test-repo.fish-minimal
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 407d40927..e200eb821 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fish-bg from main: [TMPDIR]/test-repo.fish-bg
+βœ… βœ… Created new worktree for fish-bg from main: [TMPDIR]/test-repo.fish-bg
πŸ”„ Running post-start:
-  echo 'fish background task'
+πŸ”„   echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
index f0f2b867a..56f071dca 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
@@ -1,5 +1,5 @@
---
source: tests/integration_tests/shell_wrapper.rs
-expression: output.normalized().as_ref()
+expression: output.normalized()
---
-βœ… Already on main, nothing to merge
+βœ… βœ… Already on main, nothing to merge
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index e4dc9053c..a03bc41d8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -3,12 +3,12 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+πŸ”„   echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge: test
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+πŸ”„   echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index afd04eb9c..1994198be 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -10,8 +10,8 @@ Command failed with exit code: exit status: 1
πŸ’‘ Use --no-hooks to skip pre-merge commands
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+πŸ”„   echo 'βœ“ Code formatting check passed'
πŸ”„ Running pre-merge: test
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+πŸ”„   echo 'βœ— Test suite failed: 3 tests failing' && exit 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 9b3c94e43..03db442c0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -3,27 +3,27 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+πŸ”„   echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge: lint
-  echo 'βœ“ Linting passed - no warnings'
+πŸ”„   echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
πŸ”„ Running pre-merge: test
-  echo 'βœ“ All 47 tests passed in 2.3s'
+πŸ”„   echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
-* d067f01 (HEAD -> feature) Add feature
+πŸ”„ * d067f01 (HEAD -> feature) Add feature
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [TMPDIR]/test-repo
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [TMPDIR]/test-repo
πŸ”„ Removing worktree & branch...
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index 6ae3957c9..db9e198b0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -6,24 +6,24 @@ expression: output.normalized()
βœ“ Linting passed - no warnings
βœ“ All 47 tests passed in 2.3s
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+πŸ”„   echo 'βœ“ Code formatting check passed'
πŸ”„ Running pre-merge: lint
-  echo 'βœ“ Linting passed - no warnings'
+πŸ”„   echo 'βœ“ Linting passed - no warnings'
πŸ”„ Running pre-merge: test
-  echo 'βœ“ All 47 tests passed in 2.3s'
+πŸ”„   echo 'βœ“ All 47 tests passed in 2.3s'
-πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
-* d067f01 (HEAD -> feature) Add feature
+πŸ”„ * d067f01 (HEAD -> feature) Add feature
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [TMPDIR]/test-repo
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [TMPDIR]/test-repo
πŸ”„ Removing worktree & branch...
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
index 4f81c4f6c..773ff82ea 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
@@ -2,5 +2,5 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Removing worktree for to-remove...
-βœ… Removed worktree & branch for to-remove
+πŸ”„ πŸ”„ Removing worktree for to-remove...
+βœ… βœ… Removed worktree & branch for to-remove
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 548bc145f..868b8afb3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for feature from main: [TMPDIR]/test-repo.feature
+βœ… βœ… Created new worktree for feature from main: [TMPDIR]/test-repo.feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 2b43a584f..17258fc90 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -2,8 +2,8 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for test-exec from main: [TMPDIR]/test-repo.test-exec
-πŸ”„ Executing (--execute):
-  echo executed
+βœ… βœ… Created new worktree for test-exec from main: [TMPDIR]/test-repo.test-exec
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 2b43a584f..17258fc90 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -2,8 +2,8 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for test-exec from main: [TMPDIR]/test-repo.test-exec
-πŸ”„ Executing (--execute):
-  echo executed
+βœ… βœ… Created new worktree for test-exec from main: [TMPDIR]/test-repo.test-exec
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 4e00306f0..4e8930734 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -5,16 +5,16 @@ expression: output.normalized()
Installing dependencies...
Building project...
πŸ”„ Running post-create:
-  echo 'Installing dependencies...'
+πŸ”„   echo 'Installing dependencies...'
πŸ”„ Running post-create:
-  echo 'Building project...'
+πŸ”„   echo 'Building project...'
-βœ… Created new worktree for feature-hooks from main: [TMPDIR]/test-repo.feature-hooks
+βœ… βœ… Created new worktree for feature-hooks from main: [TMPDIR]/test-repo.feature-hooks
πŸ”„ Running post-start: server
-  echo 'Starting dev server on port 3000'
+πŸ”„   echo 'Starting dev server on port 3000'
πŸ”„ Running post-start: watch
-  echo 'Watching for file changes'
+πŸ”„   echo 'Watching for file changes'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 8f4592d12..1a0644458 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for feature-with-hooks from main: [TMPDIR]/test-repo.feature-with-hooks
+βœ… βœ… Created new worktree for feature-with-hooks from main: [TMPDIR]/test-repo.feature-with-hooks
πŸ”„ Running post-start:
-  echo 'test command executed'
+πŸ”„   echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 7451e64ef..9b765e5d6 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for feature-bg from main: [TMPDIR]/test-repo.feature-bg
+βœ… βœ… Created new worktree for feature-bg from main: [TMPDIR]/test-repo.feature-bg
πŸ”„ Running post-start:
-  echo 'background task'
+πŸ”„   echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 6ef9d990c..06f74d567 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8WdWcp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGWdhRk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'approved' > output.txt
-
-βœ… Created new worktree for test-approved from main at [REPO].test-approved
+πŸ”„   echo 'approved' > output.txt
+βœ… βœ… Created new worktree for test-approved from main at [REPO].test-approved
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index 6f7aa7bcb..7ef52fc9c 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
@@ -5,8 +5,8 @@ expression: combined
exit_code: 0
----- stdout -----
βšͺ post-create declined
-βœ… Created new worktree for test-mixed from main at [REPO].test-mixed
-
+βœ… βœ… Created new worktree for test-mixed from main at [REPO].test-mixed
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index 0f6cfa330..a5ebc20f5 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -5,8 +5,8 @@ expression: combined
exit_code: 0
----- stdout -----
βšͺ post-create declined
-βœ… Created new worktree for test/nested-branch from main at [REPO].test-nested-branch
-
+βœ… βœ… Created new worktree for test/nested-branch from main at [REPO].test-nested-branch
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 79ca688da..90e8b9645 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -5,8 +5,8 @@ expression: combined
exit_code: 0
----- stdout -----
βšͺ post-create declined
-βœ… Created new worktree for test-named from main at [REPO].test-named
-
+βœ… βœ… Created new worktree for test-named from main at [REPO].test-named
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index a5ffaf243..e0a1ef5e1 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -5,8 +5,8 @@ expression: combined
exit_code: 0
----- stdout -----
βšͺ post-create declined
-βœ… Created new worktree for feature/test-approval from main at [REPO].feature-test-approval
-
+βœ… βœ… Created new worktree for feature/test-approval from main at [REPO].feature-test-approval
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index 60f72ca51..1bc9eb0b6 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
@@ -5,8 +5,8 @@ expression: combined
exit_code: 0
----- stdout -----
βšͺ post-create declined
-βœ… Created new worktree for test-decline from main at [REPO].test-decline
-
+βœ… βœ… Created new worktree for test-decline from main at [REPO].test-decline
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index 6e658a139..22c4a60fc 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
@@ -18,16 +18,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAR6bfk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1regaQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'test command' > output.txt
-
-βœ… Created new worktree for test-force from main at [REPO].test-force
+πŸ”„   echo 'test command' > output.txt
+βœ… βœ… Created new worktree for test-force from main at [REPO].test-force
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
index 15859e004..124dbc1af 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
@@ -5,8 +5,8 @@ expression: combined
exit_code: 0
----- stdout -----
βšͺ post-create declined
-βœ… Created new worktree for test-force-2 from main at [REPO].test-force-2
-
+βœ… βœ… Created new worktree for test-force-2 from main at [REPO].test-force-2
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index 4f1f83817..82d266794 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 4192fb4cb..67c624c06 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap b/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap
index b9f416587..eb1ae347b 100644
--- a/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap
+++ b/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap
@@ -2,5 +2,5 @@
source: tests/integration_tests/e2e_shell.rs
expression: output
---
-βœ… Created new worktree for test-branch from main: [REPO].test-branch
+βœ… βœ… Created new worktree for test-branch from main: [REPO].test-branch
MARKER
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
index 6f5f064d9..48f7f7fab 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
@@ -15,11 +15,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMD721i/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCmpGOp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Already on main, nothing to merge
+βœ… βœ… Already on main, nothing to merge
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 6d42954e7..fcf4868d3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -18,31 +18,31 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6yDfRj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8Fuaev/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 2 commits with working tree changes into 1 (2 files, +2)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 2 commits with working tree changes into 1 (2 files, +2)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
file2.txt | 1 +
2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 2 files, +2)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 3f2544550..fb64986b6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -16,29 +16,29 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpl4Ngge/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8INIVm/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: initial feature
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 93f96b75c..a02611d0f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -18,29 +18,29 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfuuT3c/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsO7Iiu/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: add authentication
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- auth.txt | 1 +
+πŸ”„ auth.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index eba14fc88..0850ad444 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -16,26 +16,26 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2GupfH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUDjGH8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: dirty.txt
-πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Changes to dirty.txt
+πŸ”„ πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Changes to dirty.txt
-βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… βœ… Committed changes @ [SHA]
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Changes to dirty.txt
+πŸ”„ * [SHA] (HEAD -> feature) Changes to dirty.txt
- dirty.txt | 1 +
+πŸ”„ dirty.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 0c0c7f1c9..920f95bee 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,20 +16,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpejipyL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoZFcot/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index b2df9cbc6..41f75308c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -16,14 +16,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIxoxPF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNXe71F/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ No commits to squash - already at merge base
-βœ… Merged to main
-βœ… Returned to primary at [REPO]
+πŸ”„ πŸ’‘ No commits to squash - already at merge base
+πŸ”„ βœ… Merged to main
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 1e00efbc8..23a6918b3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -16,26 +16,26 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcpkqaJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOGVlgB/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: newfile.txt
-πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Changes to newfile.txt
+πŸ”„ πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Changes to newfile.txt
-βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… βœ… Committed changes @ [SHA]
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
+πŸ”„ * [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
- newfile.txt | 1 +
+πŸ”„ newfile.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 9a504d2bb..368b24c19 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -15,11 +15,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpern16m/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRtmWn8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Already on feature, nothing to merge
+βœ… βœ… Already on feature, nothing to merge
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index c00203b3b..bfa18defc 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,22 +17,22 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYpaSfZ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDcvA7I/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) feat: add file 2
+πŸ”„ * [SHA] (HEAD -> feature) feat: add file 2
* [SHA] feat: add file 1
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
file2.txt | 1 +
2 files changed, 2 insertions(+)
-βœ… Merged to main (2 commits, 2 files, +2)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (2 commits, 2 files, +2)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index d15cbfc0f..b0367d4c3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -16,20 +16,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQzXCKf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr6o2gy/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 595793e62..d22d6dbc2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -17,23 +17,23 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdLTjsu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVjRbEt/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
πŸ”„ Running post-merge:
-  exit 1
+πŸ”„   exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index caccb541f..6c9ef5570 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -17,26 +17,26 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpilIeZf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVtCz1t/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
πŸ”„ Running post-merge: notify
-  echo 'Merge to main complete' > notify.txt
+πŸ”„   echo 'Merge to main complete' > notify.txt
πŸ”„ Running post-merge: deploy
-  echo 'Deploying branch feature' > deploy.txt
+πŸ”„   echo 'Deploying branch feature' > deploy.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index c5ae9f74c..420a21707 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -17,23 +17,23 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpm4Ov6h/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRdhFMO/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
πŸ”„ Running post-merge:
-  echo 'merged feature to main' > post-merge-ran.txt
+πŸ”„   echo 'merged feature to main' > post-merge-ran.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 12326463d..0a861e155 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -17,14 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaozfq3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpit9uNb/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
🟑 Auto-staging untracked files: feature.txt
πŸ”„ Running pre-commit:
-  exit 1
+πŸ”„   exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index ae4cbb444..99992d28d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -17,29 +17,29 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppIq5HD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMFB6RS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: feature.txt
πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
+πŸ”„   echo 'Pre-commit check passed'
-πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Changes to feature.txt
+πŸ”„ πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Changes to feature.txt
-βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… βœ… Committed changes @ [SHA]
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Changes to feature.txt
+πŸ”„ * [SHA] (HEAD -> feature) Changes to feature.txt
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
index 455e3ea24..5ae8d86e8 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
@@ -4,22 +4,22 @@ expression: output
---
Exit code: 0
πŸ”„ Running pre-merge: first
-  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
+πŸ”„   echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
STDOUT-FROM-FIRST
STDERR-FROM-FIRST
πŸ”„ Running pre-merge: second
-  echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2
+πŸ”„   echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index adf02617a..e4e31c8d2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJqYFOd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5W817g/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
πŸ”„ Running pre-merge:
-  exit 1
+πŸ”„   exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index ee04c3e9c..008617ded 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -17,29 +17,29 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXyq9jh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1B7870/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge: format
-  exit 0
+πŸ”„   exit 0
πŸ”„ Running pre-merge: lint
-  exit 0
+πŸ”„   exit 0
πŸ”„ Running pre-merge: test
-  exit 0
+πŸ”„   exit 0
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index 9a4997211..621734e03 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
@@ -17,26 +17,26 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpv3ZO3d/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWyCe3V/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge: check1
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
+πŸ”„   [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
πŸ”„ Running pre-merge: check2
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
+πŸ”„   [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 1ac025517..128385ff2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -17,23 +17,23 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzwCZNG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphKE9jN/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge:
-  exit 0
+πŸ”„   exit 0
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index d5b692edc..c654caae6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppWlOJd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpikTJnS/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
πŸ”„ Running pre-commit:
-  exit 1
+πŸ”„   exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 27b14f33f..caeb84a40 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -17,23 +17,23 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvX83KZ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHastTN/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
+πŸ”„   echo 'Pre-commit check passed'
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index 6656b9991..466e0be05 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -16,21 +16,21 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpecpr1s/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE0afXD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature-from-develop) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature-from-develop) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
-πŸ”„ Switching to main...
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
+πŸ”„ πŸ”„ Switching to main...
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index 92f8a403e..431fb4119 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -16,23 +16,23 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp25DBdp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdi5Uuq/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Rebasing onto main...
+πŸ”„ πŸ”„ Rebasing onto main...
βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
-* [SHA] (HEAD -> feature-dirty-primary) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature-dirty-primary) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
-πŸ”„ Switching to main...
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
+πŸ”„ πŸ”„ Switching to main...
----- stderr -----
Failed to switch to 'main': error: Your local changes to the following files would be overwritten by checkout:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 8f7baa09a..5ccf7d118 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1qAZ0Y/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiPw2hi/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Worktree preserved (--no-remove)
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Worktree preserved (--no-remove)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 4380be8e0..02fd21c2a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHIlJFB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBEhib3/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Rebasing onto main...
+πŸ”„ πŸ”„ Rebasing onto main...
----- stderr -----
❌ Rebase onto main incomplete
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 11dcdea08..81427b4fd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -16,15 +16,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8Kr5DB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYW0X5a/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: add file 1
@@ -32,17 +32,17 @@ exit_code: 0
  - docs: update readme
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
file2.txt | 1 +
file3.txt | 1 +
3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 3 files, +3)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 3634d0988..e93b8e79d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -16,15 +16,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg2vDMU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXqNYIS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into 1...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 3 commits into 1...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - Change 1
@@ -32,8 +32,8 @@ exit_code: 0
  - Revert to initial
βšͺ No changes after squashing 3 commits (commits resulted in no net changes)
-βœ… Merged to main
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 488463213..3d74f0d4a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
@@ -17,31 +17,31 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJpJry3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVclthU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 2 commits into 1 (2 files, +2)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 2 commits into 1 (2 files, +2)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: new feature
  - fix: bug fix
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
file2.txt | 1 +
2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 2 files, +2)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 8a46c0d17..edbc2a06c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -16,20 +16,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA3k8wG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM4qLtp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) feat: single commit
+πŸ”„ * [SHA] (HEAD -> feature) feat: single commit
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 5e83673d9..e3042d34e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -19,30 +19,30 @@ info:
WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"
WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"
WORKTRUNK_COMMIT_GENERATION__COMMAND: sh
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeguL7E/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphEOjtj/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 2 commits into 1 (1 file, +1)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 2 commits into 1 (1 file, +1)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: add authentication
  - fix: handle edge case
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- auth.txt | 1 +
+πŸ”„ auth.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 3123e8a04..9578f2e23 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,20 +15,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS8yVxe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphxdBF3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 3d2142782..87d8103aa 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Mbv83/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprKuuVp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Worktree preserved (--no-remove)
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Worktree preserved (--no-remove)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index ab3df1ecb..868ea0e8f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -18,32 +18,32 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3Qcngq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8D7Rdi/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: untracked1.txt, untracked2.txt
-πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
+πŸ”„ πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
+πŸ”„   Squash commits from main
 
  Combined commits:
  - feat: add file 1
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature) Squash commits from main
+πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
untracked1.txt | 1 +
untracked2.txt | 1 +
3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 3 files, +3)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index bb95ec1cf..32a0f3e5d 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,16 +16,16 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWlrwhh/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphCOEV1/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWlrwhh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphCOEV1/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
-πŸ”„ Generating squash commit message...
-  feat(auth): Implement JWT authentication system
+πŸ”„ πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
+πŸ”„ πŸ”„ Generating squash commit message...
+πŸ”„   feat(auth): Implement JWT authentication system
 
  Add comprehensive JWT token handling including validation, refresh logic,
  and authentication tests. This establishes the foundation for secure
@@ -37,25 +37,25 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Running pre-merge: test
-  cargo test
+πŸ”„   cargo test
πŸ”„ Running pre-merge: lint
-  cargo clippy
+πŸ”„   cargo clippy
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-* [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
+πŸ”„ * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
- auth.rs | 1 +
+πŸ”„ auth.rs | 1 +
auth_test.rs | 1 +
jwt.rs | 1 +
3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 3 files, +3)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
πŸ”„ Running post-merge: install
-  cargo install --path .
+πŸ”„   cargo install --path .
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 068721d8b..b5d99c653 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -16,20 +16,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCWyvn7/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS9UuWD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> fix-auth) Implement JWT validation
+πŸ”„ * [SHA] (HEAD -> fix-auth) Implement JWT validation
- auth.rs | 1 +
+πŸ”„ auth.rs | 1 +
1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-βœ… Returned to primary at [REPO]
+πŸ”„ βœ… Merged to main (1 commit, 1 file, +1)
+βœ… βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index 8953faa04..625cec43c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwYwGCu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJeADsL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Setup done' > setup.txt
-
-βœ… Created new worktree for feature from main at [REPO].feature
+πŸ”„   echo 'Setup done' > setup.txt
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start: server
-  sleep 0.5 && echo 'Server running' > server.txt
+πŸ”„   sleep 0.5 && echo 'Server running' > server.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 58a251dfa..f8d2cf3d7 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -19,17 +19,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpow16S6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpswL8dr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
πŸ”„ Running post-start:
-  echo 'Background task' > background.txt
+πŸ”„   echo 'Background task' > background.txt
-πŸ”„ Executing (--execute):
-  echo 'Execute flag' > execute.txt
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo 'Execute flag' > execute.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index e6d7849de..971d58345 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -17,17 +17,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbGRBNf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXjXDLR/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  exit 1
+πŸ”„   exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index e80dcd5a5..839c6ac5c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -17,20 +17,20 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppwfWSh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprXpKb2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  if [ ! -f test.txt ]; then
+πŸ”„   if [ ! -f test.txt ]; then
  echo 'File does not exist' > result.txt
  else
  echo 'File exists' > result.txt
  fi
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
index 68747e7fa..0fb84fcf5 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHWtxPc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBwiaGc/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'First'
+πŸ”„   echo 'First'
πŸ”„ Running post-create:
-  echo 'Second'
-
-βœ… Created new worktree for feature from main at [REPO].feature
+πŸ”„   echo 'Second'
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index 529ec3716..5ba6c8acf 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWY8vSi/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxT6KbE/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create: install
-  echo 'Installing deps'
+πŸ”„   echo 'Installing deps'
πŸ”„ Running post-create: setup
-  echo 'Running setup'
-
-βœ… Created new worktree for feature from main at [REPO].feature
+πŸ”„   echo 'Running setup'
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
index 23a45ef19..816b01c5d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKmTdRr/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6bIf2r/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 812857ea7..ddb3642d1 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpncBuFr/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYa8suN/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Setup complete'
-
-βœ… Created new worktree for feature from main at [REPO].feature
+πŸ”„   echo 'Setup complete'
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index e4d4bd719..cf75f9a3e 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -17,25 +17,25 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAiSlgL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp83tto2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Repo: test-repo' > info.txt
+πŸ”„   echo 'Repo: test-repo' > info.txt
πŸ”„ Running post-create:
-  echo 'Branch: feature-test' >> info.txt
+πŸ”„   echo 'Branch: feature-test' >> info.txt
πŸ”„ Running post-create:
-  echo 'Worktree: [REPO].feature-test' >> info.txt
+πŸ”„   echo 'Worktree: [REPO].feature-test' >> info.txt
πŸ”„ Running post-create:
-  echo 'Root: [REPO]' >> info.txt
-
-βœ… Created new worktree for feature/test from main at [REPO].feature-test
+πŸ”„   echo 'Root: [REPO]' >> info.txt
+βœ… βœ… Created new worktree for feature/test from main at [REPO].feature-test
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index 4a0f0d667..56417337c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP7Td6P/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXPk54i/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'line1
+πŸ”„   echo 'line1
  line2
  line3' | grep line2 > filtered.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index adc8fede4..5165d8782 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8cmWMx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA6AEQ4/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'POST-START-RAN' > post_start_marker.txt
+πŸ”„   echo 'POST-START-RAN' > post_start_marker.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index 8b8bf3114..0da397695 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYZNDZ8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAoHUUU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'unclosed quote
+πŸ”„   echo 'unclosed quote
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 5e2a71db2..4c622c4af 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsP1ISZ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJf50Zv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'stdout output' && echo 'stderr output' >&2
+πŸ”„   echo 'stdout output' && echo 'stderr output' >&2
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index c30619ce0..e0f22da98 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsxW5Hj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyEldq8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'first line' > multiline.txt
+πŸ”„   echo 'first line' > multiline.txt
  echo 'second line' >> multiline.txt
  echo 'third line' >> multiline.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index 9b659258f..98aec34d1 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpojSwY0/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVtIrsr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start: task1
-  echo 'Task 1 running' > task1.txt
+πŸ”„   echo 'Task 1 running' > task1.txt
πŸ”„ Running post-start: task2
-  echo 'Task 2 running' > task2.txt
+πŸ”„   echo 'Task 2 running' > task2.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index 94d06e125..ec42a871f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -17,22 +17,22 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvCD32f/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2X53V1/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start: task1
-  echo 'TASK1_OUTPUT'
+πŸ”„   echo 'TASK1_OUTPUT'
πŸ”„ Running post-start: task2
-  echo 'TASK2_OUTPUT'
+πŸ”„   echo 'TASK2_OUTPUT'
πŸ”„ Running post-start: task3
-  echo 'TASK3_OUTPUT'
+πŸ”„   echo 'TASK3_OUTPUT'
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index c18fb27de..701d48dac 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDFFKYR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOIus7T/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  sleep 1 && echo 'Background task done' > background.txt
+πŸ”„   sleep 1 && echo 'Background task done' > background.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
index 7155064c9..09293b12f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8cmWMx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA6AEQ4/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature at [REPO].feature
-
+βœ… βœ… Switched to worktree for feature at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 44c393536..8be55a50c 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptW56UH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSjBaMW/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add test file
+πŸ”„ * [SHA] (HEAD -> feature) Add test file
- test.txt | 1 +
+πŸ”„ test.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+πŸ”„ βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 5b3060d22..fe9ccc0c1 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/push.rs
info:
program: wt
args:
+ - dev
- push
env:
CLICOLOR_FORCE: "1"
@@ -15,11 +16,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjaOCrN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHXGRjT/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Pushed to feature
+πŸ”„ βœ… Pushed to feature
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index c289874aa..b2a8187db 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRYtwGn/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk8RAcp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+πŸ”„ βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index e60671f5b..c951191c9 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -16,18 +16,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX4hE69/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps7hTpJ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-* [SHA] (HEAD -> feature) Add feature file
+πŸ”„ * [SHA] (HEAD -> feature) Add feature file
- feature.txt | 1 +
+πŸ”„ feature.txt | 1 +
1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+πŸ”„ βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index 476a175c9..d4a56d72a 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -18,23 +18,23 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTA9M28/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFypu81/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 3 commits to main @ [SHA] (no commit/squash/rebase needed, merge commits allowed)
+πŸ”„ πŸ”„ Pushing 3 commits to main @ [SHA] (no commit/squash/rebase needed, merge commits allowed)
-* [SHA] (HEAD -> feature) Merge temp
+πŸ”„ * [SHA] (HEAD -> feature) Merge temp
|/
| * [SHA] (temp) Commit 2
|/
* [SHA] Commit 1
- file1.txt | 1 +
+πŸ”„ file1.txt | 1 +
file2.txt | 1 +
2 files changed, 2 insertions(+)
-βœ… Pushed to main (3 commits, 2 files, +2)
+πŸ”„ βœ… Pushed to main (3 commits, 2 files, +2)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
index 13951eb82..a97d55519 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUGNVDx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYindqm/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree...
-βœ… Already on default branch main
+πŸ”„ πŸ”„ Removing worktree...
+βœ… βœ… Already on default branch main
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
index 0f077816b..2c167dc10 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYBQ7Tb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTNWqm5/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Removing worktree for feature-dirty...
+πŸ”„ πŸ”„ Removing worktree for feature-dirty...
----- stderr -----
❌ Working tree has uncommitted changes
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
index 51b066d46..8ec579b7f 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjpw5Wg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjuErOv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree for feature-a...
-βœ… Removed worktree & branch for feature-a
+πŸ”„ πŸ”„ Removing worktree for feature-a...
+βœ… βœ… Removed worktree & branch for feature-a
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
index 31cccb2b3..3f3736346 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8wSstb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKqQe91/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree for feature-b...
-βœ… Removed worktree & branch for feature-b
+πŸ”„ πŸ”„ Removing worktree for feature-b...
+βœ… βœ… Removed worktree & branch for feature-b
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 9a8a7249e..ab3843e8a 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5limTL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxgosAA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree for feature-current...
-βœ… Removed worktree & branch for feature-current, returned to primary at [REPO]
+πŸ”„ πŸ”„ Removing worktree for feature-current...
+βœ… βœ… Removed worktree & branch for feature-current, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap
index fc7830fa6..f04e356a5 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1eKvXS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbyiI9Y/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Removing worktree...
+πŸ”„ πŸ”„ Removing worktree...
----- stderr -----
❌ Working tree has uncommitted changes
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index ec897a4d2..2bf4f1c00 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjheYz9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsz7fJr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree...
-βœ… Removed worktree & branch for feature-wt, returned to primary at [REPO]
+πŸ”„ πŸ”„ Removing worktree...
+βœ… βœ… Removed worktree & branch for feature-wt, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 3c66de82b..5240a10c6 100644
Binary files a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap and b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap differ
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 2b593fd6a..9217f89ca 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
@@ -18,16 +18,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4D6efo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTkCjKE/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree for feature-b...
-βœ… Removed worktree & branch for feature-b
-πŸ”„ Removing worktree for feature-c...
-βœ… Removed worktree & branch for feature-c
-πŸ”„ Removing worktree for feature-a...
-βœ… Removed worktree & branch for feature-a, returned to primary at [REPO]
+πŸ”„ πŸ”„ Removing worktree for feature-b...
+βœ… βœ… Removed worktree & branch for feature-b
+πŸ”„ πŸ”„ Removing worktree for feature-c...
+βœ… βœ… Removed worktree & branch for feature-c
+πŸ”„ πŸ”„ Removing worktree for feature-a...
+βœ… βœ… Removed worktree & branch for feature-a, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index 8a3b6060a..df66c2258 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
@@ -18,16 +18,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXGv0t9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ9KBYG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree for feature-a...
-βœ… Removed worktree & branch for feature-a
-πŸ”„ Removing worktree for feature-b...
-βœ… Removed worktree & branch for feature-b
-πŸ”„ Removing worktree for feature-c...
-βœ… Removed worktree & branch for feature-c
+πŸ”„ πŸ”„ Removing worktree for feature-a...
+βœ… βœ… Removed worktree & branch for feature-a
+πŸ”„ πŸ”„ Removing worktree for feature-b...
+βœ… βœ… Removed worktree & branch for feature-b
+πŸ”„ πŸ”„ Removing worktree for feature-c...
+βœ… βœ… Removed worktree & branch for feature-c
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
index 1eebb8f7c..454b86e77 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpag8zin/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpILb7fx/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Removing worktree for nonexistent...
+πŸ”„ πŸ”„ Removing worktree for nonexistent...
----- stderr -----
❌ No worktree found for branch nonexistent
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
index 05b8be4a9..1d8eae592 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmkWgHe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaVjhhZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree...
-βœ… Switched to default branch main
+πŸ”„ πŸ”„ Removing worktree...
+βœ… βœ… Switched to default branch main
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
index 162b035e2..314f13436 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
@@ -18,14 +18,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKbCDyO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRbhhjh/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 --base flag is only used with --create, ignoring
-βœ… Switched to worktree for main at [REPO]
-
+βœ… βœ… Switched to worktree for main at [REPO]
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index 7d988d630..3e0a890fc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpipWAwL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwuEKhK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature-x from main at [REPO].feature-x
-
+βœ… βœ… Created new worktree for feature-x from main at [REPO].feature-x
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index 131201f87..6c0f15dce 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwQDaB0/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdBYaoz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-
+βœ… βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index 5bfa6a1cc..c82564b26 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyj82cK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8bTEMk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for remote-feature from main at [REPO].remote-feature
-
+βœ… βœ… Created new worktree for remote-feature from main at [REPO].remote-feature
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index cc43fe45d..159822795 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiWgyEm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLRXDbP/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for file-test from main at [REPO].file-test
-πŸ”„ Executing (--execute):
-  echo 'test content' > test.txt
+βœ… βœ… Created new worktree for file-test from main at [REPO].file-test
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo 'test content' > test.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 4ef4f2501..df7c6dc45 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -18,14 +18,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5GO4af/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpREjrNk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
-πŸ”„ Executing (--execute):
-  echo 'existing worktree' > existing.txt
+βœ… βœ… Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo 'existing worktree' > existing.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index 3c3c844a8..9b52a5e35 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMYplGI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSs1PnD/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-βœ… Created new worktree for fail-test from main at [REPO].fail-test
-πŸ”„ Executing (--execute):
-  exit 1
+βœ… βœ… Created new worktree for fail-test from main at [REPO].fail-test
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index 7440e24b4..01df42697 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUlhmRk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0WAoet/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
-πŸ”„ Executing (--execute):
-  echo 'line1'
+βœ… βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo 'line1'
  echo 'line2'
  echo 'line3'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 38e9c1b7c..35c3f8034 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTQuy9K/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQpYQK7/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for exec-test from main at [REPO].exec-test
-πŸ”„ Executing (--execute):
-  echo 'test output'
+βœ… βœ… Created new worktree for exec-test from main at [REPO].exec-test
+πŸ”„ πŸ”„ Executing (--execute):
+πŸ”„   echo 'test output'
test output
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
index 83af19990..37c45c66a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuAlPpk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ2ucKs/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature-z at [WORKTREE_FEATURE_Z]
-
+βœ… βœ… Switched to worktree for feature-z at [WORKTREE_FEATURE_Z]
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index ce44c6279..b1078275b 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap and b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap differ
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index b72c9f082..06e241dd7 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap differ
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 6f852663a..5a1b930ef 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap differ
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
index 211529bd9..c8e216a16 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSR6qHw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1C84Tn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature-from-main from main at [REPO].feature-from-main
-
+βœ… βœ… Created new worktree for feature-from-main from main at [REPO].feature-from-main
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
index 45d7f6268..e0a5559c7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSR6qHw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1C84Tn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for existing-branch at [WORKTREE_EXISTING_BRANCH]
-
+βœ… βœ… Switched to worktree for existing-branch at [WORKTREE_EXISTING_BRANCH]
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index c80b0ee75..7914874e7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -19,13 +19,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWkBRzz/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpy0k16I/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature-with-base from main at [REPO].feature-with-base
-
+βœ… βœ… Created new worktree for feature-with-base from main at [REPO].feature-with-base
+πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
----- stderr -----