Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor: Standardize command output and accept new shell escaping snapshots
Maximilian Roose13d0b43b1c4
diff --git a/src/commands/config.rs b/src/commands/config.rsindex e1b9c7a67..acc0d3ca7 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -2,8 +2,8 @@ use etcetera::base_strategy::{BaseStrategy, choose_base_strategy};use std::path::PathBuf;use worktrunk::git::{GitError, GitResultExt, Repository};use worktrunk::styling::{- AnstyleStyle, GREEN, GREEN_BOLD, HINT, HINT_EMOJI, INFO_EMOJI, SUCCESS_EMOJI, format_toml,- print, println,+ AnstyleStyle, CYAN, GREEN, GREEN_BOLD, HINT, HINT_EMOJI, INFO_EMOJI, SUCCESS_EMOJI,+ format_toml, print, println,};/// Example configuration file content@@ -164,19 +164,20 @@ fn get_global_config_path() -> Option<PathBuf> {/// Handle the config refresh-cache commandpub fn handle_config_refresh_cache() -> Result<(), GitError> {- use anstyle::{AnsiColor, Color};-let repo = Repository::current();// Display progress message- let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));- println!("π {cyan}Querying remote for default branch...{cyan:#}");+ crate::output::progress(format!(+ "{CYAN}Querying remote for default branch...{CYAN:#}"+ ))?;// Refresh the cache (this will make a network call)let branch = repo.refresh_default_branch()?;// Display success message- println!("{SUCCESS_EMOJI} {GREEN}Cache refreshed: {GREEN_BOLD}{branch}{GREEN_BOLD:#}{GREEN:#}");+ crate::output::success(format!(+ "{GREEN}Cache refreshed: {GREEN_BOLD}{branch}{GREEN_BOLD:#}{GREEN:#}"+ ))?;Ok(())}diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 40d7a90b5..9beb7214a 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -105,6 +105,7 @@ use worktrunk::config::{CommandPhase, ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt, Repository};use worktrunk::styling::{CYAN, CYAN_BOLD, GREEN, GREEN_BOLD, WARNING, WARNING_BOLD, format_bash_with_gutter,+ format_with_gutter,};use super::command_executor::{CommandContext, prepare_project_commands};@@ -742,7 +743,7 @@ pub fn handle_push("--decorate",&format!("{}..HEAD", target_branch),])?;- crate::output::progress(format!("{}\n", log_output.trim()))?;+ crate::output::gutter(format_with_gutter(&log_output, "", None))?;// Show diff statistics with color (use terminal width for proper formatting)let term_width = crate::display::get_terminal_width();@@ -756,7 +757,7 @@ pub fn handle_push(let diff_stat = diff_stat.trim_end();if !diff_stat.is_empty() {- crate::output::progress(format!("{}\n", diff_stat))?;+ crate::output::gutter(format_with_gutter(diff_stat, "", None))?;}}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 7dd2e1bc1..588f0cba2 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -1974,11 +1974,9 @@ fn test_merge_no_commit_with_clean_tree() {----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)- π * [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(+)-+ [40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+ [40m [0m feature.txt | 1 [32m+[m+ [40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mWorktree preserved (--no-remove)[0m@@ -2081,11 +2079,9 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)- π * [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(+)-+ [40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+ [40m [0m feature.txt | 1 [32m+[m+ [40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mWorktree preserved (--no-remove)[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.snapdeleted file mode 100644index 94d4d5b49..000000000--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap+++ /dev/null@@ -1,17 +0,0 @@-----source: tests/integration_tests/shell_wrapper.rs-expression: output.normalized()-----π [36mRunning pre-merge: [1mformat[0m[0m-[40m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[0m--β Code formatting check passed-π [36mRunning pre-merge: [1mtest[0m[0m-[40m [0m [1m[34mecho[0m [32m'β Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m--β 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_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 89c813c23..430720753 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@@ -19,10 +19,10 @@ expression: output.normalized()π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)-π * [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[40m [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(+)+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[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.snapdeleted file mode 100644index 31c1b925b..000000000--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap+++ /dev/null@@ -1,26 +0,0 @@-----source: tests/integration_tests/shell_wrapper.rs-expression: output.normalized().as_ref()-----π [36mRunning pre-merge: [1mformat[0m[0m-[0m[40m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[0m--β Code formatting check passed-π [36mRunning pre-merge: [1mlint[0m[0m-[0mβ Linting passed - no warnings-[40m [0m [1m[34mecho[0m [32m'β Linting passed - no warnings'[0m[0m--π [36mRunning pre-merge: [1mtest[0m[0m-[40m [0m [1m[34mecho[0m [32m'β All 47 tests passed in 2.3s'[0m[0m--[0mβ All 47 tests passed in 2.3s-π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)--* [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[0m (1 commit, 1 file, [32m+1[0m)-π [36mCleaning up worktree...[0m-β [32mReturned to primary at [1m[32m[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 0bbf4198c..c59fc3adc 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@@ -19,10 +19,10 @@ expression: output.normalized()π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)-π * [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[40m [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(+)+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[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.snapdeleted file mode 100644index 704874d9a..000000000--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap+++ /dev/null@@ -1,20 +0,0 @@-----source: tests/integration_tests/shell_wrapper.rs-expression: output.normalized()-----π [36mRunning post-create:[0m-[40m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m--Installing dependencies...--π [36mRunning post-create:[0m-[40m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m--Building project...--β [32mCreated new worktree for [1m[32mfeature-hooks[0m[32m from [1m[32mmain[0m[32m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0m-π [36mRunning post-start: [1mserver[0m[0m-[40m [0m [1m[34mecho[0m [32m'Starting dev server on port 3000'[0m[0m--π [36mRunning post-start: [1mwatch[0m[0m-[40m [0m [1m[34mecho[0m [32m'Watching for file changes'[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snapdeleted file mode 100644index 838a3c958..000000000--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap+++ /dev/null@@ -1,18 +0,0 @@-----source: tests/integration_tests/shell_wrapper.rs-expression: output.normalized()-----π [36mRunning post-create: [1m1[0m[0m-[40m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m--Installing dependencies...-π [36mRunning post-create: [1m2[0m[0m-[40m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m--Building project...-β [32mCreated new worktree for [1m[32mfeature-hooks[0m[32m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0m-π [36mRunning post-start: [1mserver[0m[0m-[40m [0m [1m[34mecho[0m [32m'Starting dev server on port 3000'[0m[0m--π [36mRunning post-start: [1mwatch[0m[0m-[40m [0m [1m[34mecho[0m [32m'Watching for file changes'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved.snapdeleted file mode 100644index d1c012a8a..000000000--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved.snap+++ /dev/null@@ -1,33 +0,0 @@-----source: tests/integration_tests/approval_ui.rs-info:- program: wt- args:- - switch- - "--create"- - test-approved- 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/.tmpi1XuqH/test-config.toml-----success: true-exit_code: 0------ stdout ------π [36mRunning post-create:[0m-[40m [0m [1m[34mecho[0m [32m'approved'[0m [36m>[0m output.txt[0m--β [32mCreated new worktree for [1m[32mtest-approved[0m[32m at [1m[32m[REPO].test-approved[0m[0m--To enable automatic cd, run: wt config shell------- stderr ------[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_first_run.snapdeleted file mode 100644index 963acdd87..000000000--- a/tests/snapshots/integration__integration_tests__approval_ui__force_first_run.snap+++ /dev/null@@ -1,34 +0,0 @@-----source: tests/integration_tests/approval_ui.rs-info:- program: wt- args:- - switch- - "--create"- - test-force- - "--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/.tmpIZ3rwP/test-config.toml-----success: true-exit_code: 0------ stdout ------π [36mRunning post-create:[0m-[40m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m--β [32mCreated new worktree for [1m[32mtest-force[0m[32m at [1m[32m[REPO].test-force[0m[0m--To enable automatic cd, run: wt config shell------- stderr ------[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex ab109a4de..534b3f3e8 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex d47eac154..26c605c79 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 34661d0c1..73fda9d4c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap@@ -18,7 +18,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpInKJSF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcZ5mKm/test-config.toml---success: trueexit_code: 0@@ -34,12 +34,10 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π file1.txt | 1 [32m+[m- file2.txt | 1 [32m+[m- 2 files changed, 2 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m file1.txt | 1 [32m+[m+[40m [0m file2.txt | 1 [32m+[m+[40m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex e179bc401..85e226d13 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDEJArm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7iNfHC/test-config.toml---success: trueexit_code: 0@@ -31,11 +31,9 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π feature.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex ed77f82d0..030a488b3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap@@ -18,7 +18,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Tm40z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpresNHi/test-config.toml---success: trueexit_code: 0@@ -33,11 +33,9 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π auth.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m auth.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 28a54688a..a613723bc 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2h8Sxg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBDz32K/test-config.toml---success: trueexit_code: 0@@ -28,11 +28,9 @@ exit_code: 0β [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to dirty.txt--π dirty.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to dirty.txt+[40m [0m dirty.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 4a3763021..8d26f34d0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -16,18 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjnzd04/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7PBPMV/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex e12fdca27..b4f3f57d5 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpi0Vvwb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyc4GAc/test-config.toml---success: trueexit_code: 0@@ -28,11 +28,9 @@ exit_code: 0β [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mno-commits-dirty[m[33m)[m Changes to newfile.txt--π newfile.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mno-commits-dirty[m[33m)[m Changes to newfile.txt+[40m [0m newfile.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 62254da96..792028c19 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -17,20 +17,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBieB8i/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLoersI/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 2 commits to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2-* [SHA] feat: add file 1--π file1.txt | 1 [32m+[m- file2.txt | 1 [32m+[m- 2 files changed, 2 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2+[40m [0m * [SHA] feat: add file 1+[40m [0m file1.txt | 1 [32m+[m+[40m [0m file2.txt | 1 [32m+[m+[40m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 66799889a..c58c8e46a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -16,18 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp41NhF2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpz4wpHB/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --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.snapindex 291b40cce..41d8e65b8 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,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDDXmUl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpL08BZY/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[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 dc710d02a..134ba0bdb 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,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe37K5e/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5MXRav/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --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.snapindex 4c0bf193c..944d06bd8 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,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGQrDI4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdZsh8B/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[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 8970728ef..edc09be82 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKHKovW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpULUebd/test-config.toml---success: trueexit_code: 0@@ -31,11 +31,9 @@ exit_code: 0β [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to feature.txt--π feature.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to feature.txt+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --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 e8c6d4026..afdefdac4 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@@ -13,11 +13,9 @@ STDERR-FROM-FIRSTSTDERR-FROM-SECONDπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[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 f6f46d582..f105f36db 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpj625Fv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpz9vTmv/test-config.toml---success: trueexit_code: 0@@ -30,11 +30,9 @@ exit_code: 0[40m [0m [1m[34mexit[0m 0[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --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 824a5a6a3..09bb437c7 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb4feBX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHm2RXY/test-config.toml---success: trueexit_code: 0@@ -28,11 +28,9 @@ exit_code: 0[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh[0m check2 3[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --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.snapindex 502dcf042..bb3f41fd9 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTFNUHP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGcE47k/test-config.toml---success: trueexit_code: 0@@ -26,11 +26,9 @@ exit_code: 0[40m [0m [1m[34mexit[0m 0[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[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 7c500031c..415540a64 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaaZTRS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRWJ8a9/test-config.toml---success: trueexit_code: 0@@ -26,11 +26,9 @@ exit_code: 0[40m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex eb2dcb147..3e1ca49ea 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap@@ -16,18 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2fCYFK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGrlihW/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-from-develop[m[33m)[m Add feature file--π feature.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-from-develop[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mSwitching to [1m[36mmain[0m[36m...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex d62a11587..cfc9bcc27 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp69yWpu/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptCZRr2/test-config.toml---success: falseexit_code: 1@@ -25,11 +25,9 @@ exit_code: 1β [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-dirty-primary[m[33m)[m Add feature file--π feature.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-dirty-primary[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mSwitching to [1m[36mmain[0m[36m...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snapindex 8d2f644ff..979914524 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap@@ -17,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEtoOIi/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqAzehr/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mWorktree preserved (--no-remove)[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex ea09e38b6..956b308e6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkwTopA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnB8ph3/test-config.toml---success: trueexit_code: 0@@ -33,13 +33,11 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π file1.txt | 1 [32m+[m- file2.txt | 1 [32m+[m- file3.txt | 1 [32m+[m- 3 files changed, 3 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m file1.txt | 1 [32m+[m+[40m [0m file2.txt | 1 [32m+[m+[40m [0m file3.txt | 1 [32m+[m+[40m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 28a4e62b0..4eaacde6f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -17,7 +17,7 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpF7NUsh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjrNufB/test-config.toml---success: trueexit_code: 0@@ -33,12 +33,10 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π file1.txt | 1 [32m+[m- file2.txt | 1 [32m+[m- 2 files changed, 2 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m file1.txt | 1 [32m+[m+[40m [0m file2.txt | 1 [32m+[m+[40m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex a95b5bab3..32ed95c45 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -16,18 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdQXpWE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUcX2kl/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commit--π file1.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commit+[40m [0m file1.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex d6c85a331..9f603ebaf 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -19,7 +19,7 @@ info:WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"WORKTRUNK_COMMIT_GENERATION__COMMAND: sh- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6aovjw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDCmseE/test-config.toml---success: trueexit_code: 0@@ -35,11 +35,9 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π auth.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m auth.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 4016deab3..581a7e9b6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -15,18 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0euT5E/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7g2kX0/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex c5170435f..cb7b607e0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap@@ -17,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9B4Efz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiL32hj/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mWorktree preserved (--no-remove)[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex a11bedd29..1441a27cd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -18,7 +18,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgQoUu4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIk45pS/test-config.toml---success: trueexit_code: 0@@ -34,13 +34,11 @@ exit_code: 0β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main--π file1.txt | 1 [32m+[m- untracked1.txt | 1 [32m+[m- untracked2.txt | 1 [32m+[m- 3 files changed, 3 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[40m [0m file1.txt | 1 [32m+[m+[40m [0m untracked1.txt | 1 [32m+[m+[40m [0m untracked2.txt | 1 [32m+[m+[40m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 4789c2969..89e7e78f7 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: CLC_ALL: C- 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"+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjFNZmk/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/.tmp6wrGds/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjFNZmk/test-config.toml---success: trueexit_code: 0@@ -41,13 +41,11 @@ exit_code: 0[40m [0m [1m[34mcargo[0m clippy[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication system--π auth.rs | 1 [32m+[m- auth_test.rs | 1 [32m+[m- jwt.rs | 1 [32m+[m- 3 files changed, 3 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication system+[40m [0m auth.rs | 1 [32m+[m+[40m [0m auth_test.rs | 1 [32m+[m+[40m [0m jwt.rs | 1 [32m+[m+[40m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 5b7753944..7470a6aa2 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -16,18 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN3FmHS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcoUG6u/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validation--π auth.rs | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validation+[40m [0m auth.rs | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 7a7220ced..2f673a57e 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -17,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcYbzll/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcnkkiG/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add test file--π test.txt | 1 [32m+[m- 1 file changed, 1 insertion(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add test file+[40m [0m test.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex c9c00912b..d1acfe995 100644--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap@@ -17,18 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7iNBHC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKmH4Sw/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 5c8f2c743..d858af686 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -16,18 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1K8qVe/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6p21dI/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)-π * [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(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[40m [0m feature.txt | 1 [32m+[m+[40m [0m 1 file changed, 1 insertion(+)β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snapindex 9c018b112..4ef3df50b 100644--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap@@ -18,23 +18,21 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYUwVaA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX05WHO/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mPushing 3 commits to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed, merge commits allowed)-π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Merge temp-[31m|[m[32m/[m-[31m|[m * [SHA][33m ([m[1;32mtemp[m[33m)[m Commit 2-[31m|[m[31m/[m-* [SHA] Commit 1--π file1.txt | 1 [32m+[m- file2.txt | 1 [32m+[m- 2 files changed, 2 insertions(+)-+[40m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Merge temp+[40m [0m [31m|[m[32m/[m+[40m [0m [31m|[m * [SHA][33m ([m[1;32mtemp[m[33m)[m Commit 2+[40m [0m [31m|[m[31m/[m+[40m [0m * [SHA] Commit 1+[40m [0m file1.txt | 1 [32m+[m+[40m [0m file2.txt | 1 [32m+[m+[40m [0m 2 files changed, 2 insertions(+)β [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)----- stderr -----