Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
style(output): Bold command names in hook messages
Maximilian Roos1dac5470d2b0
diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 9099ef0bf..99bdb9536 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -616,12 +616,8 @@ pub fn run_pre_commit_commands(// Execute each command sequentiallyfor prepared in commands {- let header = if let Some(name) = &prepared.name {- format!("π {CYAN}Running pre-commit command {CYAN_BOLD}{name}{CYAN_BOLD:#}:{CYAN:#}")- } else {- format!("π {CYAN}Running pre-commit command:{CYAN:#}")- };- crate::output::progress(header)?;+ 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, ""))?;if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {@@ -678,12 +674,8 @@ pub fn run_pre_squash_commands(// Execute each command sequentiallyfor prepared in commands {- let header = if let Some(name) = &prepared.name {- format!("π {CYAN}Running pre-squash command {CYAN_BOLD}{name}{CYAN_BOLD:#}:{CYAN:#}")- } else {- format!("π {CYAN}Running pre-squash command:{CYAN:#}")- };- crate::output::progress(header)?;+ let label = crate::commands::format_command_label("pre-squash", prepared.name.as_deref());+ 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/mod.rs b/src/commands/mod.rsindex 1b40d9132..3835701ca 100644--- a/src/commands/mod.rs+++ b/src/commands/mod.rs@@ -27,11 +27,16 @@ pub use worktrunk::shell::Shell;/// Format command execution label with optional command name.////// Examples:-/// - `format_command_label("post-create", Some("install"))` β `"Running post-create: install"`+/// - `format_command_label("post-create", Some("install"))` β `"Running post-create: install"` (with bold)/// - `format_command_label("post-create", None)` β `"Running post-create:"`pub fn format_command_label(command_type: &str, name: Option<&str>) -> String {+ use worktrunk::styling::AnstyleStyle;+match name {- Some(name) => format!("Running {command_type}: {name}"),+ Some(name) => {+ let bold = AnstyleStyle::new().bold();+ format!("Running {command_type}: {bold}{name}{bold:#}")+ }None => format!("Running {command_type}:"),}}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.snapindex 4ece4dbc7..103acde8f 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.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passed-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1β Test suite failed: 3 tests failingdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap.newnew file mode 100644index 000000000..da9ffbd5a--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap.new@@ -0,0 +1,20 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 717+expression: output.normalized().as_ref()+---+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mecho [32m'β Code formatting check passed'++β Code formatting check passed++π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1++β Test suite failed: 3 tests failing+β [31mPre-merge command failed: [1m[31mtest[0m[0m++Command failed with exit code: exit status: 1++π‘ [2mUse --no-hooks to skip pre-merge commands[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snapindex 3c881fa1f..bc3440deb 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap@@ -3,11 +3,11 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passed-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1β Test suite failed: 3 tests failingdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap.newnew file mode 100644index 000000000..9673315c0--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap.new@@ -0,0 +1,19 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 717+expression: output.normalized().as_ref()+---+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mecho [32m'β Code formatting check passed'++β Code formatting check passed+π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1++β Test suite failed: 3 tests failing+β [31mPre-merge command failed: [1m[31mtest[0m[0m++Command failed with exit code: exit status: 1++π‘ [2mUse --no-hooks to skip pre-merge commands[0mdiff --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.snapindex b120b47be..07373c5c9 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,9 +10,9 @@ Command failed with exit code: exit status: 1π‘ [2mUse --no-hooks to skip pre-merge commands[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap.newnew file mode 100644index 000000000..ebd4c339f--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap.new@@ -0,0 +1,19 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 717+expression: output.normalized().as_ref()+---+β Code formatting check passed+β Test suite failed: 3 tests failing+β [31mPre-merge command failed: [1m[31mtest[0m[0m++Command failed with exit code: exit status: 1++π‘ [2mUse --no-hooks to skip pre-merge commands[0m+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mecho [32m'β Code formatting check passed'+++π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1diff --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.snapindex 04cd1cfea..a4b7cf9ee 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,17 +3,17 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passed-π [36mRunning pre-merge: lint[0m+π [36mRunning pre-merge: [1mlint[0m[0m[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'β Linting passed - no warnings-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'β All 47 tests passed in 2.3sdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap.newnew file mode 100644index 000000000..bee47d583--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap.new@@ -0,0 +1,32 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 637+expression: output.normalized().as_ref()+---+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mecho [32m'β Code formatting check passed'++β Code formatting check passed++π [36mRunning pre-merge: [1mlint[0m[0m+[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'++β Linting passed - no warnings++π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'++β All 47 tests passed in 2.3s++π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m++* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[TMPDIR]/test-repo[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snapindex dc2d49504..df5dbd171 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap@@ -3,15 +3,15 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passed-π [36mRunning pre-merge: lint[0m+π [36mRunning pre-merge: [1mlint[0m[0m[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'β Linting passed - no warnings-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'β All 47 tests passed in 2.3sdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap.newnew file mode 100644index 000000000..e9aab353e--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap.new@@ -0,0 +1,28 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 637+expression: output.normalized().as_ref()+---+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mecho [32m'β Code formatting check passed'++β Code formatting check passed+π [36mRunning pre-merge: [1mlint[0m[0m+[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'++β Linting passed - no warnings+π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'++β All 47 tests passed in 2.3s+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m++* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m+β [32mReturned to primary at [2m[TMPDIR]/test-repo[0m[0mdiff --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.snapindex 4c8177274..c1c60b7bc 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,15 +6,15 @@ expression: output.normalized().as_ref()β Linting passed - no warningsβ All 47 tests passed in 2.3sπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'-π [36mRunning pre-merge: lint[0m+π [36mRunning pre-merge: [1mlint[0m[0m[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mecho [32m'β 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.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap.newnew file mode 100644index 000000000..c9aaaa649--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap.new@@ -0,0 +1,32 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 637+expression: output.normalized().as_ref()+---+β Code formatting check passed+β Linting passed - no warnings+β All 47 tests passed in 2.3s+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mecho [32m'β Code formatting check passed'+++π [36mRunning pre-merge: [1mlint[0m[0m+[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'+++π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'+++π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m++* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[TMPDIR]/test-repo[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snapindex d7d7f533b..ecc91e3a9 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap@@ -2,20 +2,20 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mRunning post-create: 1[0m+π [36mRunning post-create: [1m1[0m[0m[40m [0m [1m[34mecho [32m'Installing dependencies...'Installing dependencies...-π [36mRunning post-create: 2[0m+π [36mRunning post-create: [1m2[0m[0m[40m [0m [1m[34mecho [32m'Building project...'Building project...-π [36mRunning post-start: server[0m+π [36mRunning post-start: [1mserver[0m[0m[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'-π [36mRunning post-start: watch[0m+π [36mRunning post-start: [1mwatch[0m[0m[40m [0m [1m[34mecho [32m'Watching for file changes'β [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap.newnew file mode 100644index 000000000..67045b929--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap.new@@ -0,0 +1,22 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 551+expression: output.normalized().as_ref()+---+π [36mRunning post-create: [1m1[0m[0m+[40m [0m [1m[34mecho [32m'Installing dependencies...'++Installing dependencies...++π [36mRunning post-create: [1m2[0m[0m+[40m [0m [1m[34mecho [32m'Building project...'++Building project...++π [36mRunning post-start: [1mserver[0m[0m+[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'++π [36mRunning post-start: [1mwatch[0m[0m+[40m [0m [1m[34mecho [32m'Watching for file changes'++β [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --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.snapindex 3670f0786..10e75f563 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,18 +4,18 @@ expression: output.normalized().as_ref()---Installing dependencies...Building project...-π [36mRunning post-create: 1[0m+π [36mRunning post-create: [1m1[0m[0m[40m [0m [1m[34mecho [32m'Installing dependencies...'-π [36mRunning post-create: 2[0m+π [36mRunning post-create: [1m2[0m[0m[40m [0m [1m[34mecho [32m'Building project...'-π [36mRunning post-start: server[0m+π [36mRunning post-start: [1mserver[0m[0m[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'-π [36mRunning post-start: watch[0m+π [36mRunning post-start: [1mwatch[0m[0m[40m [0m [1m[34mecho [32m'Watching for file changes'β [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap.new b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap.newnew file mode 100644index 000000000..a384736c9--- /dev/null+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap.new@@ -0,0 +1,22 @@+---+source: tests/integration_tests/shell_wrapper.rs+assertion_line: 551+expression: output.normalized().as_ref()+---+Installing dependencies...+Building project...+π [36mRunning post-create: [1m1[0m[0m+[40m [0m [1m[34mecho [32m'Installing dependencies...'+++π [36mRunning post-create: [1m2[0m[0m+[40m [0m [1m[34mecho [32m'Building project...'+++π [36mRunning post-start: [1mserver[0m[0m+[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'++π [36mRunning post-start: [1mwatch[0m[0m+[40m [0m [1m[34mecho [32m'Watching for file changes'++β [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --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.snapindex 3dac13d4a..fe198c04a 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@@ -13,10 +13,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgfHFF8/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpc1lOt8/test-config.toml---success: trueexit_code: 0@@ -33,10 +34,10 @@ exit_code: 0π [36mCleaning up worktree...[0mβ [32mReturned to primary at [2m[REPO][0m[0m-π [36mRunning post-merge: deploy[0m+π [36mRunning post-merge: [1mdeploy[0m[0m[40m [0m [1m[34mecho [32m'Deploying branch feature' [36m> deploy.txt-π [36mRunning post-merge: notify[0m+π [36mRunning post-merge: [1mnotify[0m[0m[40m [0m [1m[34mecho [32m'Merge to main complete' [36m> notify.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap.newnew file mode 100644index 000000000..01ea7d111--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap.new@@ -0,0 +1,45 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZuDvi6/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]++* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[REPO][0m[0m+π [36mRunning post-merge: [1mdeploy[0m[0m+[40m [0m [1m[34mecho [32m'Deploying branch feature' [36m> deploy.txt++π [36mRunning post-merge: [1mnotify[0m[0m+[40m [0m [1m[34mecho [32m'Merge to main complete' [36m> notify.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.snapindex ef633c0f3..daacce5d4 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,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyVyDrw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKlfwQ3/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mRunning pre-commit command:[0m+π [36mRunning pre-commit:[0m[40m [0m [1m[34mexit 1diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap.newnew file mode 100644index 000000000..3a6eb9e32--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap.new@@ -0,0 +1,35 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUsIoJF/test-config.toml+---+success: false+exit_code: 1+----- stdout -----+π [36mRunning pre-commit:[0m+[40m [0m [1m[34mexit 1+++----- stderr -----+β [31mPre-commit command failed[0m++Command failed with exit code: exit status: 1++π‘ [2mUse --no-hooks to skip pre-commit commands[0mdiff --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.snapindex 412c1b99b..2c73d8de2 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,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIalCkw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK99WuG/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning pre-commit command:[0m+π [36mRunning pre-commit:[0m[40m [0m [1m[34mecho [32m'Pre-commit check passed'π [36mCommitting changes...[0m (1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap.newnew file mode 100644index 000000000..e358c9286--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap.new@@ -0,0 +1,49 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUEoQg8/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning pre-commit:[0m+[40m [0m [1m[34mecho [32m'Pre-commit check passed'++π [36mCommitting changes...[0m (1 file, [32m+1[0m)+π [36mGenerating commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+[40m [0m [1mWIP: Auto-commit before merge[0m++β [32mCommitted changes[0m @ [SHA]+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]++* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before merge++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[REPO][0m[0m++----- stderr -----+Pre-commit check passeddiff --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.snapindex 5192a81ff..df8a78524 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,12 +4,12 @@ expression: output---Exit code: 0π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: first[0m+π [36mRunning pre-merge: [1mfirst[0m[0m[40m [0m [1m[34mecho [32m'STDOUT-FROM-FIRST' [36m&& [1m[34mecho [32m'STDERR-FROM-FIRST' >&2STDOUT-FROM-FIRSTSTDERR-FROM-FIRST-π [36mRunning pre-merge: second[0m+π [36mRunning pre-merge: [1msecond[0m[0m[40m [0m [1m[34mecho [32m'STDOUT-FROM-SECOND' [36m&& [1m[34mecho [32m'STDERR-FROM-SECOND' >&2STDOUT-FROM-SECONDdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap.newnew file mode 100644index 000000000..442e4991d--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap.new@@ -0,0 +1,28 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 1170+expression: output+---+Exit code: 0+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mfirst[0m[0m+[40m [0m [1m[34mecho [32m'STDOUT-FROM-FIRST' [36m&& [1m[34mecho [32m'STDERR-FROM-FIRST' >&2++STDOUT-FROM-FIRST+STDERR-FROM-FIRST+π [36mRunning pre-merge: [1msecond[0m[0m+[40m [0m [1m[34mecho [32m'STDOUT-FROM-SECOND' [36m&& [1m[34mecho [32m'STDERR-FROM-SECOND' >&2++STDOUT-FROM-SECOND+STDERR-FROM-SECOND+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]++* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[REPO][0m[0mdiff --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.snapindex 12d51b130..be9083c4e 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,19 +17,19 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9gK2VY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM0B2Vk/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: format[0m+π [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mexit 0-π [36mRunning pre-merge: lint[0m+π [36mRunning pre-merge: [1mlint[0m[0m[40m [0m [1m[34mexit 0-π [36mRunning pre-merge: test[0m+π [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mexit 0π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap.newnew file mode 100644index 000000000..d8254ad0f--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap.new@@ -0,0 +1,48 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcFiU4y/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mformat[0m[0m+[40m [0m [1m[34mexit 0++π [36mRunning pre-merge: [1mlint[0m[0m+[40m [0m [1m[34mexit 0++π [36mRunning pre-merge: [1mtest[0m[0m+[40m [0m [1m[34mexit 0++π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]++* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[REPO][0m[0m++----- 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.snapindex 33645a6c4..f15779039 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,16 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3GcE8o/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeOO9yg/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mRunning pre-merge: check1[0m+π [36mRunning pre-merge: [1mcheck1[0m[0m[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3-π [36mRunning pre-merge: check2[0m+π [36mRunning pre-merge: [1mcheck2[0m[0m[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap.newnew file mode 100644index 000000000..ad98787fe--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap.new@@ -0,0 +1,61 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprPYyIK/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRunning pre-merge: [1mcheck1[0m[0m+[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3++π [36mRunning pre-merge: [1mcheck2[0m[0m+[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3++π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]++* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[REPO][0m[0m++----- stderr -----+[check1] stdout line 1+[check1] stderr line 1+[check1] stdout line 2+[check1] stderr line 2+[check1] stdout line 3+[check1] stderr line 3+[check1] stdout complete+[check1] stderr complete+[check2] stdout line 1+[check2] stderr line 1+[check2] stdout line 2+[check2] stderr line 2+[check2] stdout line 3+[check2] stderr line 3+[check2] stdout complete+[check2] stderr completediff --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.snapindex 988084293..a2ddf0730 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@@ -18,12 +18,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVn5J0G/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2L2QHX/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mRunning pre-squash command:[0m+π [36mRunning pre-squash:[0m[40m [0m [1m[34mexit 1diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap.newnew file mode 100644index 000000000..d3222cfb9--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap.new@@ -0,0 +1,36 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--squash"+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRQAFh9/test-config.toml+---+success: false+exit_code: 1+----- stdout -----+π [36mRunning pre-squash:[0m+[40m [0m [1m[34mexit 1+++----- stderr -----+β [31mPre-squash command failed[0m++Command failed with exit code: exit status: 1++π‘ [2mUse --no-hooks to skip pre-squash commands[0mdiff --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.snapindex 0801bbffb..17239afb6 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@@ -14,15 +14,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5vSpTy/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptB95SO/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning pre-squash command:[0m+π [36mRunning pre-squash:[0m[40m [0m [1m[34mecho [32m'Pre-squash check passed'π‘ [2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap.new b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap.newnew file mode 100644index 000000000..810018b30--- /dev/null+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap.new@@ -0,0 +1,45 @@+---+source: tests/integration_tests/merge.rs+assertion_line: 12+info:+ program: wt+ args:+ - merge+ - main+ - "--squash"+ - "--force"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIFsLTm/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning pre-squash:[0m+[40m [0m [1m[34mecho [32m'Pre-squash check passed'++π‘ [2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0m+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]++* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file++ feature.txt | 1 [32m+[m+ 1 file changed, 1 insertion(+)++β [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m+π [36mCleaning up worktree...[0m++β [32mReturned to primary at [2m[REPO][0m[0m++----- stderr -----+Pre-squash check passeddiff --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.snapindex 979ce1e0a..501b7dbbf 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@@ -13,10 +13,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLkYtsf/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1gm53W/test-config.toml---success: trueexit_code: 0@@ -24,7 +25,7 @@ exit_code: 0π [36mRunning post-create:[0m[40m [0m [1m[34mecho [32m'Setup done' [36m> setup.txt-π [36mRunning post-start: server[0m+π [36mRunning post-start: [1mserver[0m[0m[40m [0m [1m[34msleep 0.5 [36m&& [1m[34mecho [32m'Server running' [36m> server.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap.new b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap.newnew file mode 100644index 000000000..0829721b8--- /dev/null+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap.new@@ -0,0 +1,36 @@+---+source: tests/integration_tests/post_start_commands.rs+assertion_line: 27+info:+ program: wt+ args:+ - switch+ - "--create"+ - feature+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWmBtPo/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-create:[0m+[40m [0m [1m[34mecho [32m'Setup done' [36m> setup.txt++π [36mRunning post-start: [1mserver[0m[0m+[40m [0m [1m[34msleep 0.5 [36m&& [1m[34mecho [32m'Server running' [36m> server.txt++β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0m++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.snapindex 369a67bfe..64fa9006c 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@@ -13,18 +13,19 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXP3KUE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMyvnDw/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning post-create: 1[0m+π [36mRunning post-create: [1m1[0m[0m[40m [0m [1m[34mecho [32m'First'-π [36mRunning post-create: 2[0m+π [36mRunning post-create: [1m2[0m[0m[40m [0m [1m[34mecho [32m'Second'β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap.new b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap.newnew file mode 100644index 000000000..047a11a9a--- /dev/null+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap.new@@ -0,0 +1,38 @@+---+source: tests/integration_tests/post_start_commands.rs+assertion_line: 27+info:+ program: wt+ args:+ - switch+ - "--create"+ - feature+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYONNMI/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-create: [1m1[0m[0m+[40m [0m [1m[34mecho [32m'First'++π [36mRunning post-create: [1m2[0m[0m+[40m [0m [1m[34mecho [32m'Second'++β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0m++To enable automatic cd, run: wt config shell++----- stderr -----+First+Seconddiff --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.snapindex 1ae1f0e93..572caa99a 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@@ -13,18 +13,19 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFeEv7z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0mBOY1/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning post-create: install[0m+π [36mRunning post-create: [1minstall[0m[0m[40m [0m [1m[34mecho [32m'Installing deps'-π [36mRunning post-create: setup[0m+π [36mRunning post-create: [1msetup[0m[0m[40m [0m [1m[34mecho [32m'Running setup'β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap.new b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap.newnew file mode 100644index 000000000..74b05eb9a--- /dev/null+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap.new@@ -0,0 +1,38 @@+---+source: tests/integration_tests/post_start_commands.rs+assertion_line: 27+info:+ program: wt+ args:+ - switch+ - "--create"+ - feature+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp05xeYK/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-create: [1minstall[0m[0m+[40m [0m [1m[34mecho [32m'Installing deps'++π [36mRunning post-create: [1msetup[0m[0m+[40m [0m [1m[34mecho [32m'Running setup'++β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0m++To enable automatic cd, run: wt config shell++----- stderr -----+Installing deps+Running setupdiff --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.snapindex 3d3a81e47..696c197c0 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@@ -13,24 +13,25 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8UllPf/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNSkMrr/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning post-create: 1[0m+π [36mRunning post-create: [1m1[0m[0m[40m [0m [1m[34mecho [32m'Repo: test-repo' [36m> info.txt-π [36mRunning post-create: 2[0m+π [36mRunning post-create: [1m2[0m[0m[40m [0m [1m[34mecho [32m'Branch: feature-test' [36m>> info.txt-π [36mRunning post-create: 3[0m+π [36mRunning post-create: [1m3[0m[0m[40m [0m [1m[34mecho [32m'Worktree: [REPO].feature-test' [36m>> info.txt-π [36mRunning post-create: 4[0m+π [36mRunning post-create: [1m4[0m[0m[40m [0m [1m[34mecho [32m'Root: [REPO]' [36m>> info.txtβ [32mCreated new worktree for [1m[32mfeature/test[0m at [2m[REPO].feature-test[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap.new b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap.newnew file mode 100644index 000000000..1181d9392--- /dev/null+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap.new@@ -0,0 +1,42 @@+---+source: tests/integration_tests/post_start_commands.rs+assertion_line: 27+info:+ program: wt+ args:+ - switch+ - "--create"+ - feature/test+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3Blgxf/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-create: [1m1[0m[0m+[40m [0m [1m[34mecho [32m'Repo: test-repo' [36m> info.txt++π [36mRunning post-create: [1m2[0m[0m+[40m [0m [1m[34mecho [32m'Branch: feature-test' [36m>> info.txt++π [36mRunning post-create: [1m3[0m[0m+[40m [0m [1m[34mecho [32m'Worktree: [REPO].feature-test' [36m>> info.txt++π [36mRunning post-create: [1m4[0m[0m+[40m [0m [1m[34mecho [32m'Root: [REPO]' [36m>> info.txt++β [32mCreated new worktree for [1m[32mfeature/test[0m at [2m[REPO].feature-test[0m[0m++To enable automatic cd, run: wt config shell++----- 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.snapindex fd4f94fc8..13068b018 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@@ -13,18 +13,19 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGKkTa1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoL8MgV/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning post-start: task1[0m+π [36mRunning post-start: [1mtask1[0m[0m[40m [0m [1m[34mecho [32m'Task 1 running' [36m> task1.txt-π [36mRunning post-start: task2[0m+π [36mRunning post-start: [1mtask2[0m[0m[40m [0m [1m[34mecho [32m'Task 2 running' [36m> task2.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap.new b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap.newnew file mode 100644index 000000000..703ac33d6--- /dev/null+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap.new@@ -0,0 +1,36 @@+---+source: tests/integration_tests/post_start_commands.rs+assertion_line: 27+info:+ program: wt+ args:+ - switch+ - "--create"+ - feature+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGxLWwc/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-start: [1mtask1[0m[0m+[40m [0m [1m[34mecho [32m'Task 1 running' [36m> task1.txt++π [36mRunning post-start: [1mtask2[0m[0m+[40m [0m [1m[34mecho [32m'Task 2 running' [36m> task2.txt++β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0m++To enable automatic cd, run: wt config shell++----- 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.snapindex 44d506f9b..16b382f44 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@@ -13,21 +13,22 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuLxpWM/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA5nf1x/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRunning post-start: task1[0m+π [36mRunning post-start: [1mtask1[0m[0m[40m [0m [1m[34mecho [32m'TASK1_OUTPUT'-π [36mRunning post-start: task2[0m+π [36mRunning post-start: [1mtask2[0m[0m[40m [0m [1m[34mecho [32m'TASK2_OUTPUT'-π [36mRunning post-start: task3[0m+π [36mRunning post-start: [1mtask3[0m[0m[40m [0m [1m[34mecho [32m'TASK3_OUTPUT'β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap.new b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap.newnew file mode 100644index 000000000..c09d21fee--- /dev/null+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap.new@@ -0,0 +1,39 @@+---+source: tests/integration_tests/post_start_commands.rs+assertion_line: 27+info:+ program: wt+ args:+ - switch+ - "--create"+ - feature+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ LANG: C+ LC_ALL: C+ SOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZkaPxN/test-config.toml+---+success: true+exit_code: 0+----- stdout -----+π [36mRunning post-start: [1mtask1[0m[0m+[40m [0m [1m[34mecho [32m'TASK1_OUTPUT'++π [36mRunning post-start: [1mtask2[0m[0m+[40m [0m [1m[34mecho [32m'TASK2_OUTPUT'++π [36mRunning post-start: [1mtask3[0m[0m+[40m [0m [1m[34mecho [32m'TASK3_OUTPUT'++β [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0m++To enable automatic cd, run: wt config shell++----- stderr -----