Skip to content

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

Improve gutter spacing for visual alignment

Maximilian Roos079bb10496a8
diff --git a/CLAUDE.md b/CLAUDE.md
index 8531727f3..a01027d8f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -359,10 +359,10 @@ print!("{}", format_with_gutter(&command));
**Example output:**
```
πŸ”„ Executing (post-create):
- npm install
+ npm install
```
-The colored space at column 0 provides visual separation from surrounding text.
+The colored space at column 0 provides visual separation from surrounding text. Content starts at column 3 (gutter + 2 spaces) to align with emoji messages where the emoji (2 columns) + space (1 column) also starts content at column 3.
## Output System Architecture
diff --git a/src/styling.rs b/src/styling.rs
index 1eaec6e87..0ae4c5648 100644
--- a/src/styling.rs
+++ b/src/styling.rs
@@ -290,7 +290,8 @@ fn wrap_text_at_width(text: &str, max_width: usize) -> Vec<String> {
/// * `left_margin` - Should always be "" (gutter provides all visual separation)
/// * `max_width` - Optional maximum width (for testing). If None, auto-detects terminal width.
///
-/// The gutter appears at column 0, followed by 1 space, then the content at column 1.
+/// The gutter appears at column 0, followed by 2 spaces, then the content starts at column 3.
+/// This aligns with emoji messages where the emoji (2 columns) + space (1 column) also starts content at column 3.
///
/// # Example
/// ```ignore
@@ -304,9 +305,9 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<us
// Use provided width or detect terminal width (respects COLUMNS env var)
let term_width = max_width.unwrap_or_else(get_terminal_width);
- // Account for gutter (1) + space (1) + left_margin
+ // Account for gutter (1) + spaces (2) + left_margin
let left_margin_width = left_margin.width();
- let available_width = term_width.saturating_sub(2 + left_margin_width);
+ let available_width = term_width.saturating_sub(3 + left_margin_width);
for line in content.lines() {
// Wrap the line at word boundaries
@@ -314,7 +315,7 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<us
for wrapped_line in wrapped_lines {
output.push_str(&format!(
- "{left_margin}{gutter} {gutter:#} {wrapped_line}\n"
+ "{left_margin}{gutter} {gutter:#} {wrapped_line}\n"
));
}
}
@@ -340,7 +341,7 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
// Calculate available width for wrapping
let term_width = get_terminal_width();
let left_margin_width = left_margin.width();
- let available_width = term_width.saturating_sub(2 + left_margin_width);
+ let available_width = term_width.saturating_sub(3 + left_margin_width);
// Wrap lines at word boundaries
let mut wrapped_lines = Vec::new();
@@ -389,7 +390,7 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
// Process each wrapped line
for line in &wrapped_lines {
- output.push_str(&format!("{left_margin}{gutter} {gutter:#} "));
+ output.push_str(&format!("{left_margin}{gutter} {gutter:#} "));
// Highlight this line
let Ok(highlights) = highlighter.highlight(&config, line.as_bytes(), None, |_| None) else {
@@ -503,7 +504,7 @@ pub fn format_toml(content: &str, left_margin: &str) -> String {
let mut output = String::new();
for line in content.lines() {
output.push_str(&format!(
- "{left_margin}{gutter} {gutter:#} {dim}{line}{dim:#}\n"
+ "{left_margin}{gutter} {gutter:#} {dim}{line}{dim:#}\n"
));
}
return output;
@@ -519,7 +520,7 @@ pub fn format_toml(content: &str, left_margin: &str) -> String {
// Render each line with appropriate styling
for (y, line) in lines.iter().enumerate() {
// Add left margin, gutter, and spacing
- output.push_str(&format!("{left_margin}{gutter} {gutter:#} "));
+ output.push_str(&format!("{left_margin}{gutter} {gutter:#} "));
// Render each token with appropriate styling
for token in highlighter.line(y, line) {
@@ -820,11 +821,11 @@ command = "npm install"
let result = format_with_gutter(commit_msg, "", Some(80));
insta::assert_snapshot!(result, @r"
-   This commit refactors the authentication system to use a more secure
-   token-based approach instead of the previous session-based system which had
-   several security vulnerabilities that were identified during the security
-   audit last month. The new implementation follows industry best practices and
-   includes proper token rotation and expiration handling.
+   This commit refactors the authentication system to use a more secure
+   token-based approach instead of the previous session-based system which had
+   several security vulnerabilities that were identified during the security
+   audit last month. The new implementation follows industry best practices and
+   includes proper token rotation and expiration handling.
");
}
diff --git a/tests/integration_tests/config_list.rs b/tests/integration_tests/config_list.rs
index 1fae58b33..cf21cde18 100644
--- a/tests/integration_tests/config_list.rs
+++ b/tests/integration_tests/config_list.rs
@@ -61,17 +61,17 @@ server = "npm run dev"
exit_code: 0
----- stdout -----
Global Config: [TEMP_HOME]/.config/worktrunk/config.toml
-   worktree-path = "../{main-worktree}.{branch}"
-  
-   [[approved-commands]]
-   project = "test-project"
-   command = "npm install"
+   worktree-path = "../{main-worktree}.{branch}"
+  
+   [[approved-commands]]
+   project = "test-project"
+   command = "npm install"
Project Config: [REPO]/.config/wt.toml
-   post-create-command = "npm install"
-  
-   [post-start-command]
-   server = "npm run dev"
+   post-create-command = "npm install"
+  
+   [post-start-command]
+   server = "npm run dev"
----- stderr -----
"#);
@@ -116,7 +116,7 @@ fn test_config_list_no_project_config() {
exit_code: 0
----- stdout -----
Global Config: [TEMP_HOME]/.config/worktrunk/config.toml
-   worktree-path = "../{main-worktree}.{branch}"
+   worktree-path = "../{main-worktree}.{branch}"
Project Config: [REPO]/.config/wt.toml
πŸ’‘ Not found
@@ -162,7 +162,7 @@ fn test_config_list_outside_git_repo() {
exit_code: 0
----- stdout -----
Global Config: [TEMP_HOME]/.config/worktrunk/config.toml
- worktree-path = "../{main-worktree}.{branch}"
+ worktree-path = "../{main-worktree}.{branch}"
Project Config: Not in a git repository
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index 295627e72..8f99d7f0d 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -33,7 +33,7 @@ fn test_configure_shell_with_yes() {
exit_code: 0
----- stdout -----
Added zsh [TEMP_HOME]/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
βœ… Configured 1 shell
@@ -78,7 +78,7 @@ fn test_configure_shell_specific_shell() {
exit_code: 0
----- stdout -----
Added zsh [TEMP_HOME]/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
βœ… Configured 1 shell
@@ -164,7 +164,7 @@ fn test_configure_shell_fish() {
exit_code: 0
----- stdout -----
Created fish [TEMP_HOME]/.config/fish/conf.d/wt.fish
-   if type -q wt; wt init fish | source; end
+   if type -q wt; wt init fish | source; end
βœ… Configured 1 shell
@@ -258,9 +258,9 @@ fn test_configure_shell_multiple_configs() {
exit_code: 0
----- stdout -----
Added bash [TEMP_HOME]/.bash_profile
-   if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
Added zsh [TEMP_HOME]/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
βœ… Configured 2 shells
@@ -326,9 +326,9 @@ fn test_configure_shell_mixed_states() {
exit_code: 0
----- stdout -----
Already configured bash [TEMP_HOME]/.bash_profile
-   if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
Added zsh [TEMP_HOME]/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
βœ… Configured 1 shell
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index acd488a21..a103a1137 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -4,7 +4,7 @@ expression: output.normalized().as_ref()
---
βœ… Created new worktree for fish-multiline, changed directory to [TMPDIR]/test-repo.fish-multiline
πŸ”„ Executing (--execute):
-  echo 'line 1'; echo 'line 2'; echo 'line 3'
+  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 3c8ad5057..a295f6e7f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -4,4 +4,4 @@ expression: output.normalized().as_ref()
---
βœ… Created new worktree for fish-bg, changed directory to [TMPDIR]/test-repo.fish-bg
πŸ”„ Running post-start:
-  echo 'fish background task'
+  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index 0678dd9c9..654c9f543 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -3,12 +3,12 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge: test
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap
index f89601af5..a246db6b4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap
@@ -3,11 +3,11 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge: test
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index e027d7773..1312bfde7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -10,8 +10,8 @@ Command failed with exit code: exit status: 1
πŸ’‘ Use --no-hooks to skip pre-merge commands
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
πŸ”„ Running pre-merge: test
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 5d42f06dc..670e6375e 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -3,17 +3,17 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge: lint
-  echo 'βœ“ Linting passed - no warnings'
+  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
πŸ”„ Running pre-merge: test
-  echo 'βœ“ All 47 tests passed in 2.3s'
+  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
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
index 789335334..83c7be544 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
@@ -3,15 +3,15 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge: lint
-  echo 'βœ“ Linting passed - no warnings'
+  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
πŸ”„ Running pre-merge: test
-  echo 'βœ“ All 47 tests passed in 2.3s'
+  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
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 57b0142a9..17c3a6618 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -6,15 +6,15 @@ expression: output.normalized().as_ref()
βœ“ Linting passed - no warnings
βœ“ All 47 tests passed in 2.3s
πŸ”„ Running pre-merge: format
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
πŸ”„ Running pre-merge: lint
-  echo 'βœ“ Linting passed - no warnings'
+  echo 'βœ“ Linting passed - no warnings'
πŸ”„ Running pre-merge: test
-  echo 'βœ“ All 47 tests passed in 2.3s'
+  echo 'βœ“ All 47 tests passed in 2.3s'
πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 736914f16..3ea9cdaae 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -4,6 +4,6 @@ expression: output.normalized().as_ref()
---
βœ… Created new worktree for test-exec, changed directory to [TMPDIR]/test-repo.test-exec
πŸ”„ Executing (--execute):
-  echo executed
+  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 736914f16..3ea9cdaae 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -4,6 +4,6 @@ expression: output.normalized().as_ref()
---
βœ… Created new worktree for test-exec, changed directory to [TMPDIR]/test-repo.test-exec
πŸ”„ Executing (--execute):
-  echo executed
+  echo executed
executed
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
index e5eaccf20..0c7c1f787 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap
@@ -3,18 +3,18 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
πŸ”„ Running post-create: 1
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
πŸ”„ Running post-create: 2
-  echo 'Building project...'
+  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'
+  echo 'Starting dev server on port 3000'
πŸ”„ Running post-start: watch
-  echo 'Watching for file changes'
+  echo 'Watching for file changes'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index b4332450f..cb124be17 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -5,16 +5,16 @@ expression: output.normalized().as_ref()
Installing dependencies...
Building project...
πŸ”„ Running post-create: 1
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
πŸ”„ Running post-create: 2
-  echo 'Building project...'
+  echo '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'
+  echo 'Starting dev server on port 3000'
πŸ”„ Running post-start: watch
-  echo 'Watching for file changes'
+  echo 'Watching for file changes'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 203740655..920e34896 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -4,4 +4,4 @@ expression: output.normalized().as_ref()
---
βœ… Created new worktree for feature-with-hooks, changed directory to [TMPDIR]/test-repo.feature-with-hooks
πŸ”„ Running post-start:
-  echo 'test command executed'
+  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index bfeb49f74..748473cac 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -4,4 +4,4 @@ expression: output.normalized().as_ref()
---
βœ… Created new worktree for feature-bg, changed directory to [TMPDIR]/test-repo.feature-bg
πŸ”„ Running post-start:
-  echo 'background task'
+  echo 'background task'
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 62b8908c1..d9f642e42 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/.tmpUbhsG6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe3Towy/test-config.toml
---
success: true
exit_code: 0
@@ -26,11 +26,11 @@ exit_code: 0
πŸ”„ Squashing 2 commits with working tree changes into 1 (2 files, +2)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
-  - feat: add file 2
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
+  - feat: add file 2
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
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 637239b0a..728660014 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/.tmpXXicw6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUFP51D/test-config.toml
---
success: true
exit_code: 0
@@ -24,10 +24,10 @@ exit_code: 0
πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: initial feature
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: initial feature
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
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 bb26337c7..723549d8b 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/.tmpORPTiS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQBekKw/test-config.toml
---
success: true
exit_code: 0
@@ -26,10 +26,10 @@ exit_code: 0
πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add authentication
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add authentication
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
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 d06bc62be..37053b44a 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/.tmpFYKMyP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvBvXoe/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
πŸ”„ Committing changes... (1 file, +1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  WIP: Auto-commit before merge
+  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
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 3d61e8b05..cf41c4df2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVBWqUw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNdYWiB/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge:
-  exit 1
+  exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index bdbbc85e5..5342636a6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6gXs9o/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu4Wdel/test-config.toml
---
success: true
exit_code: 0
@@ -33,10 +33,10 @@ exit_code: 0
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge: deploy
-  echo 'Deploying branch feature' > deploy.txt
+  echo 'Deploying branch feature' > deploy.txt
πŸ”„ Running post-merge: notify
-  echo 'Merge to main complete' > notify.txt
+  echo 'Merge to main complete' > notify.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index c20a31ab5..def060a69 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcImBnU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx7tLqH/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge:
-  echo 'merged feature to main' > post-merge-ran.txt
+  echo 'merged feature to main' > post-merge-ran.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 92a71488a..12326463d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -17,14 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaE19F3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaozfq3/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
🟑 Auto-staging untracked files: feature.txt
πŸ”„ Running pre-commit:
-  exit 1
+  exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index d21dd9feb..81be936d6 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,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoZiAbm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmY1rlZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟑 Auto-staging untracked files: feature.txt
πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
πŸ”„ Committing changes... (1 file, +1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  WIP: Auto-commit before merge
+  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
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 1dbbb6038..7dbe327c9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
@@ -4,12 +4,12 @@ expression: output
---
Exit code: 0
πŸ”„ Running pre-merge: first
-  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
+  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
STDOUT-FROM-FIRST
STDERR-FROM-FIRST
πŸ”„ Running pre-merge: second
-  echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2
+  echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 4abf61de8..b5f38c6d2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNbIRqv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMeVAyf/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
πŸ”„ Running pre-merge:
-  exit 1
+  exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index a44a6112d..2d337ec39 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4PryQs/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwGHTxq/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge: format
-  exit 0
+  exit 0
πŸ”„ Running pre-merge: lint
-  exit 0
+  exit 0
πŸ”„ Running pre-merge: test
-  exit 0
+  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
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 e2b760749..0dd16b946 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbWSGVM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRyKcWN/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge: check1
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
+  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
πŸ”„ Running pre-merge: check2
-  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
+  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
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 e168cf5bd..2e9e83c6c 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,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPR90Ag/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA1E0R0/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge:
-  exit 0
+  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index 2587f9920..d5b692edc 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8bd7Rj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppWlOJd/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
πŸ”„ Running pre-commit:
-  exit 1
+  exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index b391b5ce4..4f7f03f8a 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,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKeJKcc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPLoZkj/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index da1c29486..fcaa65c99 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6cpPcZ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmbdmkd/test-config.toml
---
success: false
exit_code: 1
@@ -25,11 +25,11 @@ exit_code: 1
----- stderr -----
❌ Rebase onto main incomplete
-  Rebasing (1/1)
-  error: could not apply [SHA]... Update shared.txt in feature
-  hint: Resolve all conflicts manually, mark them as resolved with
-  hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-  hint: You can instead skip this commit: run "git rebase --skip".
-  hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-  hint: Disable this message with "git config set advice.mergeConflict false"
-  Could not apply [SHA]... # Update shared.txt in feature
+  Rebasing (1/1)
+  error: could not apply [SHA]... Update shared.txt in feature
+  hint: Resolve all conflicts manually, mark them as resolved with
+  hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+  hint: You can instead skip this commit: run "git rebase --skip".
+  hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+  hint: Disable this message with "git config set advice.mergeConflict false"
+  Could not apply [SHA]... # Update shared.txt in feature
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 c861ebb8a..55c0dd841 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/.tmpwQ8NSy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp37SMX3/test-config.toml
---
success: true
exit_code: 0
@@ -24,12 +24,12 @@ exit_code: 0
πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
-  - fix: update logic
-  - docs: update readme
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
+  - fix: update logic
+  - docs: update readme
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 45d6b946d..f9f5d683e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH8oAuT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWF2f24/test-config.toml
---
success: false
exit_code: 1
@@ -24,12 +24,12 @@ exit_code: 1
πŸ”„ Squashing 3 commits into 1...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - Change 1
-  - Change 2
-  - Revert to initial
+  Squash commits from main
+ 
+  Combined commits:
+  - Change 1
+  - Change 2
+  - Revert to initial
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index d9bc10a14..497d097a8 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/.tmp9VXPVa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWUGCpU/test-config.toml
---
success: true
exit_code: 0
@@ -25,11 +25,11 @@ exit_code: 0
πŸ”„ Squashing 2 commits into 1 (2 files, +2)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: new feature
-  - fix: bug fix
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: new feature
+  - fix: bug fix
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
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 7e17517fb..9410e290c 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/.tmpfvdZEX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaFGCSa/test-config.toml
---
success: true
exit_code: 0
@@ -27,11 +27,11 @@ exit_code: 0
πŸ”„ Squashing 2 commits into 1 (1 file, +1)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add authentication
-  - fix: handle edge case
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add authentication
+  - fix: handle edge case
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
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 b9b406830..8fa92b8df 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/.tmpYTmKhJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdokLWJ/test-config.toml
---
success: true
exit_code: 0
@@ -27,10 +27,10 @@ exit_code: 0
πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-  Squash commits from main
- 
-  Combined commits:
-  - feat: add file 1
+  Squash commits from main
+ 
+  Combined commits:
+  - feat: add file 1
βœ… Squashed @ [SHA]
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
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 860167f42..66e7931a3 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,31 +16,31 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWSudxg/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpavcSQw/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/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/.tmpWSudxg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpavcSQw/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
πŸ”„ Generating squash commit message...
-  feat(auth): Implement JWT authentication system
- 
-  Add comprehensive JWT token handling including validation, refresh logic,
-  and authentication tests. This establishes the foundation for secure
-  API authentication.
- 
-  - Implement token refresh mechanism with expiry handling
-  - Add JWT encoding/decoding with signature verification
-  - Create test suite covering all authentication flows
+  feat(auth): Implement JWT authentication system
+ 
+  Add comprehensive JWT token handling including validation, refresh logic,
+  and authentication tests. This establishes the foundation for secure
+  API authentication.
+ 
+  - Implement token refresh mechanism with expiry handling
+  - Add JWT encoding/decoding with signature verification
+  - Create test suite covering all authentication flows
βœ… Squashed @ [SHA]
πŸ”„ Running pre-merge: lint
-  cargo clippy
+  cargo clippy
πŸ”„ Running pre-merge: test
-  cargo test
+  cargo test
πŸ”„ Merging 1 commit to main @ [SHA] (no rebasing needed)
@@ -55,7 +55,7 @@ exit_code: 0
πŸ”„ Cleaning up worktree...
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge: install
-  cargo install --path .
+  cargo install --path .
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index bf4e32946..5279404de 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoL47a8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdgKYF6/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Setup done' > setup.txt
+  echo 'Setup done' > setup.txt
βœ… Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start: server
-  sleep 0.5 && echo 'Server running' > server.txt
+  sleep 0.5 && echo 'Server running' > server.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 77e8b6bbd..a27757949 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -1,5 +1,6 @@
---
source: tests/integration_tests/post_start_commands.rs
+assertion_line: 27
info:
program: wt
args:
@@ -19,17 +20,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN4uLuk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2o4aVD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Created new worktree for feature at [REPO].feature
πŸ”„ Running post-start:
-  echo 'Background task' > background.txt
+  echo 'Background task' > background.txt
πŸ”„ Executing (--execute):
-  echo 'Execute flag' > execute.txt
+  echo 'Execute flag' > execute.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 10e52eaa0..498335153 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaCeFSo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUQk8E7/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  exit 1
+  exit 1
🟑 Command failed: Command failed with exit code: exit status: 1
βœ… Created new worktree for feature at [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index bf1d92622..255e14436 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -17,17 +17,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk5Ku9g/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxeTtWY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  if [ ! -f test.txt ]; then
-  echo 'File does not exist' > result.txt
-  else
-  echo 'File exists' > result.txt
-  fi
+  if [ ! -f test.txt ]; then
+  echo 'File does not exist' > result.txt
+  else
+  echo 'File exists' > result.txt
+  fi
βœ… Created new worktree for feature at [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
index cfeaeccca..3854812e9 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXvo2gv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqF0dWl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create: 1
-  echo 'First'
+  echo 'First'
πŸ”„ Running post-create: 2
-  echo 'Second'
+  echo 'Second'
βœ… Created new worktree for feature at [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index 7c5296ae2..fb5a13ee6 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzimn1l/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQwcGd8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create: install
-  echo 'Installing deps'
+  echo 'Installing deps'
πŸ”„ Running post-create: setup
-  echo 'Running setup'
+  echo 'Running setup'
βœ… Created new worktree for feature at [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 5bae0a15f..90c87e8a6 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE64Nvf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5v5bUo/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Setup complete'
+  echo 'Setup complete'
βœ… Created new worktree for feature at [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index 7c15f1d37..8b15c2a90 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -17,22 +17,22 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7ZuRfi/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa9URKu/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create: 1
-  echo 'Repo: test-repo' > info.txt
+  echo 'Repo: test-repo' > info.txt
πŸ”„ Running post-create: 2
-  echo 'Branch: feature-test' >> info.txt
+  echo 'Branch: feature-test' >> info.txt
πŸ”„ Running post-create: 3
-  echo 'Worktree: [REPO].feature-test' >> info.txt
+  echo 'Worktree: [REPO].feature-test' >> info.txt
πŸ”„ Running post-create: 4
-  echo 'Root: [REPO]' >> info.txt
+  echo 'Root: [REPO]' >> info.txt
βœ… Created new worktree for feature/test at [REPO].feature-test
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index 041b8dae7..9162a8ad2 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVOqFcG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ2h7cY/test-config.toml
---
success: true
exit_code: 0
@@ -26,9 +26,9 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'line1
-  line2
-  line3' | grep line2 > filtered.txt
+  echo 'line1
+  line2
+  line3' | grep line2 > filtered.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index 83eba7f28..d80c5322b 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp22tMXH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsC2WGS/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'unclosed quote
+  echo 'unclosed quote
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 2ea8f296e..84adf0ff8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN7reqi/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV3sDZd/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'stdout output' && echo 'stderr output' >&2
+  echo 'stdout output' && echo 'stderr output' >&2
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index 1d66410d3..35ca82940 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbwF5AM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYftlhj/test-config.toml
---
success: true
exit_code: 0
@@ -26,9 +26,9 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  echo 'first line' > multiline.txt
-  echo 'second line' >> multiline.txt
-  echo 'third line' >> multiline.txt
+  echo 'first line' > multiline.txt
+  echo 'second line' >> multiline.txt
+  echo 'third line' >> multiline.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index a28eb4203..0379ee78c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKRAW1U/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqUPMMY/test-config.toml
---
success: true
exit_code: 0
@@ -26,10 +26,10 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start: task1
-  echo 'Task 1 running' > task1.txt
+  echo 'Task 1 running' > task1.txt
πŸ”„ Running post-start: task2
-  echo 'Task 2 running' > task2.txt
+  echo 'Task 2 running' > task2.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index 01e3f8e89..21b602fa4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHGYMBC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpejrs20/test-config.toml
---
success: true
exit_code: 0
@@ -26,13 +26,13 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start: task1
-  echo 'TASK1_OUTPUT'
+  echo 'TASK1_OUTPUT'
πŸ”„ Running post-start: task2
-  echo 'TASK2_OUTPUT'
+  echo 'TASK2_OUTPUT'
πŸ”„ Running post-start: task3
-  echo 'TASK3_OUTPUT'
+  echo 'TASK3_OUTPUT'
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index e146b7180..8c973081a 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpF06YU8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxR2kPB/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
To enable automatic cd, run: wt config shell
πŸ”„ Running post-start:
-  sleep 1 && echo 'Background task done' > background.txt
+  sleep 1 && echo 'Background task done' > background.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index 33a0652fc..c7678c37e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu5XDIG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmLRvXk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Created new worktree for file-test at [REPO].file-test
πŸ”„ Executing (--execute):
-  echo 'test content' > test.txt
+  echo 'test content' > test.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 911c076e2..7d1e711c7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -18,14 +18,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk1ctcu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbDsAyE/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
πŸ”„ Executing (--execute):
-  echo 'existing worktree' > existing.txt
+  echo 'existing worktree' > existing.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index 141927a03..b71e4b412 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkVljqz/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZOFgJX/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
βœ… Created new worktree for fail-test at [REPO].fail-test
πŸ”„ Executing (--execute):
-  exit 1
+  exit 1
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index 24666b440..684e366c3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -19,16 +19,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT98uHB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTjeoau/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Created new worktree for multiline-test at [REPO].multiline-test
πŸ”„ Executing (--execute):
-  echo 'line1'
-  echo 'line2'
-  echo 'line3'
+  echo 'line1'
+  echo 'line2'
+  echo 'line3'
line1
line2
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 5f85bd270..5b3fce726 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -19,14 +19,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsRtxi3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAls7lL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
βœ… Created new worktree for exec-test at [REPO].exec-test
πŸ”„ Executing (--execute):
-  echo 'test output'
+  echo 'test output'
test output
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index c3119e056..9d913a6a9 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap differ