Skip to content

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

Fix: Update command output to use new gutter output

Maximilian Rooscec09e87f19f
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 82e885e8a..c416e3daa 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -508,8 +508,8 @@ 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_bash_with_gutter(&prepared.expanded, ""))?;
+ crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
// Extract exit code from ChildProcessExited to preserve signal information
@@ -577,8 +577,8 @@ 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_bash_with_gutter(&prepared.expanded, ""))?;
+ crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(main_worktree_path, &prepared.expanded) {
let warning_bold = WARNING.bold();
@@ -646,8 +646,8 @@ 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_bash_with_gutter(&prepared.expanded, ""))?;
+ crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
// Extract exit code from ChildProcessExited to preserve signal information
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 4321b5a1e..1d6707753 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -485,8 +485,8 @@ 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_bash_with_gutter(&prepared.expanded, ""))?;
+ crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
let warning_bold = WARNING.bold();
@@ -535,8 +535,8 @@ 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_bash_with_gutter(&prepared.expanded, ""))?;
+ crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
let name = prepared.name.as_deref().unwrap_or("cmd");
match spawn_detached(worktree_path, &prepared.expanded, name) {
@@ -592,8 +592,8 @@ 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_bash_with_gutter(&prepared.expanded, ""))?;
+ crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {
let message = match &prepared.name {
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 6233c67df..96a550b36 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -106,9 +106,9 @@ pub fn handle_switch_output(
pub fn execute_user_command(command: &str) -> Result<(), GitError> {
use worktrunk::styling::{CYAN, format_bash_with_gutter};
- // Show what command is being executed (matches post-create/post-start format)
- super::progress(format!("{CYAN}Executing (--execute){CYAN:#}"))?;
- super::progress(format_bash_with_gutter(command, ""))?;
+ // Show what command is being executed (section header + gutter content)
+ super::progress(format!("{CYAN}Executing (--execute):{CYAN:#}"))?;
+ super::gutter(format_bash_with_gutter(command, ""))?;
super::execute(command)?;
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 982c77b19..1bd3de242 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
@@ -3,8 +3,8 @@ 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'
+πŸ”„ 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_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index feede0c91..407d40927 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
@@ -3,5 +3,5 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
βœ… Created new worktree for fish-bg from main: [TMPDIR]/test-repo.fish-bg
-πŸ”„ Running post-start
-πŸ”„   echo 'fish background task'
+πŸ”„ Running post-start:
+  echo 'fish background task'
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 a03bc41d8..6680cc01a 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
@@ -2,13 +2,13 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge: format
-πŸ”„   echo 'βœ“ Code formatting check passed'
+πŸ”„ Running pre-merge: format:
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
-πŸ”„ Running pre-merge: test
-πŸ”„   echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+πŸ”„ Running pre-merge: test:
+  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 1994198be..5d99f1529 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
@@ -9,9 +9,9 @@ expression: output.normalized()
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'
+πŸ”„ Running pre-merge: format:
+  echo 'βœ“ Code formatting check passed'
-πŸ”„ Running pre-merge: test
-πŸ”„   echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+πŸ”„ Running pre-merge: test:
+  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 66fbf2b5c..89c813c23 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
@@ -2,18 +2,18 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge: format
-πŸ”„   echo 'βœ“ Code formatting check passed'
+πŸ”„ Running pre-merge: format:
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
-πŸ”„ Running pre-merge: lint
-πŸ”„   echo 'βœ“ Linting passed - no warnings'
+πŸ”„ Running pre-merge: lint:
+  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
-πŸ”„ Running pre-merge: test
-πŸ”„   echo 'βœ“ All 47 tests passed in 2.3s'
+πŸ”„ Running pre-merge: test:
+  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
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 af31e0d1a..0bbf4198c 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
@@ -5,16 +5,16 @@ expression: output.normalized()
βœ“ Code formatting check passed
βœ“ Linting passed - no warnings
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Running pre-merge: format
-πŸ”„   echo 'βœ“ Code formatting check passed'
+πŸ”„ Running pre-merge: format:
+  echo 'βœ“ Code formatting check passed'
-πŸ”„ Running pre-merge: lint
-πŸ”„   echo 'βœ“ Linting passed - no warnings'
+πŸ”„ Running pre-merge: lint:
+  echo 'βœ“ Linting passed - no warnings'
-πŸ”„ Running pre-merge: test
-πŸ”„   echo 'βœ“ All 47 tests passed in 2.3s'
+πŸ”„ Running pre-merge: test:
+  echo 'βœ“ All 47 tests passed in 2.3s'
πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
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 2e8281ab4..2b43a584f 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
@@ -3,7 +3,7 @@ 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
+πŸ”„ 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 2e8281ab4..2b43a584f 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
@@ -3,7 +3,7 @@ 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
+πŸ”„ 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 a0ba8aa39..9b924f6b0 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
@@ -4,17 +4,17 @@ expression: output.normalized()
---
Installing dependencies...
Building project...
-πŸ”„ Running post-create
-πŸ”„   echo 'Installing dependencies...'
+πŸ”„ Running post-create:
+  echo 'Installing dependencies...'
-πŸ”„ Running post-create
-πŸ”„   echo 'Building project...'
+πŸ”„ Running post-create:
+  echo 'Building project...'
βœ… Created new worktree for feature-hooks from main: [TMPDIR]/test-repo.feature-hooks
-πŸ”„ Running post-start: server
-πŸ”„   echo 'Starting dev server on port 3000'
+πŸ”„ Running post-start: server:
+  echo 'Starting dev server on port 3000'
-πŸ”„ Running post-start: watch
-πŸ”„   echo 'Watching for file changes'
+πŸ”„ Running post-start: watch:
+  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 1f55ffe3f..8f4592d12 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
@@ -3,5 +3,5 @@ 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
-πŸ”„ Running post-start
-πŸ”„   echo 'test command executed'
+πŸ”„ Running post-start:
+  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 51dfd93a5..7451e64ef 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
@@ -3,5 +3,5 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
βœ… Created new worktree for feature-bg from main: [TMPDIR]/test-repo.feature-bg
-πŸ”„ Running post-start
-πŸ”„   echo 'background task'
+πŸ”„ Running post-start:
+  echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 01d75280b..115cdf458 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaVc3M5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqEpWGO/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   echo 'approved' > output.txt
-
+πŸ”„ Running post-create:
+  echo 'approved' > output.txt
βœ… Created new worktree for test-approved from main at [REPO].test-approved
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
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 5f4514076..7704b849c 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,14 +18,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpy5XJhx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQAP3Yx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   echo 'test command' > output.txt
-
+πŸ”„ Running post-create:
+  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
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 ddf7628fd..291b40cce 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmOSWr4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDDXmUl/test-config.toml
---
success: true
exit_code: 0
@@ -32,9 +32,8 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
-πŸ”„ Running post-merge
-πŸ”„   exit 1
-
+πŸ”„ Running post-merge:
+  exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
----- stderr -----
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 4f002516e..dc710d02a 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppLhkLE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe37K5e/test-config.toml
---
success: true
exit_code: 0
@@ -32,12 +32,10 @@ exit_code: 0
βœ… 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
-
-πŸ”„ Running post-merge: deploy
-πŸ”„   echo 'Deploying branch feature' > deploy.txt
-
+πŸ”„ Running post-merge: notify:
+  echo 'Merge to main complete' > notify.txt
+πŸ”„ Running post-merge: deploy:
+  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 f696a3fc1..4c0bf193c 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS5qm6b/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGQrDI4/test-config.toml
---
success: true
exit_code: 0
@@ -32,9 +32,8 @@ exit_code: 0
βœ… 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
-
+πŸ”„ Running post-merge:
+  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 ccaa575c4..05e4a0e34 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,15 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgoGmah/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp97ZTTt/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
🟑 Auto-staging untracked files: feature.txt
-πŸ”„ Running pre-commit
-πŸ”„   exit 1
-
+πŸ”„ Running pre-commit:
+  exit 1
----- stderr -----
❌ pre-commit command failed
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 7faca2473..8970728ef 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,15 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM3vS2m/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKHKovW/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: feature.txt
-πŸ”„ Running pre-commit
-πŸ”„   echo 'Pre-commit check passed'
-
+πŸ”„ Running pre-commit:
+  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
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 56b8342bf..e8c6d4026 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
@@ -3,14 +3,12 @@ source: tests/integration_tests/merge.rs
expression: output
---
Exit code: 0
-πŸ”„ Running pre-merge: first
-πŸ”„   echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
-
+πŸ”„ Running pre-merge: first:
+  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
-
+πŸ”„ Running pre-merge: second:
+  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)
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 75b590e23..562250d06 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0lnSoa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKQlaCt/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Running pre-merge
-πŸ”„   exit 1
-
+πŸ”„ Running pre-merge:
+  exit 1
----- stderr -----
❌ pre-merge command failed
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 90b4ae82f..f6f46d582 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,20 +17,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpylBXX6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpj625Fv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge: format
-πŸ”„   exit 0
-
-πŸ”„ Running pre-merge: lint
-πŸ”„   exit 0
-
-πŸ”„ Running pre-merge: test
-πŸ”„   exit 0
-
+πŸ”„ Running pre-merge: format:
+  exit 0
+πŸ”„ Running pre-merge: lint:
+  exit 0
+πŸ”„ Running pre-merge: test:
+  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
πŸ”„ * [SHA] (HEAD -> feature) Add feature file
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 82cdaccda..824a5a6a3 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,17 +17,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMX1QtW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb4feBX/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge: check1
-πŸ”„   [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
-
-πŸ”„ Running pre-merge: check2
-πŸ”„   [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
-
+πŸ”„ Running pre-merge: check1:
+  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
+πŸ”„ Running pre-merge: check2:
+  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
πŸ”„ * [SHA] (HEAD -> feature) Add feature file
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 b2926d1f0..502dcf042 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfQFs4E/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTFNUHP/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge
-πŸ”„   exit 0
-
+πŸ”„ Running pre-merge:
+  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
πŸ”„ * [SHA] (HEAD -> feature) Add feature file
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 f7b0d4fac..df6215ec6 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNcyKxP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEBZp8P/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Running pre-commit
-πŸ”„   exit 1
-
+πŸ”„ Running pre-commit:
+  exit 1
----- stderr -----
❌ pre-commit command failed
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 7c8479337..7c500031c 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2uTNYU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaaZTRS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-commit
-πŸ”„   echo 'Pre-commit check passed'
-
+πŸ”„ Running pre-commit:
+  echo 'Pre-commit check passed'
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
πŸ”„ * [SHA] (HEAD -> feature) Add feature file
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 5c91578f3..4789c2969 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDTrfO7/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/.tmp6wrGds/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/.tmpDTrfO7/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6wrGds/test-config.toml
---
success: true
exit_code: 0
@@ -35,12 +35,10 @@ exit_code: 0
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
βœ… Squashed @ [SHA]
-πŸ”„ Running pre-merge: test
-πŸ”„   cargo test
-
-πŸ”„ Running pre-merge: lint
-πŸ”„   cargo clippy
-
+πŸ”„ Running pre-merge: test:
+  cargo test
+πŸ”„ Running pre-merge: lint:
+  cargo clippy
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
πŸ”„ * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
@@ -53,9 +51,8 @@ exit_code: 0
βœ… Merged to main (1 commit, 3 files, +3)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
-πŸ”„ Running post-merge: install
-πŸ”„   cargo install --path .
-
+πŸ”„ Running post-merge: install:
+  cargo install --path .
----- stderr -----
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
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 9c6905e89..6fd084ad9 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,20 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXxhnEO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIiybQ2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   echo 'Setup done' > setup.txt
-
+πŸ”„ Running post-create:
+  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
-
+πŸ”„ Running post-start: server:
+  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 9679aa17c..dc9887d44 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,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIzJ74g/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyxbdnj/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Created new worktree for feature from main at [REPO].feature
-πŸ”„ Running post-start
-πŸ”„   echo 'Background task' > background.txt
-
-πŸ”„ Executing (--execute)
-πŸ”„   echo 'Execute flag' > execute.txt
-
+πŸ”„ Running post-start:
+  echo 'Background task' > background.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 f984e4fd7..ddeb098dd 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWO7UHy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNXDxne/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   exit 1
-
+πŸ”„ Running post-create:
+  exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘
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 fa218c24a..10d669146 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,18 +17,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0xdTwu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4dIZtp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   if [ ! -f test.txt ]; then
+πŸ”„ Running post-create:
+  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
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
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 afbbc6390..a8dce35d8 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,17 +17,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ5ZMEa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOaI6ok/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   echo 'First'
-
-πŸ”„ Running post-create
-πŸ”„   echo 'Second'
-
+πŸ”„ Running post-create:
+  echo 'First'
+πŸ”„ Running post-create:
+  echo 'Second'
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
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 ecb919188..40a8363c3 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,17 +17,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFRyryd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDrGzjb/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create: install
-πŸ”„   echo 'Installing deps'
-
-πŸ”„ Running post-create: setup
-πŸ”„   echo 'Running setup'
-
+πŸ”„ Running post-create: install:
+  echo 'Installing deps'
+πŸ”„ Running post-create: setup:
+  echo 'Running setup'
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
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 dd69e623e..13d46f745 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,14 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuHf6zT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnD1eiR/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   echo 'Setup complete'
-
+πŸ”„ Running post-create:
+  echo 'Setup complete'
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
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 6b30360e9..3972ad7a0 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,23 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdiiVvx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAei6GS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create
-πŸ”„   echo 'Repo: test-repo' > info.txt
-
-πŸ”„ Running post-create
-πŸ”„   echo 'Branch: feature-test' >> info.txt
-
-πŸ”„ Running post-create
-πŸ”„   echo 'Worktree: [REPO].feature-test' >> info.txt
-
-πŸ”„ Running post-create
-πŸ”„   echo 'Root: [REPO]' >> info.txt
-
+πŸ”„ Running post-create:
+  echo 'Repo: test-repo' > info.txt
+πŸ”„ Running post-create:
+  echo 'Branch: feature-test' >> info.txt
+πŸ”„ Running post-create:
+  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
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
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 57bb3369e..9ba66e7f8 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiF62jX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKQqZsk/test-config.toml
---
success: true
exit_code: 0
@@ -25,10 +25,9 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
-πŸ”„ Running post-start
-πŸ”„   echo 'line1
+πŸ”„ Running post-start:
+  echo 'line1
  line2
  line3' | grep line2 > filtered.txt
-
----- stderr -----
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 f27c77719..c4d4adb10 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph1KCcs/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp411LIl/test-config.toml
---
success: true
exit_code: 0
@@ -25,8 +25,7 @@ exit_code: 0
βœ… 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
-
+πŸ”„ Running post-start:
+  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 78f5fdd49..614248587 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5J5kSa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0DSOPX/test-config.toml
---
success: true
exit_code: 0
@@ -25,8 +25,7 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘
πŸ’‘ To enable automatic cd, run: wt config shell
-πŸ”„ Running post-start
-πŸ”„   echo 'unclosed quote
-
+πŸ”„ Running post-start:
+  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 5fa75f1e4..cf8fe75bf 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIpV3RD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdS30NW/test-config.toml
---
success: true
exit_code: 0
@@ -25,8 +25,7 @@ exit_code: 0
βœ… 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
-
+πŸ”„ Running post-start:
+  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 c689df6e9..9d9740fe0 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzbKRSJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT3TiED/test-config.toml
---
success: true
exit_code: 0
@@ -25,10 +25,9 @@ exit_code: 0
βœ… 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
+πŸ”„ Running post-start:
+  echo 'first line' > multiline.txt
  echo 'second line' >> multiline.txt
  echo 'third line' >> multiline.txt
-
----- stderr -----
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 b083e6248..029f1a3a1 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHzswHG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0R1GR5/test-config.toml
---
success: true
exit_code: 0
@@ -25,11 +25,9 @@ exit_code: 0
βœ… 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
-
-πŸ”„ Running post-start: task2
-πŸ”„   echo 'Task 2 running' > task2.txt
-
+πŸ”„ Running post-start: task1:
+  echo 'Task 1 running' > task1.txt
+πŸ”„ Running post-start: task2:
+  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 e9898b280..cd9547aea 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0BJXcN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvmg3UA/test-config.toml
---
success: true
exit_code: 0
@@ -25,14 +25,11 @@ exit_code: 0
βœ… 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'
-
-πŸ”„ Running post-start: task2
-πŸ”„   echo 'TASK2_OUTPUT'
-
-πŸ”„ Running post-start: task3
-πŸ”„   echo 'TASK3_OUTPUT'
-
+πŸ”„ Running post-start: task1:
+  echo 'TASK1_OUTPUT'
+πŸ”„ Running post-start: task2:
+  echo 'TASK2_OUTPUT'
+πŸ”„ Running post-start: task3:
+  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 752e6acf2..fba36d83c 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKNzqge/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5CyFWs/test-config.toml
---
success: true
exit_code: 0
@@ -25,8 +25,7 @@ exit_code: 0
βœ… 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
-
+πŸ”„ Running post-start:
+  sleep 1 && echo 'Background task done' > background.txt
----- 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 8293da9ad..98029675d 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,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNVvkLl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUvmJlg/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
-
+πŸ”„ 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 1d020b7d6..f6d882b2a 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,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprDvNjP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0y3m8G/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
-
+πŸ”„ 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 a541e7565..941edb103 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -19,15 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBSMnfY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnShSEJ/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
-
+πŸ”„ Executing (--execute):
+  exit 1
----- stderr -----
Command failed with exit code: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index c258449f7..a9ac2b1b3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -19,17 +19,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEZv8HJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpt7iHt9/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'
+πŸ”„ Executing (--execute):
+  echo 'line1'
  echo 'line2'
  echo 'line3'
-
line1
line2
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 d63090709..f9601fa20 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -19,15 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpy82RDk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3C1t5n/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'
-
+πŸ”„ Executing (--execute):
+  echo 'test output'
test output
----- stderr -----
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 b68a709cb..2f744f329 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