Skip to content

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.rs
index 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 command
pub 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.rs
index 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.rs
index 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 -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
- πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
- πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+   * [SHA] (HEAD -> feature) Add feature file
+   feature.txt | 1 +
+   1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Worktree preserved (--no-remove)
@@ -2081,11 +2079,9 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
- πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
- πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+   * [SHA] (HEAD -> feature) Add feature file
+   feature.txt | 1 +
+   1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Worktree preserved (--no-remove)
diff --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.snap
deleted file mode 100644
index 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()
----
-πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
-
-βœ“ Code formatting check passed
-πŸ”„ Running pre-merge: test
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
-
-βœ— Test suite failed: 3 tests failing
-❌ pre-merge command failed: test
-
-Command failed with exit code: exit status: 1
-
-πŸ’‘ Use --no-hooks to skip pre-merge commands
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 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()
πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
-πŸ”„ * d067f01 (HEAD -> feature) Add feature
+  * d067f01 (HEAD -> feature) Add feature
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [TMPDIR]/test-repo
diff --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.snap
deleted file mode 100644
index 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()
----
-πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
-
-βœ“ Code formatting check passed
-πŸ”„ Running pre-merge: lint
-βœ“ Linting passed - no warnings
-  echo 'βœ“ Linting passed - no warnings'
-
-πŸ”„ Running pre-merge: test
-  echo 'βœ“ All 47 tests passed in 2.3s'
-
-βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
-
-* d067f01 (HEAD -> feature) Add feature
-
- feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Cleaning up worktree...
-βœ… Returned to primary at [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index 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()
πŸ”„ Merging 1 commit to main @ d067f01 (no commit/squash/rebase needed)
-πŸ”„ * d067f01 (HEAD -> feature) Add feature
+  * d067f01 (HEAD -> feature) Add feature
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [TMPDIR]/test-repo
diff --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.snap
deleted file mode 100644
index 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()
----
-πŸ”„ Running post-create:
-  echo 'Installing dependencies...'
-
-Installing dependencies...
-
-πŸ”„ Running post-create:
-  echo 'Building project...'
-
-Building project...
-
-βœ… Created new worktree for feature-hooks from main, changed directory to [TMPDIR]/test-repo.feature-hooks
-πŸ”„ Running post-start: server
-  echo 'Starting dev server on port 3000'
-
-πŸ”„ Running post-start: watch
-  echo 'Watching for file changes'
diff --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.snap
deleted file mode 100644
index 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()
----
-πŸ”„ Running post-create: 1
-  echo 'Installing dependencies...'
-
-Installing dependencies...
-πŸ”„ Running post-create: 2
-  echo 'Building project...'
-
-Building project...
-βœ… Created new worktree for feature-hooks, changed directory to [TMPDIR]/test-repo.feature-hooks
-πŸ”„ Running post-start: server
-  echo 'Starting dev server on port 3000'
-
-πŸ”„ Running post-start: watch
-  echo 'Watching for file changes'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved.snap
deleted file mode 100644
index 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 -----
-πŸ”„ Running post-create:
-  echo 'approved' > output.txt
-
-βœ… Created new worktree for test-approved at [REPO].test-approved
-
-To enable automatic cd, run: wt config shell
-
------ stderr -----
-
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_first_run.snap
deleted file mode 100644
index 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 -----
-πŸ”„ Running post-create:
-  echo 'test command' > output.txt
-
-βœ… Created new worktree for test-force at [REPO].test-force
-
-To enable automatic cd, run: wt config shell
-
------ stderr -----
-
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index ab109a4de..534b3f3e8 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index d47eac154..26c605c79 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 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: true
exit_code: 0
@@ -34,12 +34,10 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ file1.txt | 1 +
- file2.txt | 1 +
- 2 files changed, 2 insertions(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
βœ… Merged to main (1 commit, 2 files, +2)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -31,11 +31,9 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 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: true
exit_code: 0
@@ -33,11 +33,9 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ auth.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  auth.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -28,11 +28,9 @@ exit_code: 0
βœ… Committed changes @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Changes to dirty.txt
-
-πŸ”„ dirty.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Changes to dirty.txt
+  dirty.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -28,11 +28,9 @@ exit_code: 0
βœ… Committed changes @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
-
-πŸ”„ newfile.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
+  newfile.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) feat: add file 2
-* [SHA] feat: add file 1
-
-πŸ”„ file1.txt | 1 +
- file2.txt | 1 +
- 2 files changed, 2 insertions(+)
-
+  * [SHA] (HEAD -> feature) feat: add file 2
+  * [SHA] feat: add file 1
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
βœ… Merged to main (2 commits, 2 files, +2)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -31,11 +31,9 @@ exit_code: 0
βœ… Committed changes @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Changes to feature.txt
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Changes to feature.txt
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
index 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-FIRST
STDERR-FROM-SECOND
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -30,11 +30,9 @@ exit_code: 0
  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -28,11 +28,9 @@ exit_code: 0
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -26,11 +26,9 @@ exit_code: 0
  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -26,11 +26,9 @@ exit_code: 0
  echo 'Pre-commit check passed'
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature-from-develop) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature-from-develop) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Switching to main...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index 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: C
LC_ALL: C
SOURCE_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: false
exit_code: 1
@@ -25,11 +25,9 @@ exit_code: 1
βœ… Rebased onto main
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
-πŸ”„ * [SHA] (HEAD -> feature-dirty-primary) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature-dirty-primary) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Switching to main...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -33,13 +33,11 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ file1.txt | 1 +
- file2.txt | 1 +
- file3.txt | 1 +
- 3 files changed, 3 insertions(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  file3.txt | 1 +
+  3 files changed, 3 insertions(+)
βœ… Merged to main (1 commit, 3 files, +3)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 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: C
SOURCE_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: true
exit_code: 0
@@ -33,12 +33,10 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ file1.txt | 1 +
- file2.txt | 1 +
- 2 files changed, 2 insertions(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
βœ… Merged to main (1 commit, 2 files, +2)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) feat: single commit
-
-πŸ”„ file1.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) feat: single commit
+  file1.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 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: true
exit_code: 0
@@ -35,11 +35,9 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ auth.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  auth.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index 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: true
exit_code: 0
@@ -34,13 +34,11 @@ exit_code: 0
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Squash commits from main
-
-πŸ”„ file1.txt | 1 +
- untracked1.txt | 1 +
- untracked2.txt | 1 +
- 3 files changed, 3 insertions(+)
-
+  * [SHA] (HEAD -> feature) Squash commits from main
+  file1.txt | 1 +
+  untracked1.txt | 1 +
+  untracked2.txt | 1 +
+  3 files changed, 3 insertions(+)
βœ… Merged to main (1 commit, 3 files, +3)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 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: C
LC_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: true
exit_code: 0
@@ -41,13 +41,11 @@ exit_code: 0
  cargo clippy
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
-
-πŸ”„ auth.rs | 1 +
- auth_test.rs | 1 +
- jwt.rs | 1 +
- 3 files changed, 3 insertions(+)
-
+  * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
+  auth.rs | 1 +
+  auth_test.rs | 1 +
+  jwt.rs | 1 +
+  3 files changed, 3 insertions(+)
βœ… Merged to main (1 commit, 3 files, +3)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> fix-auth) Implement JWT validation
-
-πŸ”„ auth.rs | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> fix-auth) Implement JWT validation
+  auth.rs | 1 +
+  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
βœ… Returned to primary at [REPO]
πŸ”„ Removing worktree & branch...
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add test file
-
-πŸ”„ test.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add test file
+  test.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-πŸ”„ * [SHA] (HEAD -> feature) Add feature file
-
-πŸ”„ feature.txt | 1 +
- 1 file changed, 1 insertion(+)
-
+  * [SHA] (HEAD -> feature) Add feature file
+  feature.txt | 1 +
+  1 file changed, 1 insertion(+)
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
----- stdout -----
πŸ”„ Pushing 3 commits to main @ [SHA] (no commit/squash/rebase needed, merge commits allowed)
-πŸ”„ * [SHA] (HEAD -> feature) Merge temp
-|/
-| * [SHA] (temp) Commit 2
-|/
-* [SHA] Commit 1
-
-πŸ”„ file1.txt | 1 +
- file2.txt | 1 +
- 2 files changed, 2 insertions(+)
-
+  * [SHA] (HEAD -> feature) Merge temp
+  |/
+  | * [SHA] (temp) Commit 2
+  |/
+  * [SHA] Commit 1
+  file1.txt | 1 +
+  file2.txt | 1 +
+  2 files changed, 2 insertions(+)
βœ… Pushed to main (3 commits, 2 files, +2)
----- stderr -----