Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Change gutter background to bright white
Maximilian Roos5f9ce1f707ce
diff --git a/src/styling/constants.rs b/src/styling/constants.rsindex 26b9da8f2..55d09cb30 100644--- a/src/styling/constants.rs+++ b/src/styling/constants.rs@@ -60,6 +60,17 @@ pub const GREEN_BOLD: Style = Style::new()/// Gray style for secondary/metadata text - use as `{GRAY}text{GRAY:#}`pub const GRAY: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));+/// Gutter style for quoted content (commands, config, error details)+///+/// We wanted the dimmest/most subtle background that works on both dark and light+/// terminals. BrightWhite was the best we could find among basic ANSI colors, but+/// we're open to better ideas. Options considered:+/// - Black/BrightBlack: too dark on light terminals+/// - Reverse video: just flips which terminal looks good+/// - 256-color grays: better but not universally supported+/// - No background: loses the visual separation we want+pub const GUTTER: Style = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightWhite)));+// ============================================================================// Message Emojis// ============================================================================diff --git a/src/styling/format.rs b/src/styling/format.rsindex c43664a30..f4a6534aa 100644--- a/src/styling/format.rs+++ b/src/styling/format.rs@@ -3,7 +3,6 @@//! Provides functions for formatting commands and configuration with visual gutters.use ansi_str::AnsiStr;-use anstyle::{AnsiColor, Color, Style};use unicode_width::UnicodeWidthStr;#[cfg(feature = "syntax-highlighting")]@@ -115,7 +114,7 @@ pub(super) fn wrap_text_at_width(text: &str, max_width: usize) -> Vec<String> {/// print!("{}", format_with_gutter(&config, "", None));/// ```pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<usize>) -> String {- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));+ let gutter = super::GUTTER;let mut output = String::new();// Use provided width or detect terminal width (respects COLUMNS env var)@@ -152,7 +151,7 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<uspub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {use tree_sitter_highlight::{HighlightConfiguration, HighlightEvent, Highlighter};- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));+ let gutter = super::GUTTER;let mut output = String::new();// Calculate available width for wrapping@@ -258,7 +257,7 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {/// It provides the same gutter formatting without tree-sitter dependencies.#[cfg(not(feature = "syntax-highlighting"))]pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));+ let gutter = super::GUTTER;let mut output = String::new();// Calculate available width for wrappingdiff --git a/src/styling/highlighting.rs b/src/styling/highlighting.rsindex ed6e974b9..8b6dd4003 100644--- a/src/styling/highlighting.rs+++ b/src/styling/highlighting.rs@@ -71,8 +71,7 @@ pub(super) fn bash_token_style(kind: &str) -> Option<Style> {/// Formats TOML content with syntax highlighting using synopticpub fn format_toml(content: &str, left_margin: &str) -> String {- // Gutter style: subtle background for visual separation- let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));+ let gutter = super::GUTTER;// Get TOML highlighter from synoptic's built-in rules (tab_width = 4)let mut highlighter = match from_extension("toml", 4) {diff --git a/src/styling/mod.rs b/src/styling/mod.rsindex 959cb68e1..b0c9d4932 100644--- a/src/styling/mod.rs+++ b/src/styling/mod.rs@@ -124,10 +124,10 @@ command = "npm install""Should contain cyan or bold for tables");- // Check that gutter background is present (BrightBlack background = 100)+ // Check that gutter is present (BrightWhite background = 107)assert!(- output.contains("\x1b[100m"),- "Should contain gutter background color (BrightBlack = 100)"+ output.contains("\x1b[107m"),+ "Should contain gutter (BrightWhite background)");// Check that lines have content (not just gutter)@@ -293,8 +293,8 @@ command = "npm install"// Each line should have the gutterfor line in result.lines() {assert!(- line.contains("\x1b[100m"),- "Each line should contain gutter (BrightBlack background = 100)"+ line.contains("\x1b[107m"),+ "Each line should contain gutter (BrightWhite background)");}}@@ -322,11 +322,11 @@ command = "npm install"let result = format_with_gutter(commit_msg, "", Some(80));insta::assert_snapshot!(result, @r"- [100m [0m This commit refactors the authentication system to use a more secure- [100m [0m token-based approach instead of the previous session-based system which had- [100m [0m several security vulnerabilities that were identified during the security- [100m [0m audit last month. The new implementation follows industry best practices and- [100m [0m includes proper token rotation and expiration handling.+ [107m [0m This commit refactors the authentication system to use a more secure+ [107m [0m token-based approach instead of the previous session-based system which had+ [107m [0m several security vulnerabilities that were identified during the security+ [107m [0m audit last month. The new implementation follows industry best practices and+ [107m [0m includes proper token rotation and expiration handling.");}diff --git a/tests/integration_tests/config_list.rs b/tests/integration_tests/config_list.rsindex 5ec7b58b6..647a815ad 100644--- a/tests/integration_tests/config_list.rs+++ b/tests/integration_tests/config_list.rs@@ -51,17 +51,17 @@ server = "npm run dev"exit_code: 0----- stdout -----⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m- [100m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m- [100m [0m- [100m [0m [1m[36m[[approved-commands]][0m- [100m [0m project = [32m"test-project"[0m- [100m [0m command = [32m"npm install"[0m+ [107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m+ [107m [0m+ [107m [0m [1m[36m[[approved-commands]][0m+ [107m [0m project = [32m"test-project"[0m+ [107m [0m command = [32m"npm install"[0m⚪ Project Config: [1m[REPO]/.config/wt.toml[0m- [100m [0m post-create-command = [32m"npm install"[0m- [100m [0m- [100m [0m [1m[36m[post-start-command][0m- [100m [0m server = [32m"npm run dev"[0m+ [107m [0m post-create-command = [32m"npm install"[0m+ [107m [0m+ [107m [0m [1m[36m[post-start-command][0m+ [107m [0m server = [32m"npm run dev"[0m----- stderr -----"#);@@ -96,7 +96,7 @@ fn test_config_list_no_project_config() {exit_code: 0----- stdout -----⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m- [100m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m+ [107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m⚪ Project Config: [1m[REPO]/.config/wt.toml[0m💡 [2mNot found[0m@@ -133,7 +133,7 @@ fn test_config_list_outside_git_repo() {exit_code: 0----- stdout -----⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m- [100m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m+ [107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m⚪ [2mProject Config: Not in a git repository[0mdiff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 34e4f4449..296810127 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -29,7 +29,7 @@ fn test_configure_shell_with_yes() {exit_code: 0----- stdout -----✅ Added [1mzsh[0m ~/.zshrc- [100m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m+ [107m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m✅ [32mConfigured 1 shell[0m@@ -71,7 +71,7 @@ fn test_configure_shell_specific_shell() {exit_code: 0----- stdout -----✅ Added [1mzsh[0m ~/.zshrc- [100m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m+ [107m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m✅ [32mConfigured 1 shell[0m@@ -151,7 +151,7 @@ fn test_configure_shell_fish() {exit_code: 0----- stdout -----✅ Created [1mfish[0m ~/.config/fish/conf.d/wt.fish- [100m [0m [1m[35mif[0m [1m[34mtype[0m [36m-q[0m wt; [1m[34mcommand[0m wt config shell init fish [36m|[0m [1m[34msource[0m; end[0m+ [107m [0m [1m[35mif[0m [1m[34mtype[0m [36m-q[0m wt; [1m[34mcommand[0m wt config shell init fish [36m|[0m [1m[34msource[0m; end[0m✅ [32mConfigured 1 shell[0m@@ -235,9 +235,9 @@ fn test_configure_shell_multiple_configs() {exit_code: 0----- stdout -----✅ Added [1mbash[0m ~/.bash_profile- [100m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init bash)"[0m; [1m[35mfi[0m[0m+ [107m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init bash)"[0m; [1m[35mfi[0m[0m✅ Added [1mzsh[0m ~/.zshrc- [100m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m+ [107m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m✅ [32mConfigured 2 shells[0m@@ -295,9 +295,9 @@ fn test_configure_shell_mixed_states() {exit_code: 0----- stdout -----⚪ Already configured [1mbash[0m ~/.bash_profile- [100m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init bash)"[0m; [1m[35mfi[0m[0m+ [107m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init bash)"[0m; [1m[35mfi[0m[0m✅ Added [1mzsh[0m ~/.zshrc- [100m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m+ [107m [0m [1m[35mif[0m [1m[34mcommand[0m [36m-v[0m wt [36m>[0m/dev/null [33m2[0m>&1; [1m[35mthen[0m [1m[34meval[0m [32m"$([1m[34mcommand[0m wt config shell init zsh)"[0m; [1m[35mfi[0m[0m✅ [32mConfigured 1 shell[0mdiff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex dd70d9a37..64e5ac2aa 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -30,7 +30,7 @@ fn test_switch_internal_directive() {----- stderr -----❌ [31mFailed to create worktree for [1m[31mmy-feature[0m[0m- [100m [0m fatal: invalid reference: my-feature+ [107m [0m fatal: invalid reference: my-feature");});}@@ -56,7 +56,7 @@ fn test_switch_without_internal() {exit_code: 1----- stdout -----❌ [31mFailed to create worktree for [1m[31mmy-feature[0m[0m- [100m [0m fatal: invalid reference: my-feature+ [107m [0m fatal: invalid reference: my-feature----- stderr -----diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex bb2c6f76c..0cfa4150e 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -2353,9 +2353,9 @@ fn test_merge_no_commit_with_clean_tree() {exit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)- [100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file- [100m [0m feature.txt | 1 [32m+[m- [100m [0m 1 file changed, 1 insertion(+)+ [107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+ [107m [0m feature.txt | 1 [32m+[m+ [107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)✅ [32mWorktree preserved (--no-remove)[0m@@ -2457,9 +2457,9 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {exit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)- [100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file- [100m [0m feature.txt | 1 [32m+[m- [100m [0m 1 file changed, 1 insertion(+)+ [107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+ [107m [0m feature.txt | 1 [32m+[m+ [107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)✅ [32mWorktree preserved (--no-remove)[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snapindex d38c4af36..248d5d20a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap@@ -7,11 +7,11 @@ y🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m💡 Allow and remember? [1m[y/N][0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m[0mtest command✅ [32mCreated new worktree for [1m[32mtest-approve[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-approve[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snapindex b3da09abc..a093b488b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap@@ -7,7 +7,7 @@ n🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m💡 Allow and remember? [1m[y/N][0m⚪ Commands declined, continuing worktree creationdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snapindex a1ecb5dde..91cc4eb7c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap@@ -7,20 +7,20 @@ y🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m💡 Allow and remember? [1m[y/N][0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m[0mFirst command🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Second command'[0m[0m[0mSecond command🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m[0mThird command✅ [32mCreated new worktree for [1m[32mtest-mixed-accept[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-mixed-accept[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snapindex afabcc20d..4463c9c42 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap@@ -7,10 +7,10 @@ n🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m💡 Allow and remember? [1m[y/N][0m⚪ Commands declined, continuing worktree creationdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snapindex d98cd9cd1..1b336554f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap@@ -7,23 +7,23 @@ y🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Second command'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m💡 Allow and remember? [1m[y/N][0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m[0mFirst command🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Second command'[0m[0m[0mSecond command🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m[0mThird command✅ [32mCreated new worktree for [1m[32mtest-multi[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-multi[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snapindex 49f5daa8c..2c8fbba12 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap@@ -7,23 +7,23 @@ y🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0m🔄 post-create [1minstall[0m:-[100m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m🔄 post-create [1mbuild[0m:-[100m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m🔄 post-create [1mtest[0m:-[100m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m💡 Allow and remember? [1m[y/N][0m🔄 [36mRunning post-create [1minstall[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m[0mInstalling dependencies...🔄 [36mRunning post-create [1mbuild[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m[0mBuilding project...🔄 [36mRunning post-create [1mtest[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m[0mRunning tests...✅ [32mCreated new worktree for [1m[32mtest-named[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-named[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snapindex f65a005f4..2dbdfa29d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap@@ -7,13 +7,13 @@ y🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m💡 Allow and remember? [1m[y/N][0m🟡 [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[0m💡 [2mYou will be prompted again next time.[0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m[0mtest command✅ [32mCreated new worktree for [1m[32mtest-permission[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-permission[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --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.snapindex 25ef7fc32..8c354e801 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()---✅ [32mCreated new worktree for [1m[32mfish-multiline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.fish-multiline[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m [32m'line 1'[0m; [1m[34mecho[0m [32m'line 2'[0m; [1m[34mecho[0m [32m'line 3'[0m[0m+[107m [0m [1m[34mecho[0m [32m'line 1'[0m; [1m[34mecho[0m [32m'line 2'[0m; [1m[34mecho[0m [32m'line 3'[0m[0mline 1line 2line 3diff --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.snapindex a7e4fef38..b009ffcf9 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()---✅ [32mCreated new worktree for [1m[32mfish-bg[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.fish-bg[0m[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'fish background task'[0m[0m+[107m [0m [1m[34mecho[0m [32m'fish background task'[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snapindex 6301918d7..04e093c7d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mcheck1[0m:[0m-[100m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check1 3[0m+[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check1 3[0m[check1] stdout line 1[check1] stderr line 1[check1] stdout line 2@@ -13,7 +13,7 @@ expression: output.normalized()[check1] stdout complete[check1] stderr complete🔄 [36mRunning pre-merge [1mcheck2[0m:[0m-[100m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check2 3[0m+[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2@@ -23,9 +23,9 @@ expression: output.normalized()[check2] stdout complete[check2] stderr complete🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[100m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[TMPDIR]/test-repo[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snapindex 6301918d7..04e093c7d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mcheck1[0m:[0m-[100m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check1 3[0m+[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check1 3[0m[check1] stdout line 1[check1] stderr line 1[check1] stdout line 2@@ -13,7 +13,7 @@ expression: output.normalized()[check1] stdout complete[check1] stderr complete🔄 [36mRunning pre-merge [1mcheck2[0m:[0m-[100m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check2 3[0m+[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2@@ -23,9 +23,9 @@ expression: output.normalized()[check2] stdout complete[check2] stderr complete🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[100m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[TMPDIR]/test-repo[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex 230f38b43..307539adb 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,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mformat[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m✓ Code formatting check passed🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✗ Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mecho[0m [32m'✗ Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m✗ Test suite failed: 3 tests failing❌ [31mpre-merge command failed: [1m[31mtest[0m: exit status: 1[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex 230f38b43..307539adb 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@@ -3,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mformat[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m✓ Code formatting check passed🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✗ Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mecho[0m [32m'✗ Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m✗ Test suite failed: 3 tests failing❌ [31mpre-merge command failed: [1m[31mtest[0m: exit status: 1[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 4b9968b16..c01e598a1 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,18 +3,18 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mformat[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m✓ Code formatting check passed🔄 [36mRunning pre-merge [1mlint[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ Linting passed - no warnings'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ Linting passed - no warnings'[0m[0m✓ Linting passed - no warnings🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ All 47 tests passed in 2.3s'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ All 47 tests passed in 2.3s'[0m[0m✓ All 47 tests passed in 2.3s🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[100m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[TMPDIR]/test-repo[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex 4b9968b16..c01e598a1 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@@ -3,18 +3,18 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mformat[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ Code formatting check passed'[0m[0m✓ Code formatting check passed🔄 [36mRunning pre-merge [1mlint[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ Linting passed - no warnings'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ Linting passed - no warnings'[0m[0m✓ Linting passed - no warnings🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34mecho[0m [32m'✓ All 47 tests passed in 2.3s'[0m[0m+[107m [0m [1m[34mecho[0m [32m'✓ All 47 tests passed in 2.3s'[0m[0m✓ All 47 tests passed in 2.3s🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[100m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[TMPDIR]/test-repo[0m[0mdiff --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.snapindex 9e437d00e..73d5afa18 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,5 +4,5 @@ expression: output.normalized()---✅ [32mCreated new worktree for [1m[32mtest-exec[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.test-exec[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m executed[0m+[107m [0m [1m[34mecho[0m executed[0mexecuteddiff --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.snapindex 9e437d00e..73d5afa18 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,5 +4,5 @@ expression: output.normalized()---✅ [32mCreated new worktree for [1m[32mtest-exec[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.test-exec[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m executed[0m+[107m [0m [1m[34mecho[0m executed[0mexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snapindex e1e559770..9edab7e8c 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@@ -3,13 +3,13 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0mInstalling dependencies...🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0mBuilding project...✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0m🔄 [36mRunning post-start [1mserver[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Starting dev server on port 3000'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Starting dev server on port 3000'[0m[0m🔄 [36mRunning post-start [1mwatch[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Watching for file changes'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Watching for file changes'[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_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.snapindex e58fd1b98..84553e3c5 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()---✅ [32mCreated new worktree for [1m[32mfeature-with-hooks[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-with-hooks[0m[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'test command executed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command executed'[0m[0mdiff --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.snapindex 68dbd9ae4..6bdb21ca3 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()---✅ [32mCreated new worktree for [1m[32mfeature-bg[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-bg[0m[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'background task'[0m[0m+[107m [0m [1m[34mecho[0m [32m'background task'[0m[0mdiff --git a/tests/snapshots/git_error_display__push_failed.snap b/tests/snapshots/git_error_display__push_failed.snapindex 9a1d7fd1b..159bac8ae 100644--- a/tests/snapshots/git_error_display__push_failed.snap+++ b/tests/snapshots/git_error_display__push_failed.snap@@ -3,6 +3,6 @@ source: tests/git_error_display.rsexpression: msg---❌ [31mPush failed[0m-[100m [0m To /Users/user/workspace/repo/.git-[100m [0m ! [remote rejected] HEAD -> main (Up-to-date check failed)-[100m [0m error: failed to push some refs to '/Users/user/workspace/repo/.git'+[107m [0m To /Users/user/workspace/repo/.git+[107m [0m ! [remote rejected] HEAD -> main (Up-to-date check failed)+[107m [0m error: failed to push some refs to '/Users/user/workspace/repo/.git'diff --git a/tests/snapshots/git_error_display__worktree_removal_failed.snap b/tests/snapshots/git_error_display__worktree_removal_failed.snapindex f42e25423..1d09d2f06 100644--- a/tests/snapshots/git_error_display__worktree_removal_failed.snap+++ b/tests/snapshots/git_error_display__worktree_removal_failed.snap@@ -3,5 +3,5 @@ source: tests/git_error_display.rsexpression: msg---❌ [31mFailed to remove worktree for [1m[31mfeature-x[0m[31m at [1m[31m/tmp/repo.feature-x[0m[0m-[100m [0m fatal: worktree is dirty-[100m [0m error: could not remove worktree+[107m [0m fatal: worktree is dirty+[107m [0m error: could not remove worktreediff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snapindex 1756d5a60..a46d3674f 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'approved'[0m [36m>[0m output.txt[0m+[107m [0m [1m[34mecho[0m [32m'approved'[0m [36m>[0m output.txt[0m✅ [32mCreated new worktree for [1m[32mtest-approved[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-approved[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snapindex 380a7e992..28876d6bd 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -33,4 +30,4 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snapindex 4e3334ec4..5b60cd464 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap@@ -12,7 +12,7 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snapindex 258dd5c5d..36ee80d18 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap@@ -12,13 +12,13 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m4[0m[33m commands:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Branch: test-nested-branch'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Branch: test-nested-branch'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Worktree: [REPO].test-nested-branch'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Worktree: [REPO].test-nested-branch'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Repo: test-repo'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Repo: test-repo'[0m[0m🔄 post-create:-[100m [0m [1m[34mcd[0m [REPO].test-nested-branch [36m&&[0m [1m[34mpwd[0m[0m+[107m [0m [1m[34mcd[0m [REPO].test-nested-branch [36m&&[0m [1m[34mpwd[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snapindex 317fd0644..aa72bfdec 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap@@ -12,10 +12,10 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0m🔄 post-create [1minstall[0m:-[100m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m🔄 post-create [1mbuild[0m:-[100m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m🔄 post-create [1mtest[0m:-[100m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snapindex 6e5070248..8b22f7704 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap@@ -12,4 +12,4 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Worktree path: [REPO].feature-test-approval'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Worktree path: [REPO].feature-test-approval'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snapindex 4e3334ec4..5b60cd464 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap@@ -12,7 +12,7 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snapindex 6a86a927b..0573ff8d1 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap@@ -12,11 +12,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m✅ [32mCreated new worktree for [1m[32mtest-force-tty[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force-tty[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snapindex e30c6cb0e..78b257290 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap@@ -12,11 +12,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m✅ [32mCreated new worktree for [1m[32mtest-force[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snapindex d2903d6b7..3d9579500 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap@@ -12,4 +12,4 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m+[107m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snapindex 4c30b3f73..1ecdc04d0 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap@@ -12,4 +12,4 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-merge:-[100m [0m [1m[34mecho[0m [32m'Post-merge cleanup for main'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Post-merge cleanup for main'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snapindex 352a81df2..20766fbed 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap@@ -12,4 +12,4 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 pre-merge:-[100m [0m [1m[34mecho[0m [32m'Running pre-merge checks on main'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Running pre-merge checks on main'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snapindex 86bbbcfd8..b90f6092b 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap@@ -3,19 +3,17 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - beta- - ask-approvals+ - config+ - approvals+ - ask- "--all"env:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -33,4 +31,4 @@ exit_code: 1🟡 [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m🔄 post-create:-[100m [0m [1m[34mecho[0m [32m'test'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test'[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex 76521ea23..83ea919f5 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap@@ -12,16 +12,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxSX6HQ/test-gitconfigGIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5cKHXH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxSX6HQ/test-config.toml---success: trueexit_code: 0@@ -29,8 +26,8 @@ exit_code: 0----- stderr -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-[100m [0m * [33m6551244[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [33m6551244[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)✅ [32mWorktree preserved (--no-remove)[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 1512e7049..bd7b25fbf 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snapindex d357dd65b..dce98f97f 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__config_list_with_internal_flag.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""HOME: "[TEST_HOME]"LANG: C@@ -28,7 +25,7 @@ success: trueexit_code: 0----- stdout -----⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m-[100m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m+[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m⚪ Project Config: [1m[REPO]/.config/wt.toml[0m💡 [2mNot found[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 1ca42893d..56d623dd7 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,18 +26,18 @@ exit_code: 0🔄 [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: add file 1-[100m [0m - feat: add file 2+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: add file 1+[107m [0m - feat: add file 2💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m file1.txt | 1 [32m+[m-[100m [0m file2.txt | 1 [32m+[m-[100m [0m 2 files changed, 2 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 7602bf6c6..9a834d426 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,16 +24,16 @@ exit_code: 0🔄 [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: initial feature+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: initial feature💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex 2bd980f07..6e3ae57b2 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,16 +26,16 @@ exit_code: 0🔄 [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: add authentication+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: add authentication💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m auth.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m auth.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 06653c697..05f50d268 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,15 +22,15 @@ success: trueexit_code: 0----- stdout -----🟡 [33mAuto-staging 1 untracked file:[0m-[100m [0m dirty.txt+[107m [0m dirty.txt🔄 [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mChanges to dirty.txt[0m+[107m [0m [1mChanges to dirty.txt[0m✅ [32mCommitted changes @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to dirty.txt-[100m [0m dirty.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to dirty.txt+[107m [0m dirty.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 8ed0bbe1f..eb19e8bc0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex 3731ad5fc..e0908fca7 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,15 +22,15 @@ success: trueexit_code: 0----- stdout -----🟡 [33mAuto-staging 1 untracked file:[0m-[100m [0m newfile.txt+[107m [0m newfile.txt🔄 [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mChanges to newfile.txt[0m+[107m [0m [1mChanges to newfile.txt[0m✅ [32mCommitted changes @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mno-commits-dirty[m[33m)[m Changes to newfile.txt-[100m [0m newfile.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mno-commits-dirty[m[33m)[m Changes to newfile.txt+[107m [0m newfile.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mno-commits-dirty[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 106056464..2453c647d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -24,9 +21,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 6e405cfa6..897895f8d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,11 +23,11 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2-[100m [0m * [SHA] feat: add file 1-[100m [0m file1.txt | 1 [32m+[m-[100m [0m file2.txt | 1 [32m+[m-[100m [0m 2 files changed, 2 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2+[107m [0m * [SHA] feat: add file 1+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 8ed0bbe1f..eb19e8bc0 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex 854bd7f7e..2b00c99a3 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,14 +23,14 @@ success: falseexit_code: 1----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0m🔄 [36mRunning post-merge:[0m-[100m [0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mexit[0m 1[0m🟡 [33mCommand failed: exit status: 1[0m❌ [31mpost-merge command failed: exit status: 1[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snapindex aea30f2db..d91cda694 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,16 +23,16 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0m🔄 [36mRunning post-merge [1mnotify[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Merge to main complete'[0m [36m>[0m notify.txt[0m+[107m [0m [1m[34mecho[0m [32m'Merge to main complete'[0m [36m>[0m notify.txt[0m🔄 [36mRunning post-merge [1mdeploy[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Deploying branch feature'[0m [36m>[0m deploy.txt[0m+[107m [0m [1m[34mecho[0m [32m'Deploying branch feature'[0m [36m>[0m deploy.txt[0m----- stderr -----[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snapindex 799eb3757..232b038f1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap@@ -12,11 +12,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,9 +24,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex 6a4ddf774..de8eab028 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,14 +23,14 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0m🔄 [36mRunning post-merge:[0m-[100m [0m [1m[34mecho[0m [32m'merged feature to main'[0m [36m>[0m post-merge-ran.txt[0m+[107m [0m [1m[34mecho[0m [32m'merged feature to main'[0m [36m>[0m post-merge-ran.txt[0m----- stderr -----[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex 90df9faf1..dafa1518d 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: falseexit_code: 1----- stdout -----🟡 [33mAuto-staging 1 untracked file:[0m-[100m [0m feature.txt+[107m [0m feature.txt🔄 [36mRunning pre-commit:[0m-[100m [0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mexit[0m 1[0m❌ [31mpre-commit command failed: exit status: 1[0m💡 [2mUse --no-verify to skip pre-commit commands[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex cf3be86a3..f59e6c8ae 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,17 +23,17 @@ success: trueexit_code: 0----- stdout -----🟡 [33mAuto-staging 1 untracked file:[0m-[100m [0m feature.txt+[107m [0m feature.txt🔄 [36mRunning pre-commit:[0m-[100m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m🔄 [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mChanges to feature.txt[0m+[107m [0m [1mChanges to feature.txt[0m✅ [32mCommitted changes @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to feature.txt-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to feature.txt+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --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.snapindex d7f23b4a9..406ffe640 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ success: falseexit_code: 1----- stdout -----🔄 [36mRunning pre-merge:[0m-[100m [0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mexit[0m 1[0m❌ [31mpre-merge command failed: exit status: 1[0m💡 [2mUse --no-verify to skip pre-merge commands[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex 66d72206f..beed503ed 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,15 +23,15 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning pre-merge [1mformat[0m:[0m-[100m [0m [1m[34mexit[0m 0[0m+[107m [0m [1m[34mexit[0m 0[0m🔄 [36mRunning pre-merge [1mlint[0m:[0m-[100m [0m [1m[34mexit[0m 0[0m+[107m [0m [1m[34mexit[0m 0[0m🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34mexit[0m 0[0m+[107m [0m [1m[34mexit[0m 0[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snapindex b7435d766..c1b0f7bf5 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,11 +23,11 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning pre-merge:[0m-[100m [0m [1m[34mexit[0m 0[0m+[107m [0m [1m[34mexit[0m 0[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snapindex 72196f837..96ca47117 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ success: falseexit_code: 1----- stdout -----🔄 [36mRunning pre-commit:[0m-[100m [0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mexit[0m 1[0m❌ [31mpre-commit command failed: exit status: 1[0m💡 [2mUse --no-verify to skip pre-commit commands[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snapindex c51f003ca..f1d64b90e 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,11 +23,11 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning pre-commit:[0m-[100m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex 2397ff6ac..8fa5af961 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-from-develop[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-from-develop[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature-from-develop[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex 78db84a9d..9254828ea 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,9 +24,9 @@ exit_code: 0🔄 [36mRebasing onto [1m[36mmain[0m[36m...[0m✅ [32mRebased onto [1m[32mmain[0m[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-dirty-primary[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-dirty-primary[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature-dirty-primary[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snapindex eb30c0b48..dce44c8fb 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)✅ [32mWorktree preserved (--no-remove)[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 5422eb45a..bd8736159 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -23,9 +23,9 @@ exit_code: 1----- stdout -----🔄 [36mRebasing onto [1m[36mmain[0m[36m...[0m❌ [31mRebase onto [1m[31mmain[0m[31m incomplete[0m-[100m [0m Rebasing (1/1)-[100m [0m error: could not apply [SHA]... Update shared.txt in feature-[100m [0m Could not apply [SHA]... # Update shared.txt in feature+[107m [0m Rebasing (1/1)+[107m [0m error: could not apply [SHA]... Update shared.txt in feature+[107m [0m Could not apply [SHA]... # Update shared.txt in feature----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex edcdb1469..cf54c7d02 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,19 +24,19 @@ exit_code: 0🔄 [36mSquashing 3 commits into 1[0m (3 files, [32m+3[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: add file 1-[100m [0m - fix: update logic-[100m [0m - docs: update readme+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: add file 1+[107m [0m - fix: update logic+[107m [0m - docs: update readme✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m file1.txt | 1 [32m+[m-[100m [0m file2.txt | 1 [32m+[m-[100m [0m file3.txt | 1 [32m+[m-[100m [0m 3 files changed, 3 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m file3.txt | 1 [32m+[m+[107m [0m 3 files changed, 3 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex fe47610e6..508e99cd5 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,12 +24,12 @@ exit_code: 0🔄 [36mSquashing 3 commits into 1...[0m🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - Change 1-[100m [0m - Change 2-[100m [0m - Revert to initial+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - Change 1+[107m [0m - Change 2+[107m [0m - Revert to initial⚪ [2mNo changes after squashing 3 commits[0m✅ [32mMerged to [1m[32mmain[0m[0m (no new commits, no rebase needed)🔄 [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 7eb97fb5c..40ddeb172 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,17 +25,17 @@ exit_code: 0🔄 [36mSquashing 2 commits into 1[0m (2 files, [32m+2[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: new feature-[100m [0m - fix: bug fix+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: new feature+[107m [0m - fix: bug fix✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m file1.txt | 1 [32m+[m-[100m [0m file2.txt | 1 [32m+[m-[100m [0m 2 files changed, 2 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 133a5cf11..b28a9d213 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commit-[100m [0m file1.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commit+[107m [0m file1.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 981277dc3..01c51bfc6 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -30,16 +27,16 @@ exit_code: 0🔄 [36mSquashing 2 commits into 1[0m (1 file, [32m+1[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: add authentication-[100m [0m - fix: handle edge case+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: add authentication+[107m [0m - fix: handle edge case✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m auth.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m auth.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex e64cbca6e..ae3790550 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,18 +26,18 @@ exit_code: 0🔄 [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: add file 1-[100m [0m - feat: add file 2+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: add file 1+[107m [0m - feat: add file 2💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m file1.txt | 1 [32m+[m-[100m [0m file2.txt | 1 [32m+[m-[100m [0m 2 files changed, 2 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 106056464..2453c647d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -24,9 +21,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snapindex a10e6d9dc..c6f274dba 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,9 +24,9 @@ exit_code: 0🔄 [36mRebasing onto [1m[36mstaging[0m[36m...[0m✅ [32mRebased onto [1m[32mstaging[0m[0m🔄 [36mMerging 1 commit to [1m[36mstaging[0m[36m @ [2m[SHA][0m (no commit/squash needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-for-staging[m[33m)[m Add feature for staging-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-for-staging[m[33m)[m Add feature for staging+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mstaging[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature-for-staging[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snapindex dbee827e0..0829a6f25 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO].main-wt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex eb30c0b48..dce44c8fb 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)✅ [32mWorktree preserved (--no-remove)[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex c48f8b0da..884c9afdc 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,23 +24,23 @@ success: trueexit_code: 0----- stdout -----🟡 [33mAuto-staging 2 untracked files:[0m-[100m [0m untracked1.txt-[100m [0m untracked2.txt+[107m [0m untracked1.txt+[107m [0m untracked2.txt🔄 [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...🔄 [36mGenerating squash commit message...[0m💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[100m [0m [1mSquash commits from main[0m-[100m [0m-[100m [0m Combined commits:-[100m [0m - feat: add file 1+[107m [0m [1mSquash commits from main[0m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: add file 1💡 Backup created @ [SHA]✅ [32mSquashed @ [2m[SHA][0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main-[100m [0m file1.txt | 1 [32m+[m-[100m [0m untracked1.txt | 1 [32m+[m-[100m [0m untracked2.txt | 1 [32m+[m-[100m [0m 3 files changed, 3 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m file1.txt | 1 [32m+[m+[107m [0m untracked1.txt | 1 [32m+[m+[107m [0m untracked2.txt | 1 [32m+[m+[107m [0m 3 files changed, 3 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 499ad0422..68db48e2d 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,31 +25,31 @@ exit_code: 0----- stdout -----🔄 [36mSquashing 3 commits into 1[0m (3 files, [32m+33[0m)...🔄 [36mGenerating squash commit message...[0m-[100m [0m [1mfeat(auth): Implement JWT authentication system[0m-[100m [0m-[100m [0m Add comprehensive JWT token handling including validation, refresh logic,-[100m [0m and authentication tests. This establishes the foundation for secure-[100m [0m API authentication.-[100m [0m-[100m [0m - Implement token refresh mechanism with expiry handling-[100m [0m - Add JWT encoding/decoding with signature verification-[100m [0m - Create test suite covering all authentication flows+[107m [0m [1mfeat(auth): Implement JWT authentication system[0m+[107m [0m+[107m [0m Add comprehensive JWT token handling including validation, refresh logic,+[107m [0m and authentication tests. This establishes the foundation for secure+[107m [0m API authentication.+[107m [0m+[107m [0m - Implement token refresh mechanism with expiry handling+[107m [0m - Add JWT encoding/decoding with signature verification+[107m [0m - Create test suite covering all authentication flows✅ [32mSquashed @ [2m[SHA][0m🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34mcargo[0m test[0m+[107m [0m [1m[34mcargo[0m test[0m🔄 [36mRunning pre-merge [1mlint[0m:[0m-[100m [0m [1m[34mcargo[0m clippy[0m+[107m [0m [1m[34mcargo[0m clippy[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication system-[100m [0m auth.rs | 8 [32m++++++++[m-[100m [0m auth_test.rs | 17 [32m+++++++++++++++++[m-[100m [0m jwt.rs | 8 [32m++++++++[m-[100m [0m 3 files changed, 33 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication system+[107m [0m auth.rs | 8 [32m++++++++[m+[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m+[107m [0m jwt.rs | 8 [32m++++++++[m+[107m [0m 3 files changed, 33 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+33[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature-auth[0m[32m, changed directory to [1m[32m[REPO][0m[0m🔄 [36mRunning post-merge [1minstall[0m:[0m-[100m [0m [1m[34mcargo[0m install [36m--path[0m .[0m+[107m [0m [1m[34mcargo[0m install [36m--path[0m .[0m----- stderr -----[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snapindex 0ac35a9f7..f5a2baad8 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap@@ -12,11 +12,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,11 +25,11 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create [1minstall[0m:[0m-[100m [0m [1m[34muv[0m sync[0m+[107m [0m [1m[34muv[0m sync[0m✅ [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-x[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start [1mdev[0m:[0m-[100m [0m [1m[34muv[0m run dev[0m+[107m [0m [1m[34muv[0m run dev[0m----- stderr -----[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snapindex 2ff241503..9e3260cd0 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,20 +25,20 @@ exit_code: 0----- stdout -----🔄 [36mSquashing 3 commits into 1[0m (2 files, [32m+45[0m)...🔄 [36mGenerating squash commit message...[0m-[100m [0m [1mfeat(api): Add user authentication endpoints[0m-[100m [0m-[100m [0m Implement login and token refresh endpoints with JWT validation.-[100m [0m Includes comprehensive test coverage and input validation.+[107m [0m [1mfeat(api): Add user authentication endpoints[0m+[107m [0m+[107m [0m Implement login and token refresh endpoints with JWT validation.+[107m [0m Includes comprehensive test coverage and input validation.✅ [32mSquashed @ [2m[SHA][0m🔄 [36mRunning pre-merge [1mtest[0m:[0m-[100m [0m [1m[34muv[0m run pytest[0m+[107m [0m [1m[34muv[0m run pytest[0m🔄 [36mRunning pre-merge [1mlint[0m:[0m-[100m [0m [1m[34muv[0m run ruff check[0m+[107m [0m [1m[34muv[0m run ruff check[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(api): Add user authentication endpoints-[100m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m-[100m [0m tests/test_auth.py | 14 [32m++++++++++++++[m-[100m [0m 2 files changed, 45 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(api): Add user authentication endpoints+[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m+[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m+[107m [0m 2 files changed, 45 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+45[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfeature-auth[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex eb39590e5..aebe8baac 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validation-[100m [0m auth.rs | 13 [32m+++++++++++++[m-[100m [0m 1 file changed, 13 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validation+[107m [0m auth.rs | 13 [32m+++++++++++++[m+[107m [0m 1 file changed, 13 insertions(+)✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+13[0m)🔄 [36mRemoving worktree & branch...[0m✅ [32mRemoved worktree & branch for [1m[32mfix-auth[0m[32m, changed directory to [1m[32m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snapindex 1fb4b16f0..dd43a20f6 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,11 +23,11 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Setup done'[0m [36m>[0m setup.txt[0m+[107m [0m [1m[34mecho[0m [32m'Setup done'[0m [36m>[0m setup.txt[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start [1mserver[0m:[0m-[100m [0m [1m[34msleep[0m 0.05 [36m&&[0m [1m[34mecho[0m [32m'Server running'[0m [36m>[0m server.txt[0m+[107m [0m [1m[34msleep[0m 0.05 [36m&&[0m [1m[34mecho[0m [32m'Server running'[0m [36m>[0m server.txt[0m----- stderr -----[0mdiff --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.snapindex 569a1e943..438f48c52 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@@ -13,11 +13,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,8 +26,8 @@ exit_code: 0----- stdout -----✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'Background task'[0m [36m>[0m background.txt[0m+[107m [0m [1m[34mecho[0m [32m'Background task'[0m [36m>[0m background.txt[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m [32m'Execute flag'[0m [36m>[0m execute.txt[0m+[107m [0m [1m[34mecho[0m [32m'Execute flag'[0m [36m>[0m execute.txt[0m----- 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.snapindex 2b2545359..47eb41985 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mexit[0m 1[0m🟡 [33mCommand failed: exit status: 1[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --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.snapindex 890a846e9..516ca35f0 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,11 +23,11 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[35mif[0m [ ! -f test.txt ]; [1m[35mthen[0m[1m[35m[0m[0m-[100m [0m [1m[34mecho[0m [32m'File does not exist'[0m [36m>[0m result.txt[0m-[100m [0m [1m[34melse[0m[0m-[100m [0m [1m[34mecho[0m [32m'File exists'[0m [36m>[0m result.txt[0m-[100m [0m [1m[34mfi[0m[0m+[107m [0m [1m[35mif[0m [ ! -f test.txt ]; [1m[35mthen[0m[1m[35m[0m[0m+[107m [0m [1m[34mecho[0m [32m'File does not exist'[0m [36m>[0m result.txt[0m+[107m [0m [1m[34melse[0m[0m+[107m [0m [1m[34mecho[0m [32m'File exists'[0m [36m>[0m result.txt[0m+[107m [0m [1m[34mfi[0m[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snapindex 439d68eed..0946403ec 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'First'[0m[0m+[107m [0m [1m[34mecho[0m [32m'First'[0m[0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Second'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Second'[0m[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snapindex c26842926..6b854e45d 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create [1minstall[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Installing deps'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Installing deps'[0m[0m🔄 [36mRunning post-create [1msetup[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Running setup'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Running setup'[0m[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --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.snapindex 5f8da46e4..7cb346a52 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Setup complete'[0m[0m+[107m [0m [1m[34mecho[0m [32m'Setup complete'[0m[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snapindex 74177b23f..8c06dbc39 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,13 +23,13 @@ success: trueexit_code: 0----- stdout -----🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Repo: test-repo'[0m [36m>[0m info.txt[0m+[107m [0m [1m[34mecho[0m [32m'Repo: test-repo'[0m [36m>[0m info.txt[0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Branch: feature-test'[0m [36m>>[0m info.txt[0m+[107m [0m [1m[34mecho[0m [32m'Branch: feature-test'[0m [36m>>[0m info.txt[0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Worktree: [REPO].feature-test'[0m [36m>>[0m info.txt[0m+[107m [0m [1m[34mecho[0m [32m'Worktree: [REPO].feature-test'[0m [36m>>[0m info.txt[0m🔄 [36mRunning post-create:[0m-[100m [0m [1m[34mecho[0m [32m'Root: [REPO]'[0m [36m>>[0m info.txt[0m+[107m [0m [1m[34mecho[0m [32m'Root: [REPO]'[0m [36m>>[0m info.txt[0m✅ [32mCreated new worktree for [1m[32mfeature/test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-test[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0mdiff --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.snapindex 48b1044d4..f583b3edf 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,8 +25,8 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m 'line1[0m-[100m [0m [1m[34mline2[0m[0m-[100m [0m [1m[34mline3[0m' | grep line2 > filtered.txt[0m+[107m [0m [1m[34mecho[0m 'line1[0m+[107m [0m [1m[34mline2[0m[0m+[107m [0m [1m[34mline3[0m' | grep line2 > filtered.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snapindex 4b4b52077..1cbdc13ab 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,6 +25,6 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'POST-START-RAN'[0m [36m>[0m post_start_marker.txt[0m+[107m [0m [1m[34mecho[0m [32m'POST-START-RAN'[0m [36m>[0m post_start_marker.txt[0m----- 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.snapindex 2d58cbbc8..f95912398 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,6 +25,6 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m 'unclosed quote[0m+[107m [0m [1m[34mecho[0m 'unclosed quote[0m----- 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.snapindex d713ff08f..3a6810d5e 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,6 +25,6 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'stdout output'[0m [36m&&[0m [1m[34mecho[0m [32m'stderr output'[0m >&2[0m+[107m [0m [1m[34mecho[0m [32m'stdout output'[0m [36m&&[0m [1m[34mecho[0m [32m'stderr output'[0m >&2[0m----- 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.snapindex 0f58375f3..2e7be02aa 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,8 +25,8 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34mecho[0m [32m'first line'[0m [36m>[0m multiline.txt[0m-[100m [0m [1m[34mecho[0m [32m'second line'[0m [36m>>[0m multiline.txt[0m-[100m [0m [1m[34mecho[0m [32m'third line'[0m [36m>>[0m multiline.txt[0m+[107m [0m [1m[34mecho[0m [32m'first line'[0m [36m>[0m multiline.txt[0m+[107m [0m [1m[34mecho[0m [32m'second line'[0m [36m>>[0m multiline.txt[0m+[107m [0m [1m[34mecho[0m [32m'third line'[0m [36m>>[0m multiline.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snapindex 6944596b3..c98c70013 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,8 +25,8 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start [1mtask1[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Task 1 running'[0m [36m>[0m task1.txt[0m+[107m [0m [1m[34mecho[0m [32m'Task 1 running'[0m [36m>[0m task1.txt[0m🔄 [36mRunning post-start [1mtask2[0m:[0m-[100m [0m [1m[34mecho[0m [32m'Task 2 running'[0m [36m>[0m task2.txt[0m+[107m [0m [1m[34mecho[0m [32m'Task 2 running'[0m [36m>[0m task2.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snapindex 2d1202824..d5cc82e92 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,10 +25,10 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start [1mtask1[0m:[0m-[100m [0m [1m[34mecho[0m [32m'TASK1_OUTPUT'[0m[0m+[107m [0m [1m[34mecho[0m [32m'TASK1_OUTPUT'[0m[0m🔄 [36mRunning post-start [1mtask2[0m:[0m-[100m [0m [1m[34mecho[0m [32m'TASK2_OUTPUT'[0m[0m+[107m [0m [1m[34mecho[0m [32m'TASK2_OUTPUT'[0m[0m🔄 [36mRunning post-start [1mtask3[0m:[0m-[100m [0m [1m[34mecho[0m [32m'TASK3_OUTPUT'[0m[0m+[107m [0m [1m[34mecho[0m [32m'TASK3_OUTPUT'[0m[0m----- 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.snapindex 25e395fb2..8dcff63f7 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,6 +25,6 @@ exit_code: 0✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m💡 [2mTo enable automatic cd, run: wt config shell install[0m🔄 [36mRunning post-start:[0m-[100m [0m [1m[34msleep[0m 0.1 [36m&&[0m [1m[34mecho[0m [32m'Background task done'[0m [36m>[0m background.txt[0m+[107m [0m [1m[34msleep[0m 0.1 [36m&&[0m [1m[34mecho[0m [32m'Background task done'[0m [36m>[0m background.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snapindex 555d3b7c7..765f7617e 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,9 +24,9 @@ exit_code: 0----- stdout -----🔄 [36mStashing changes in [1m[36m[REPO][0m[36m...[0m🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)🔄 [36mRestoring stashed changes in [1m[36m[REPO][0m[36m...[0m✅ [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snapindex bd03022f4..867030f69 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 1----- stdout -----❌ [31mCannot push: conflicting uncommitted changes in:[0m-[100m [0m conflict.txt+[107m [0m conflict.txt💡 [2mCommit or stash these changes in [REPO] first[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 53f7c21cd..422ec613a 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add test file-[100m [0m test.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add test file+[107m [0m test.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex 9acc7d5d5..ec9323a6c 100644--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex 821b2a922..142d40592 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@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,9 +23,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 9acc7d5d5..ec9323a6c 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -25,9 +22,9 @@ success: trueexit_code: 0----- stdout -----🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file-[100m [0m feature.txt | 1 [32m+[m-[100m [0m 1 file changed, 1 insertion(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snapindex d193c186b..c78e830ee 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@@ -12,11 +12,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,14 +24,14 @@ success: trueexit_code: 0----- stdout -----🔄 [36mPushing 3 commits to [1m[36mmain[0m[36m @ [2m[SHA][0m (merge commits allowed)-[100m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Merge temp-[100m [0m [31m|[m[32m/[m-[100m [0m [31m|[m * [SHA][33m ([m[1;32mtemp[m[33m)[m Commit 2-[100m [0m [31m|[m[31m/[m-[100m [0m * [SHA] Commit 1-[100m [0m file1.txt | 1 [32m+[m-[100m [0m file2.txt | 1 [32m+[m-[100m [0m 2 files changed, 2 insertions(+)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Merge temp+[107m [0m [31m|[m[32m/[m+[107m [0m [31m|[m * [SHA][33m ([m[1;32mtemp[m[33m)[m Commit 2+[107m [0m [31m|[m[31m/[m+[107m [0m * [SHA] Commit 1+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)✅ [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snapindex a20cc5c06..b5eb13e13 100644--- a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap@@ -11,16 +11,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwwZ5t3/test-gitconfigGIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGcODxo/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwwZ5t3/test-config.toml---success: falseexit_code: 1@@ -28,4 +25,4 @@ exit_code: 1----- stderr -----❌ [31mFailed to create worktree for [1m[31m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[0m[0m-[100m [0m fatal: invalid reference: __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6+[107m [0m fatal: invalid reference: __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snapindex 907cd1705..107e19bcb 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@@ -13,11 +13,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,6 +26,6 @@ exit_code: 0----- stdout -----✅ [32mCreated new worktree for [1m[32mfile-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].file-test[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m [32m'test content'[0m [36m>[0m test.txt[0m+[107m [0m [1m[34mecho[0m [32m'test content'[0m [36m>[0m test.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex 4933cd80c..6d37bc5db 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -12,11 +12,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,6 +25,6 @@ exit_code: 0----- stdout -----✅ [32mSwitched to worktree for [1m[32mexisting-exec[0m[32m at [1m[32m[WORKTREE_EXISTING_EXEC][0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m [32m'existing worktree'[0m [36m>[0m existing.txt[0m+[107m [0m [1m[34mecho[0m [32m'existing worktree'[0m [36m>[0m existing.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex 56f9ac353..aa69d9bd7 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -13,11 +13,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,7 +26,7 @@ exit_code: 1----- stdout -----✅ [32mCreated new worktree for [1m[32mfail-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].fail-test[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mexit[0m 1[0m+[107m [0m [1m[34mexit[0m 1[0m❌ [31mexit status: 1[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex 85cda9315..cc57aae68 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -13,11 +13,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,9 +26,9 @@ exit_code: 0----- stdout -----✅ [32mCreated new worktree for [1m[32mmultiline-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].multiline-test[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m [32m'line1'[0m[0m-[100m [0m [1m[34mecho[0m [32m'line2'[0m[0m-[100m [0m [1m[34mecho[0m [32m'line3'[0m[0m+[107m [0m [1m[34mecho[0m [32m'line1'[0m[0m+[107m [0m [1m[34mecho[0m [32m'line2'[0m[0m+[107m [0m [1m[34mecho[0m [32m'line3'[0m[0mline1line2line3diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex 7c9c37734..68150e1df 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -13,11 +13,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -29,7 +26,7 @@ exit_code: 0----- stdout -----✅ [32mCreated new worktree for [1m[32mexec-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exec-test[0m[0m🔄 [36mExecuting (--execute):[0m-[100m [0m [1m[34mecho[0m [32m'test output'[0m[0m+[107m [0m [1m[34mecho[0m [32m'test output'[0m[0mtest output----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snapindex b95264d21..4720021d7 100644Binary 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