Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: Fix CI failures on Windows and Ubuntu (#34)
Maximilian Roos9c80aad297af
diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex 56f81df72..dfb10dca2 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -120,9 +120,6 @@ impl<'a> CommitGenerator<'a> {"{GREEN}Committed changes @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"))?;- // Show detailed diffstat of the commit- super::show_diffstat(&repo, "HEAD~1..HEAD")?;-Ok(())}}diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex d67525854..e1884ab56 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -252,9 +252,6 @@ pub fn handle_squash("{GREEN}Squashed @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"))?;- // Show detailed diffstat of the squashed commit- super::show_diffstat(repo, "HEAD~1..HEAD")?;-Ok(true)}diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex bd848bd4c..08fcdb7b1 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -608,14 +608,8 @@ pub fn handle_push(])?;crate::output::gutter(format_with_gutter(&log_output, "", None))?;- // Show diff statistics only if we didn't already show them after commit/squash- let already_showed_diffstat = operations- .map(|ops| ops.committed || ops.squashed)- .unwrap_or(false);-- if !already_showed_diffstat {- super::show_diffstat(&repo, &format!("{}..HEAD", target_branch))?;- }+ // Show diff statistics+ super::show_diffstat(&repo, &format!("{}..HEAD", target_branch))?;}// Get git common dir for the pushdiff --git a/src/main.rs b/src/main.rsindex d8f3ffa0f..9b1fb6d80 100644--- a/src/main.rs+++ b/src/main.rs@@ -32,9 +32,10 @@ use commands::{};use output::{execute_user_command, handle_remove_output, handle_switch_output};+#[cfg(unix)]+use cli::BetaCommand;use cli::{- ApprovalsCommand, BetaCommand, Cli, Commands, ConfigCommand, ConfigShellCommand, StatusAction,- StepCommand,+ ApprovalsCommand, Cli, Commands, ConfigCommand, ConfigShellCommand, StatusAction, StepCommand,};use worktrunk::HookType;diff --git a/tests/common/list_snapshots.rs b/tests/common/list_snapshots.rsindex 9c53745e5..56f9794c6 100644--- a/tests/common/list_snapshots.rs+++ b/tests/common/list_snapshots.rs@@ -130,10 +130,17 @@ pub fn command_task_dag_from_dir(repo: &TestRepo, cwd: &Path) -> Command {}fn normalize_worktree_paths(settings: &mut Settings, repo: &TestRepo) {- settings.add_filter(repo.root_path().to_str().unwrap(), "[REPO]");+ // Canonicalize to handle macOS /var -> /private/var symlink+ let root_canonical = repo+ .root_path()+ .canonicalize()+ .unwrap_or_else(|_| repo.root_path().to_path_buf());+ settings.add_filter(®ex::escape(root_canonical.to_str().unwrap()), "[REPO]");+for (name, path) in &repo.worktrees {+ let canonical = path.canonicalize().unwrap_or_else(|_| path.clone());settings.add_filter(- path.to_str().unwrap(),+ ®ex::escape(canonical.to_str().unwrap()),format!("[WORKTREE_{}]", name.to_uppercase().replace('-', "_")),);}diff --git a/tests/common/mod.rs b/tests/common/mod.rsindex 1708563b1..f0742834b 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -734,6 +734,25 @@ pub fn setup_home_snapshot_settings(temp_home: &TempDir) -> insta::Settings {settings}+/// Create configured insta Settings for snapshot tests with a temp directory+///+/// Use this for tests that don't use TestRepo but need temp path redaction and+/// standard env var redactions (e.g., bare repository tests).+pub fn setup_temp_snapshot_settings(temp_path: &std::path::Path) -> insta::Settings {+ let mut settings = insta::Settings::clone_current();+ settings.set_snapshot_path("../snapshots");++ // Filter temp paths in output+ settings.add_filter(®ex::escape(temp_path.to_str().unwrap()), "[TEMP]");+ settings.add_filter(r"\\", "/");++ // Redact volatile metadata captured by insta-cmd+ settings.add_redaction(".env.GIT_CONFIG_GLOBAL", "[TEST_GIT_CONFIG]");+ settings.add_redaction(".env.WORKTRUNK_CONFIG_PATH", "[TEST_CONFIG]");++ settings+}+/// Create a configured Command for snapshot testing////// This extracts the common command setup while allowing the test filediff --git a/tests/integration_tests/bare_repository.rs b/tests/integration_tests/bare_repository.rsindex a052fce34..7bdebb8d5 100644--- a/tests/integration_tests/bare_repository.rs+++ b/tests/integration_tests/bare_repository.rs@@ -1,4 +1,4 @@-use crate::common::{TestRepo, wt_command};+use crate::common::{TestRepo, setup_temp_snapshot_settings, wt_command};use insta_cmd::assert_cmd_snapshot;use std::fs;use std::path::PathBuf;@@ -145,14 +145,17 @@ impl BareRepoTest {/// Configure a wt command with test environmentfn configure_wt_cmd(&self, cmd: &mut Command) {- cmd.env("WORKTRUNK_CONFIG", self.test_config_path.to_str().unwrap())- .env("GIT_CONFIG_GLOBAL", "/dev/null")- .env("GIT_CONFIG_SYSTEM", "/dev/null")- .env("SOURCE_DATE_EPOCH", "1761609600")- .env("LC_ALL", "C")- .env("LANG", "C")- .env_remove("NO_COLOR")- .env_remove("CLICOLOR_FORCE");+ cmd.env(+ "WORKTRUNK_CONFIG_PATH",+ self.test_config_path.to_str().unwrap(),+ )+ .env("GIT_CONFIG_GLOBAL", "/dev/null")+ .env("GIT_CONFIG_SYSTEM", "/dev/null")+ .env("SOURCE_DATE_EPOCH", "1761609600")+ .env("LC_ALL", "C")+ .env("LANG", "C")+ .env_remove("NO_COLOR")+ .env_remove("CLICOLOR_FORCE");}}@@ -167,12 +170,15 @@ fn test_bare_repo_list_worktrees() {let feature_worktree = test.create_worktree("feature", "test-repo.feature");test.commit_in_worktree(&feature_worktree, "Work on feature");- // Run wt list from the main worktree- let mut cmd = wt_command();- test.configure_wt_cmd(&mut cmd);- cmd.arg("list").current_dir(&main_worktree);+ let settings = setup_temp_snapshot_settings(test.temp_path());+ settings.bind(|| {+ // Run wt list from the main worktree+ let mut cmd = wt_command();+ test.configure_wt_cmd(&mut cmd);+ cmd.arg("list").current_dir(&main_worktree);- assert_cmd_snapshot!(cmd);+ assert_cmd_snapshot!(cmd);+ });}#[test]@@ -205,11 +211,8 @@ fn test_bare_repo_switch_creates_worktree() {let main_worktree = test.create_worktree("main", "test-repo.main");test.commit_in_worktree(&main_worktree, "Initial commit");- // Create worktrunk config to use worktree naming pattern suitable for bare repos- let config = r#"-worktree-path = "{{ branch }}"-"#;- fs::write(test.config_path(), config).expect("Failed to write config");+ // Use default template (sibling worktrees): ../{{ main_worktree }}.{{ branch }}+ // No config needed - defaults will create worktrees as siblings with dot separator// Run wt switch --create to create a new worktreelet mut cmd = wt_command();@@ -244,8 +247,8 @@ worktree-path = "{{ branch }}"String::from_utf8_lossy(&list_output.stdout));- // Verify the new worktree was created- // With template "{{ branch }}", it creates as sibling: bare-repo-name.feature+ // Verify the new worktree was created as sibling with dot separator+ // Default template: ../{{ main_worktree }}.{{ branch }} -> test-repo.git.featurelet bare_name = test.bare_repo_path().file_name().unwrap().to_str().unwrap();let expected_path = test.temp_path().join(format!("{}.feature", bare_name));assert!(@@ -377,11 +380,8 @@ fn test_bare_repo_worktree_base_used_for_paths() {let main_worktree = test.create_worktree("main", "test-repo.main");test.commit_in_worktree(&main_worktree, "Initial commit");- // Configure to use simple branch naming- let config = r#"-worktree-path = "{{ branch }}"-"#;- fs::write(test.config_path(), config).expect("Failed to write config");+ // Use default template - creates sibling worktrees with dot separator+ // No config needed - defaults will create worktrees as siblings// Create new worktree - should be created relative to bare repo rootlet mut cmd = wt_command();@@ -392,6 +392,7 @@ worktree-path = "{{ branch }}"cmd.output().expect("Failed to run wt switch");// Verify path is created as sibling to bare repo (using worktree_base)+ // Default template: ../{{ main_worktree }}.{{ branch }} -> test-repo.git.devlet bare_name = test.bare_repo_path().file_name().unwrap().to_str().unwrap();let expected = test.temp_path().join(format!("{}.dev", bare_name));assert!(@@ -490,11 +491,8 @@ fn test_bare_repo_merge_workflow() {let main_worktree = test.create_worktree("main", "test-repo.main");test.commit_in_worktree(&main_worktree, "Initial commit on main");- // Create feature worktree with config- let config = r#"-worktree-path = "{{ branch }}"-"#;- fs::write(test.config_path(), config).expect("Failed to write config");+ // Use default template - creates sibling worktrees with dot separator+ // No config needed - defaults will create worktrees as siblings// Create feature branch worktreelet mut cmd = wt_command();@@ -503,7 +501,7 @@ worktree-path = "{{ branch }}".current_dir(&main_worktree);cmd.output().expect("Failed to create feature worktree");- // Get feature worktree path+ // Get feature worktree path (default template: ../{{ main_worktree }}.{{ branch }})let bare_name = test.bare_repo_path().file_name().unwrap().to_str().unwrap();let feature_worktree = test.temp_path().join(format!("{}.feature", bare_name));assert!(feature_worktree.exists(), "Feature worktree should exist");diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 64e5ac2aa..ad3f7293f 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -1,4 +1,4 @@-use crate::common::{TestRepo, wt_command};+use crate::common::{TestRepo, setup_snapshot_settings, wt_command};use insta::Settings;use insta_cmd::assert_cmd_snapshot;use std::process::Command;@@ -154,8 +154,7 @@ fn test_merge_internal_no_remove() {.output().expect("Failed to commit");- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");+ let mut settings = setup_snapshot_settings(&repo);// Normalize SHA in outputsettings.add_filter(r"@ [a-f0-9]{7}", "@ [SHA]");@@ -210,15 +209,10 @@ fn test_merge_internal_remove() {.output().expect("Failed to commit");- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");+ let mut settings = setup_snapshot_settings(&repo);// Normalize SHA and path in outputsettings.add_filter(r"@ [a-f0-9]{7}", "@ [SHA]");settings.add_filter(r"__WORKTRUNK_CD__[^\x00]+", "__WORKTRUNK_CD__[PATH]");- // Normalize temp directory paths in success message (macOS)- settings.add_filter(r"/private/var/folders/[^\s]+/test-repo", "[REPO]");- // Normalize temp directory paths in success message (Linux)- settings.add_filter(r"/tmp/\.tmp[^\s]+/test-repo", "[REPO]");settings.bind(|| {let mut cmd = wt_command();diff --git a/tests/integration_tests/init.rs b/tests/integration_tests/init.rsindex d4f68e6d3..d47f8d99c 100644--- a/tests/integration_tests/init.rs+++ b/tests/integration_tests/init.rs@@ -6,8 +6,15 @@ use rstest::rstest;/// Helper to create snapshot for config shell init commandfn snapshot_init(test_name: &str, shell: &str, extra_args: &[&str]) {let repo = TestRepo::new();++ // Custom settings for init tests - these output shell scripts with intentional+ // backslashes (\cd, \n) so we can't use setup_snapshot_settings which has a+ // backslash normalization filter that would corrupt the outputlet mut settings = Settings::clone_current();settings.set_snapshot_path("../snapshots");+ // Redact volatile env vars in metadata+ settings.add_redaction(".env.GIT_CONFIG_GLOBAL", "[TEST_GIT_CONFIG]");+ settings.add_redaction(".env.WORKTRUNK_CONFIG_PATH", "[TEST_CONFIG]");settings.bind(|| {let mut cmd = wt_command();@@ -36,8 +43,12 @@ fn test_init(#[case] shell: &str) {#[test]fn test_init_invalid_shell() {let repo = TestRepo::new();++ // Same custom settings as snapshot_initlet mut settings = Settings::clone_current();settings.set_snapshot_path("../snapshots");+ settings.add_redaction(".env.GIT_CONFIG_GLOBAL", "[TEST_GIT_CONFIG]");+ settings.add_redaction(".env.WORKTRUNK_CONFIG_PATH", "[TEST_CONFIG]");settings.bind(|| {let mut cmd = wt_command();diff --git a/tests/integration_tests/internal_flag.rs b/tests/integration_tests/internal_flag.rsindex faf61350e..3774acb8d 100644--- a/tests/integration_tests/internal_flag.rs+++ b/tests/integration_tests/internal_flag.rs@@ -5,8 +5,10 @@//! 2. Commands that DON'T emit directives work correctly with --internal//! 3. The --internal flag can be safely passed to all commands-use crate::common::{TestRepo, set_temp_home_env, setup_snapshot_settings_with_home, wt_command};-use insta::Settings;+use crate::common::{+ TestRepo, set_temp_home_env, setup_snapshot_settings, setup_snapshot_settings_with_home,+ wt_command,+};use insta_cmd::assert_cmd_snapshot;use std::fs;use tempfile::TempDir;@@ -25,11 +27,7 @@ fn test_list_with_internal_flag() {let repo = TestRepo::new();repo.commit("Initial commit");- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");- // Normalize temp directory paths- settings.add_filter(r"/private/var/folders/[^\s]+/test-repo", "[REPO]");- settings.add_filter(r"/tmp/\.tmp[^\s]+/test-repo", "[REPO]");+ let settings = setup_snapshot_settings(&repo);settings.bind(|| {let mut cmd = wt_command();diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rsindex a3368a078..4579b9e1a 100644--- a/tests/integration_tests/list.rs+++ b/tests/integration_tests/list.rs@@ -1,4 +1,4 @@-use crate::common::{TestRepo, list_snapshots, wt_command};+use crate::common::{TestRepo, list_snapshots, setup_snapshot_settings, wt_command};use insta::Settings;use insta_cmd::assert_cmd_snapshot;use std::path::Path;@@ -642,19 +642,10 @@ fn test_list_with_upstream_tracking() {repo.add_worktree("no-upstream", "no-upstream");// Run list --branches --full to show all columns including Remote- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");-- // Normalize paths- settings.add_filter(repo.root_path().to_str().unwrap(), "[REPO]");- for (name, path) in &repo.worktrees {- settings.add_filter(- path.to_str().unwrap(),- format!("[WORKTREE_{}]", name.to_uppercase().replace('-', "_")),- );- }+ let mut settings = setup_snapshot_settings(&repo);++ // Additional custom filterssettings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA] ");- settings.add_filter(r"\\", "/");settings.bind(|| {let mut cmd = wt_command();@@ -1165,7 +1156,9 @@ fn test_list_with_c_flag() {repo.add_worktree("feature-b", "feature-b");// Run wt -C <repo_path> list from a completely different directory- let settings = list_snapshots::standard_settings(&repo);+ let mut settings = list_snapshots::standard_settings(&repo);+ // Redact the -C path argument in metadata (try different selector formats)+ settings.add_redaction(".args[1]", "[REPO_PATH]");settings.bind(|| {let mut cmd = wt_command();cmd.args(["-C", repo.root_path().to_str().unwrap(), "list"]);diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 42aad47ff..b067efe52 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -794,9 +794,10 @@ fn test_merge_auto_commit_with_llm() {.expect("Failed to write file");// Configure mock LLM command via config file+ // Use /bin/echo to avoid PATH resolution issues in CI environmentslet worktrunk_config = r#"[commit-generation]-command = "echo"+command = "/bin/echo"args = ["fix: improve auth validation logic"]"#;fs::write(repo.test_config_path(), worktrunk_config).expect("Failed to write worktrunk config");@@ -819,9 +820,10 @@ fn test_merge_auto_commit_and_squash() {.expect("Failed to write file");// Configure mock LLM command via config file+ // Use /bin/echo to avoid PATH resolution issues in CI environmentslet worktrunk_config = r#"[commit-generation]-command = "echo"+command = "/bin/echo"args = ["fix: update file 1 content"]"#;fs::write(repo.test_config_path(), worktrunk_config).expect("Failed to write worktrunk config");diff --git a/tests/integration_tests/security.rs b/tests/integration_tests/security.rsindex e56329da8..22e1b6aea 100644--- a/tests/integration_tests/security.rs+++ b/tests/integration_tests/security.rs@@ -145,7 +145,7 @@//! For comprehensive security testing, see `tests/integration_tests/shell_wrapper.rs` which//! tests the full shell integration pipeline.-use crate::common::{TestRepo, wt_command};+use crate::common::{TestRepo, setup_snapshot_settings, wt_command};use insta::Settings;use insta_cmd::assert_cmd_snapshot;use std::process::Command;@@ -424,8 +424,7 @@ fn test_branch_name_with_cd_directive_not_executed() {return;}- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");+ let mut settings = setup_snapshot_settings(&repo);settings.add_filter(r"__WORKTRUNK_CD__[^\x00]+", "__WORKTRUNK_CD__[PATH]");settings.bind(|| {@@ -453,8 +452,7 @@ fn test_error_message_with_directive_not_executed() {// Try to switch to a non-existent branch with a name that looks like a directivelet malicious_branch = "__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6";- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");+ let settings = setup_snapshot_settings(&repo);settings.bind(|| {let mut cmd = wt_command();diff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snapindex 30111f284..0738be824 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snap@@ -1,17 +1,17 @@---source: tests/integration_tests/approvals.rs-assertion_line: 13info:program: wtargs:- - beta- - ask-approvals+ - config+ - approvals+ - askenv:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snapindex 602977cd0..4e66d45bd 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snap+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snap@@ -3,15 +3,16 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - beta- - ask-approvals+ - config+ - approvals+ - ask- "--force"env:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snapindex 7d271f7a5..0e1464b04 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snap@@ -3,18 +3,16 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - beta- - ask-approvals+ - config+ - approvals+ - askenv: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: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snapindex 68352831d..c84019e91 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap@@ -1,17 +1,17 @@---source: tests/integration_tests/approvals.rs-assertion_line: 22info:program: wtargs:- - beta- - clear-approvals+ - config+ - approvals+ - clearenv:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snapindex 6510e7664..04df3c0df 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap@@ -1,18 +1,18 @@---source: tests/integration_tests/approvals.rs-assertion_line: 22info:program: wtargs:- - beta- - clear-approvals+ - config+ - approvals+ - clear- "--global"env:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snapindex 98eb02a1a..90e7e548d 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap@@ -1,18 +1,18 @@---source: tests/integration_tests/approvals.rs-assertion_line: 23info:program: wtargs:- - beta- - clear-approvals+ - config+ - approvals+ - clear- "--global"env:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snapindex 68352831d..c84019e91 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap@@ -1,17 +1,17 @@---source: tests/integration_tests/approvals.rs-assertion_line: 22info:program: wtargs:- - beta- - clear-approvals+ - config+ - approvals+ - clearenv:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snapindex 68352831d..c84019e91 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap@@ -1,17 +1,17 @@---source: tests/integration_tests/approvals.rs-assertion_line: 22info:program: wtargs:- - beta- - clear-approvals+ - config+ - approvals+ - clearenv:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snapindex 68352831d..c84019e91 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap@@ -1,17 +1,17 @@---source: tests/integration_tests/approvals.rs-assertion_line: 22info:program: wtargs:- - beta- - clear-approvals+ - config+ - approvals+ - clearenv:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapsimilarity index 84%rename from tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snaprename to tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex 7ddf92e82..8b06da7ed 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap@@ -7,14 +7,14 @@ info:env:CLICOLOR_FORCE: ""COLUMNS: "150"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppkxcjs/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0diff --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 83ea919f5..7819b703e 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,21 +12,21 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxSX6HQ/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxSX6HQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-[107m [0m * [33m6551244[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)+[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)diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 23db25049..a5ba6a96c 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__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snapindex 0e0ae59b2..5d0c3050a 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap@@ -12,13 +12,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAJKcjf/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAJKcjf/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snapindex 155a43199..a17c8959b 100644--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap@@ -12,13 +12,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2zT6IL/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2zT6IL/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex 12bf91698..41a59e812 100644--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap@@ -12,13 +12,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpo6rxHm/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpo6rxHm/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snapindex 2290c9f13..40f982a79 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap@@ -10,13 +10,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpakZbbN/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpakZbbN/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex cf872f201..13d0df5ae 100644--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap@@ -4,7 +4,7 @@ info:program: wtargs:- "-C"- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN0POMq/test-repo+ - "[REPO_PATH]"- listenv:CLICOLOR_FORCE: "1"diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 49dcbef66..667ab6a19 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -11,14 +11,14 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHpd2b5/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: C- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHpd2b5/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHpd2b5/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0@@ -26,11 +26,11 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m-+ ahead [2m↑[0m[2m⇡[0m [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10mo[0m [2mAhead commit 2[0m-+ [2mbehind[0m [2m∅[0m [2m⇣[0m [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m-+ diverged [2m↑[0m[2m⇅[0m [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10mo[0m [2mDiverged local commit[0m-+ [2min-sync[0m [2m∅[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m-+ [2mno-upstream[0m [2m∅[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ ahead [2m↑[0m[2m⇡[0m [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [SHA] [2m10mo[0m [2mAhead commit 2[0m++ [2mbehind[0m [2m∅[0m [2m⇣[0m [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ diverged [2m↑[0m[2m⇅[0m [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [SHA] [2m10mo[0m [2mDiverged local commit[0m++ [2min-sync[0m [2m∅[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ [2mno-upstream[0m [2m∅[0m [2m./no-upstream[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m⚪ [2mShowing 6 worktrees, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snapindex 78e28e80e..55c87c31d 100644--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snapindex 78e28e80e..55c87c31d 100644--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snapindex 6f7d94b17..4c0413bf9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap@@ -9,7 +9,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --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 b9737d6b6..18d2b6032 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@@ -26,11 +26,11 @@ exit_code: 0🔄 [36mGenerating squash commit message...[0m[107m [0m [1mfix: update file 1 content[0m✅ [32mSquashed @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)+[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m fix: update file 1 content✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 15f4a3f92..078e2bf36 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@@ -30,10 +30,10 @@ exit_code: 0[107m [0m Combined commits:[107m [0m - feat: initial feature✅ [32mSquashed @ [2m[SHA][0m-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[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 [1m[36mfeature[0m[36m worktree & branch in background[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 e27ef3016..dda8a541d 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@@ -26,10 +26,10 @@ exit_code: 0🔄 [36mGenerating squash commit message...[0m[107m [0m [1mfix: improve auth validation logic[0m✅ [32mSquashed @ [2m[SHA][0m-[107m [0m auth.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m fix: improve auth validation logic+[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 [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snapindex 67b25f328..4c0413bf9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap@@ -9,15 +9,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: "[TEST_GIT_CONFIG]"GIT_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/.tmprsBxfk/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0diff --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 80d7bb0a2..791b4cfff 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@@ -27,10 +27,10 @@ exit_code: 0💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to dirty.txt[0m✅ [32mCommitted changes @ [2m[SHA][0m-[107m [0m dirty.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[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 [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snapindex 609b5e8e9..392582820 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --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 2a9a88cd9..7c8d9442b 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@@ -27,10 +27,10 @@ exit_code: 0💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to newfile.txt[0m✅ [32mCommitted changes @ [2m[SHA][0m-[107m [0m newfile.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[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 [1m[36mno-commits-dirty[0m[36m worktree & branch in background[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 ebe9f8ee1..10889322a 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@@ -30,10 +30,10 @@ exit_code: 0💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to feature.txt[0m✅ [32mCommitted changes @ [2m[SHA][0m-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[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 [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex 0a0e965f7..68a4ece25 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -11,7 +11,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 0fa6505ca..7dd8dea86 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -31,12 +31,12 @@ exit_code: 0[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)+[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(+)-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 18b4d932c..510f4622f 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@@ -31,11 +31,11 @@ exit_code: 0[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)+[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(+)-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 3f0fd00dd..cbeba5529 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@@ -25,10 +25,10 @@ exit_code: 0🔄 [36mGenerating squash commit message...[0m[107m [0m [1mfeat: implement user authentication system[0m✅ [32mSquashed @ [2m[SHA][0m-[107m [0m auth.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: implement user authentication system+[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 [1m[36mfeature[0m[36m worktree & branch in background[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 3a09d99a3..b0ffdd7e4 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@@ -33,11 +33,11 @@ exit_code: 0[107m [0m - feat: add file 1[107m [0m - feat: add file 2✅ [32mSquashed @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)+[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(+)-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 36a3fcedb..aef2f1cb6 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@@ -35,12 +35,12 @@ exit_code: 0[107m [0m Combined commits:[107m [0m - feat: add file 1✅ [32mSquashed @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)+[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(+)-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main✅ [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex d2c22d54b..32f6c77e4 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -35,16 +35,16 @@ exit_code: 0[107m [0m - Add JWT encoding/decoding with signature verification[107m [0m - Create test suite covering all authentication flows✅ [32mSquashed @ [2m[SHA][0m-[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(+)🔄 [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [1m[34mcargo[0m test[0m🔄 [36mRunning pre-merge [1mlint[0m:[0m[107m [0m [1m[34mcargo[0m clippy[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[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 [1m[36mfeature-auth[0m[36m worktree & branch in background[0m🔄 [36mRunning post-merge [1minstall[0m:[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 54fa752c7..ba0b7de04 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@@ -30,15 +30,15 @@ exit_code: 0[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.✅ [32mSquashed @ [2m[SHA][0m-[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m-[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m-[107m [0m 2 files changed, 45 insertions(+)🔄 [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [1m[34muv[0m run pytest[0m🔄 [36mRunning pre-merge [1mlint[0m:[0m[107m [0m [1m[34muv[0m run ruff check[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[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 [1m[36mfeature-auth[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snapindex 028acde84..66d17693f 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.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: Cdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snapindex 157107da8..d165de690 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.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: Cdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snapindex 0e6d9ecf1..15f3f30f6 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.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: Cdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snapindex b5a57939a..c57a1cc2f 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snapindex 758a330a4..87dbba4d7 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snapindex e47f684f9..f29bbfe5d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snapindex f72665e49..26610c532 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex af159e6ce..967b0688e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex 5875546da..4fe945e95 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snapindex cd62ecda9..562fa66cc 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snapindex e7127c8cf..7d92ecf43 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap@@ -9,7 +9,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex cde2208df..5a390d9de 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 1b1507da2..d727ae606 100644Binary files a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap and b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap differdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex e99915185..54e1b446e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex 9bdd5fbad..617588735 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snapindex ad5b1023a..e0e229db7 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.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: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snapindex 436159512..166daa8b3 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snapindex 2231cd2a4..9010799af 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_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: Cdiff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snapindex 74710e832..1488c286e 100644--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap@@ -12,7 +12,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --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 b5eb13e13..2dc7c0334 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,13 +11,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwwZ5t3/test-gitconfig+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwwZ5t3/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: falseexit_code: 1diff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snapindex fdd307014..d638e0d21 100644--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snapindex 0ea00d5f8..48ebd75fb 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snapindex a7664323b..11e107c80 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap@@ -11,7 +11,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex a8029ee8c..60913bfc0 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snapindex cb6a78a70..63dec366a 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex d7edbcae3..10aabd3e6 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snapindex 202e41c3a..7d8adf930 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snapindex 7a8a616c5..50dc5e4da 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex 309170647..269f16d24 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snapindex 094635b6b..1e92fbef1 100644Binary files a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap and b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap differdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snapindex a5e682fe1..a002f6acf 100644Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap differdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snapindex 003307196..443ad469c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snapindex 72d710bf1..ece35b053 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snapindex a8ee16df9..32c772f89 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap@@ -14,7 +14,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snapindex 57fb84569..335717b97 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap@@ -13,7 +13,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snapindex d365e0120..bf17d4411 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap@@ -12,7 +12,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""HOME: "[TEST_HOME]"diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snapindex a85e335e4..194cae4b1 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap@@ -13,7 +13,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""HOME: "[TEST_HOME]"diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snapindex fb60f121d..ab31982ca 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snapindex 72d710bf1..ece35b053 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snapindex 0f977566e..c29a6fac7 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap@@ -10,7 +10,7 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""LANG: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snapindex 6d07b7c4c..d942dd0f8 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snapindex f16c83ead..f9e7159b5 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snapindex 7ffdbf45e..395dfbe6b 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snapindex 435074881..02702660e 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snapindex 999087513..6104df9ec 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snapindex eae8bb4ea..7efea4d74 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_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: Cdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex 92933b67c..cacb25eba 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.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