Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Feat: Improve CLI output with new message types and styling
Maximilian Roos9bf94c4e2fb4
diff --git a/CLAUDE.md b/CLAUDE.mdindex 2ee7f40cc..ce4d40901 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -14,11 +14,13 @@ All styling uses the **anstyle ecosystem** for composable, auto-detecting termin### Message Types-Three canonical message patterns with their emojis:+Five canonical message patterns with their emojis:-1. **Errors**: β + red text-2. **Warnings**: π‘ + yellow text-3. **Hints**: π‘ + dimmed text+1. **Progress**: π + cyan text (operations in progress)+2. **Success**: β + green text (successful completion)+3. **Errors**: β + red text (failures, invalid states)+4. **Warnings**: π‘ + yellow text (non-blocking issues)+5. **Hints**: π‘ + dimmed text (helpful suggestions)### Semantic Style Constants@@ -42,9 +44,18 @@ Three canonical message patterns with their emojis:Use anstyle's inline pattern `{style}text{style:#}` where `#` means reset:```rust-use worktrunk::styling::{eprintln, println, ERROR, ERROR_EMOJI, WARNING, WARNING_EMOJI, HINT, HINT_EMOJI};+use worktrunk::styling::{eprintln, println, ERROR, ERROR_EMOJI, WARNING, WARNING_EMOJI, HINT, HINT_EMOJI, AnstyleStyle};+use anstyle::{AnsiColor, Color};-// Simple error+// Progress+let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+println!("π {cyan}Rebasing onto main...{cyan:#}");++// Success+let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+println!("β {green}Pushed to main{green:#}");++// Erroreprintln!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");// Warningdiff --git a/src/commands/merge.rs b/src/commands/merge.rsindex a84078090..f134b580f 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -1,6 +1,7 @@+use anstyle::{AnsiColor, Color};use worktrunk::config::WorktrunkConfig;use worktrunk::git::{GitError, Repository};-use worktrunk::styling::{AnstyleStyle, ERROR, ERROR_EMOJI, println};+use worktrunk::styling::{AnstyleStyle, ERROR, ERROR_EMOJI, HINT, HINT_EMOJI, eprintln, println};use super::worktree::handle_push;use super::worktree::handle_remove;@@ -15,9 +16,10 @@ pub fn handle_merge(// Get current branchlet current_branch = repo.current_branch()?.ok_or_else(|| {- GitError::CommandFailed(format!(- "{ERROR_EMOJI} {ERROR}Not on a branch (detached HEAD){ERROR:#}"- ))+ eprintln!("{ERROR_EMOJI} {ERROR}Not on a branch (detached HEAD){ERROR:#}");+ eprintln!();+ eprintln!("{HINT_EMOJI} {HINT}You are in detached HEAD state{HINT:#}");+ GitError::CommandFailed(String::new())})?;// Get target branch (default to default branch if not provided)@@ -25,8 +27,11 @@ pub fn handle_merge(// Check if already on target branchif current_branch == target_branch {- let bold = AnstyleStyle::new().bold();- println!("Already on {bold}{target_branch}{bold:#}, nothing to merge");+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ println!(+ "β {green}Already on {green_bold}{target_branch}{green_bold:#}, nothing to merge{green:#}"+ );return Ok(());}@@ -39,20 +44,21 @@ pub fn handle_merge(}// Rebase onto target- let bold = AnstyleStyle::new().bold();- println!("Rebasing onto {bold}{target_branch}{bold:#}...");+ let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+ let cyan_bold = cyan.bold();+ println!("π {cyan}Rebasing onto {cyan_bold}{target_branch}{cyan_bold:#}...{cyan:#}");repo.run_command(&["rebase", &target_branch]).map_err(|e| {GitError::CommandFailed(format!("Failed to rebase onto '{}': {}", target_branch, e))})?;// Fast-forward push to target branch (reuse handle_push logic)- println!("Fast-forwarding {bold}{target_branch}{bold:#} to current HEAD...");handle_push(Some(&target_branch), false)?;// Finish worktree unless --keep was specifiedif !keep {- println!("Cleaning up worktree...");+ let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+ println!("π {cyan}Cleaning up worktree...{cyan:#}");// Get primary worktree path before finishing (while we can still run git commands)let primary_worktree_dir = repo.repo_root()?;@@ -72,8 +78,9 @@ pub fn handle_merge(let primary_repo = Repository::at(&primary_worktree_dir);let new_branch = primary_repo.current_branch()?;if new_branch.as_deref() != Some(&target_branch) {- let bold = AnstyleStyle::new().bold();- println!("Switching to {bold}{target_branch}{bold:#}...");+ let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+ let cyan_bold = cyan.bold();+ println!("π {cyan}Switching to {cyan_bold}{target_branch}{cyan_bold:#}...{cyan:#}");primary_repo.run_command(&["switch", &target_branch]).map_err(|e| {@@ -84,8 +91,11 @@ pub fn handle_merge(})?;}} else {- let bold = AnstyleStyle::new().bold();- println!("Successfully merged to {bold}{target_branch}{bold:#} (worktree preserved)");+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ println!(+ "β {green}Successfully merged to {green_bold}{target_branch}{green_bold:#} (worktree preserved){green:#}"+ );}Ok(())@@ -106,26 +116,34 @@ fn handle_squash(target_branch: &str) -> Result<(), GitError> {// Handle different scenariosif commit_count == 0 && !has_staged {// No commits and no staged changes - nothing to squash- println!("No commits to squash - already at merge base");+ let dim = AnstyleStyle::new().dimmed();+ println!("{dim}No commits to squash - already at merge base{dim:#}");return Ok(());}if commit_count == 0 && has_staged {// Just staged changes, no commits - would need to commit but this shouldn't happen in merge flow- return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} {ERROR}Staged changes without commits - please commit them first{ERROR:#}"- )));+ eprintln!("{ERROR_EMOJI} {ERROR}Staged changes without commits{ERROR:#}");+ eprintln!();+ eprintln!("{HINT_EMOJI} {HINT}Please commit them first{HINT:#}");+ return Err(GitError::CommandFailed(String::new()));}if commit_count == 1 && !has_staged {// Single commit, no staged changes - nothing to do- let bold = AnstyleStyle::new().bold();- println!("Only 1 commit since {bold}{target_branch}{bold:#} - no squashing needed");+ let cyan_bold = AnstyleStyle::new()+ .fg_color(Some(Color::Ansi(AnsiColor::Cyan)))+ .bold();+ let dim = AnstyleStyle::new().dimmed();+ println!(+ "{dim}Only 1 commit since {cyan_bold}{target_branch}{cyan_bold:#} - no squashing needed{dim:#}"+ );return Ok(());}// One or more commits (possibly with staged changes) - squash them- println!("Squashing {} commits into one...", commit_count);+ let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+ println!("π {cyan}Squashing {commit_count} commits into one...{cyan:#}");// Get commit subjects for the squash messagelet range = format!("{}..HEAD", merge_base);@@ -144,6 +162,7 @@ fn handle_squash(target_branch: &str) -> Result<(), GitError> {repo.run_command(&["commit", "-m", &commit_message]).map_err(|e| GitError::CommandFailed(format!("Failed to create squash commit: {}", e)))?;- println!("Successfully squashed {} commits into one", commit_count);+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ println!("β {green}Squashed {commit_count} commits into one{green:#}");Ok(())}diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 7dac0bff6..a618403c2 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -103,21 +103,33 @@ pub enum SwitchResult {impl SwitchResult {/// Format the result for display (non-internal mode)pub fn format_user_output(&self, branch: &str) -> Option<String> {+ use anstyle::{AnsiColor, Color};+match self {- SwitchResult::ExistingWorktree(_) => None,+ SwitchResult::ExistingWorktree(_path) => {+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ Some(format!(+ "β {green}Switched to worktree for {green_bold}{branch}{green_bold:#}{green:#}\n\n{}",+ shell_integration_hint()+ ))+ }SwitchResult::CreatedWorktree {path,created_branch,} => {- let bold = AnstyleStyle::new().bold();+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ let dim = AnstyleStyle::new().dimmed();+let msg = if *created_branch {format!(- "Created new branch and worktree for {bold}{branch}{bold:#} at {}",+ "β {green}Created new worktree for {green_bold}{branch}{green_bold:#}{green:#}\n {dim}Path: {}{dim:#}",path.display())} else {format!(- "Added worktree for existing branch {bold}{branch}{bold:#} at {}",+ "β {green}Added worktree for {green_bold}{branch}{green_bold:#}{green:#}\n {dim}Path: {}{dim:#}",path.display())};@@ -129,26 +141,34 @@ impl SwitchResult {/// Format the result for shell integration (internal mode)pub fn format_internal_output(&self, branch: &str) -> Option<String> {+ use anstyle::{AnsiColor, Color};+match self {SwitchResult::ExistingWorktree(path) => {- Some(format!("__WORKTRUNK_CD__{}", path.display()))+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ Some(format!(+ "__WORKTRUNK_CD__{}\nβ {green}Switched to worktree for {green_bold}{branch}{green_bold:#}{green:#}",+ path.display()+ ))}SwitchResult::CreatedWorktree {path,created_branch,} => {- let bold = AnstyleStyle::new().bold();+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+let msg = if *created_branch {- format!("Created new branch and worktree for {bold}{branch}{bold:#}")+ format!(+ "β {green}Created new worktree for {green_bold}{branch}{green_bold:#}{green:#}"+ )} else {- format!("Added worktree for existing branch {bold}{branch}{bold:#}")+ format!(+ "β {green}Added worktree for {green_bold}{branch}{green_bold:#}{green:#}"+ )};- Some(format!(- "__WORKTRUNK_CD__{}\n{} at {}",- path.display(),- msg,- path.display()- ))+ Some(format!("__WORKTRUNK_CD__{}\n{}", path.display(), msg))}}}@@ -167,28 +187,46 @@ pub enum RemoveResult {impl RemoveResult {/// Format the result for display (non-internal mode)pub fn format_user_output(&self) -> Option<String> {+ use anstyle::{AnsiColor, Color};+match self {RemoveResult::AlreadyOnDefault(branch) => {- let bold = AnstyleStyle::new().bold();- Some(format!("Already on default branch {bold}{branch}{bold:#}"))+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ Some(format!(+ "β {green}Already on default branch {green_bold}{branch}{green_bold:#}{green:#}"+ ))+ }+ RemoveResult::RemovedWorktree { primary_path } => {+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let dim = AnstyleStyle::new().dimmed();+ Some(format!(+ "β {green}Removed worktree and returned to primary{green:#}\n {dim}Path: {}{dim:#}\n\nTo enable automatic cd, run: wt configure-shell",+ primary_path.display()+ ))}- RemoveResult::RemovedWorktree { primary_path } => Some(format!(- "Moved to primary worktree and removed worktree\nPath: {}\n\nTo enable automatic cd, run: wt configure-shell",- primary_path.display()- )),RemoveResult::SwitchedToDefault(branch) => {- let bold = AnstyleStyle::new().bold();- Some(format!("Switched to default branch {bold}{branch}{bold:#}"))+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ Some(format!(+ "β {green}Switched to default branch {green_bold}{branch}{green_bold:#}{green:#}"+ ))}}}/// Format the result for shell integration (internal mode)pub fn format_internal_output(&self) -> Option<String> {+ use anstyle::{AnsiColor, Color};+match self {RemoveResult::AlreadyOnDefault(_) => None,RemoveResult::RemovedWorktree { primary_path } => {- Some(format!("__WORKTRUNK_CD__{}", primary_path.display()))+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ Some(format!(+ "__WORKTRUNK_CD__{}\nβ {green}Removed worktree and returned to primary{green:#}",+ primary_path.display()+ ))}RemoveResult::SwitchedToDefault(_) => None,}@@ -207,9 +245,12 @@ pub fn handle_switch(// Check for conflicting conditionsif create && repo.branch_exists(branch)? {let error_bold = ERROR.bold();- return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} Branch '{error_bold}{branch}{error_bold:#}' already exists. Remove --create flag to switch to it."- )));+ eprintln!(+ "{ERROR_EMOJI} {ERROR}Branch {error_bold}{branch}{error_bold:#} already exists{ERROR:#}"+ );+ eprintln!();+ eprintln!("{HINT_EMOJI} {HINT}Remove --create flag to switch to it{HINT:#}");+ return Err(GitError::CommandFailed(String::new()));}// Check if base flag was provided without create flag@@ -231,9 +272,12 @@ pub fn handle_switch(}Some(_) => {let error_bold = ERROR.bold();- return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} Worktree directory missing for '{error_bold}{branch}{error_bold:#}'. Run 'git worktree prune' to clean up."- )));+ eprintln!(+ "{ERROR_EMOJI} {ERROR}Worktree directory missing for {error_bold}{branch}{error_bold:#}{ERROR:#}"+ );+ eprintln!();+ eprintln!("{HINT_EMOJI} {HINT}Run 'git worktree prune' to clean up{HINT:#}");+ return Err(GitError::CommandFailed(String::new()));}None => {}}@@ -403,13 +447,17 @@ fn check_worktree_conflicts(if !overlapping.is_empty() {eprintln!("{ERROR_EMOJI} {ERROR}Cannot push: conflicting uncommitted changes in:{ERROR:#}");+ eprintln!();+ let dim = AnstyleStyle::new().dimmed();for file in &overlapping {- eprintln!(" - {}", file);+ eprintln!(" {dim}β’{dim:#} {}", file);}- return Err(GitError::CommandFailed(format!(- "Commit or stash changes in {} first",+ eprintln!();+ eprintln!(+ "{HINT_EMOJI} {HINT}Commit or stash these changes in {} first{HINT:#}",wt_path.display()- )));+ );+ return Err(GitError::CommandFailed(String::new()));}Ok(())@@ -477,8 +525,10 @@ fn execute_post_start_commands("{WARNING_EMOJI} {WARNING}Failed to load project config from {}{WARNING:#}",config_path.display());- eprintln!("Error: {}", e);- eprintln!("Skipping post-start commands. Check TOML syntax if file exists.");+ eprintln!("{HINT_EMOJI} {HINT}Error details: {e}{HINT:#}");+ eprintln!(+ "{HINT_EMOJI} {HINT}Skipping post-start commands. Check TOML syntax if file exists.{HINT:#}"+ );return Ok(());}};@@ -521,7 +571,8 @@ fn execute_post_start_commands(true}Ok(false) => {- eprintln!("Skipping command: {}", command);+ let dim = AnstyleStyle::new().dimmed();+ eprintln!("{dim}Skipping command: {command}{dim:#}");false}Err(e) => {@@ -536,7 +587,9 @@ fn execute_post_start_commands(let expanded_command =expand_command_template(command, repo_name, branch, worktree_path, &repo_root);- eprintln!("Executing: {}", expanded_command);+ use anstyle::{AnsiColor, Color};+ let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+ eprintln!("π {cyan}Executing: {expanded_command}{cyan:#}");if let Err(e) = execute_command_in_worktree(worktree_path, &expanded_command) {eprintln!("{WARNING_EMOJI} {WARNING}Command failed: {e}{WARNING:#}");// Continue with other commands even if one fails@@ -548,6 +601,8 @@ fn execute_post_start_commands(}pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<(), GitError> {+ use anstyle::{AnsiColor, Color};+let repo = Repository::current();// Get target branch (default to default branch if not provided)@@ -556,23 +611,25 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()// Check if it's a fast-forwardif !repo.is_ancestor(&target_branch, "HEAD")? {let error_bold = ERROR.bold();- let error_msg = format!(- "{ERROR_EMOJI} Not a fast-forward from '{error_bold}{target_branch}{error_bold:#}' to HEAD"+ eprintln!(+ "{ERROR_EMOJI} {ERROR}Not a fast-forward from {error_bold}{target_branch}{error_bold:#} to HEAD{ERROR:#}");- let hint_msg = format!(- "{HINT_EMOJI} {HINT}The target branch has commits not in your current branch. Consider 'git pull' or 'git rebase'{HINT:#}"+ eprintln!();+ eprintln!(+ "{HINT_EMOJI} {HINT}The target branch has commits not in your current branch{HINT:#}");- return Err(GitError::CommandFailed(format!(- "{}\n{}",- error_msg, hint_msg- )));+ eprintln!("{HINT_EMOJI} {HINT}Consider: git pull or git rebase{HINT:#}");+ return Err(GitError::CommandFailed(String::new()));}// Check for merge commits unless allowedif !allow_merge_commits && repo.has_merge_commits(&target_branch, "HEAD")? {- return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} {ERROR}Found merge commits in push range. Use --allow-merge-commits to push non-linear history.{ERROR:#}"- )));+ eprintln!("{ERROR_EMOJI} {ERROR}Found merge commits in push range{ERROR:#}");+ eprintln!();+ eprintln!(+ "{HINT_EMOJI} {HINT}Use --allow-merge-commits to push non-linear history{HINT:#}"+ );+ return Err(GitError::CommandFailed(String::new()));}// Configure receive.denyCurrentBranch if needed@@ -585,7 +642,7 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()let target_worktree = repo.worktree_for_branch(&target_branch)?;check_worktree_conflicts(&repo, &target_worktree, &target_branch)?;- // Count commits and show info+ // Count commits and show what will be pushedlet commit_count = repo.count_commits(&target_branch, "HEAD")?;if commit_count > 0 {let commit_text = if commit_count == 1 {@@ -593,8 +650,27 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()} else {"commits"};- let bold = AnstyleStyle::new().bold();- println!("Pushing {commit_count} {commit_text} to {bold}{target_branch}{bold:#}");+ let head_sha = repo.run_command(&["rev-parse", "--short", "HEAD"])?;+ let head_sha = head_sha.trim();++ let cyan = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));+ let cyan_bold = cyan.bold();++ println!(+ "π {cyan}Pushing {commit_count} {commit_text} to {cyan_bold}{target_branch}{cyan_bold:#} @ {head_sha}{cyan:#}"+ );+ println!();++ // Show the commit graph+ let log_output = repo.run_command(&[+ "log",+ "--graph",+ "--oneline",+ "--decorate",+ &format!("{}..HEAD", target_branch),+ ])?;+ println!("{}", log_output.trim());+ println!();}// Get git common dir for the push@@ -603,9 +679,12 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()// Perform the pushlet push_target = format!("HEAD:{}", target_branch);repo.run_command(&["push", git_common_dir.to_str().unwrap(), &push_target])- .map_err(|e| GitError::CommandFailed(format!("Push failed: {}", e)))?;+ .map_err(|e| {+ GitError::CommandFailed(format!("{ERROR_EMOJI} {ERROR}Push failed: {e}{ERROR:#}"))+ })?;- let bold = AnstyleStyle::new().bold();- println!("Successfully pushed to {bold}{target_branch}{bold:#}");+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ println!("β {green}Pushed to {green_bold}{target_branch}{green_bold:#}{green:#}");Ok(())}diff --git a/src/git.rs b/src/git.rsindex ee704faf8..64098afb0 100644--- a/src/git.rs+++ b/src/git.rs@@ -183,10 +183,11 @@ impl Repository {/// Returns an error if there are uncommitted changes.pub fn ensure_clean_working_tree(&self) -> Result<(), GitError> {if self.is_dirty()? {- use crate::styling::{ERROR, ERROR_EMOJI};- return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes. Commit or stash them first.{ERROR:#}"- )));+ use crate::styling::{ERROR, ERROR_EMOJI, HINT, HINT_EMOJI, eprintln};+ eprintln!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");+ eprintln!();+ eprintln!("{HINT_EMOJI} {HINT}Commit or stash them first{HINT:#}");+ return Err(GitError::CommandFailed(String::new()));}Ok(())}diff --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 f35bec46a..cea1d7708 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@@ -18,6 +18,6 @@ info:success: trueexit_code: 0----- stdout ------Already on [1mmain[0m, nothing to merge+β [32mAlready on [1m[32mmain[0m, nothing to merge[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex c0cad5f4d..769925f1b 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@@ -21,4 +21,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mWorking tree has uncommitted changes. Commit or stash them first.[0m+β [31mWorking tree has uncommitted changes[0m++π‘ [2mCommit or stash them first[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 452848f9a..636a6ab54 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@@ -22,3 +22,5 @@ exit_code: 1----- stderr -----β [31mNot on a branch (detached HEAD)[0m++π‘ [2mYou are in detached HEAD state[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 3e83ba151..01cd2751a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -19,13 +19,15 @@ info:success: trueexit_code: 0----- stdout ------Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add feature file++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --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 3e83ba151..01cd2751a 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@@ -19,13 +19,15 @@ info:success: trueexit_code: 0----- stdout ------Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add feature file++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 07b409982..4108fc21f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -20,15 +20,17 @@ info:success: trueexit_code: 0----- stdout ------Squashing 3 commits into one...-Successfully squashed 3 commits into one-Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+π [36mSquashing 3 commits into one...[0m+β [32mSquashed 3 commits into one[0m+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Squash commits from main++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --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 b4b108bde..f9c74f478 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@@ -21,15 +21,17 @@ info:success: trueexit_code: 0----- stdout ------Squashing 2 commits into one...-Successfully squashed 2 commits into one-Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+π [36mSquashing 2 commits into one...[0m+β [32mSquashed 2 commits into one[0m+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Squash commits from main++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --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 582654fca..79a49b668 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@@ -20,14 +20,16 @@ info:success: trueexit_code: 0----- stdout ------Only 1 commit since [1mmain[0m - no squashing needed-Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+[2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0m+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) feat: single commit++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --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 7784479c4..825e4071e 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@@ -22,15 +22,17 @@ info:success: trueexit_code: 0----- stdout ------Squashing 2 commits into one...-Successfully squashed 2 commits into one-Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+π [36mSquashing 2 commits into one...[0m+β [32mSquashed 2 commits into one[0m+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Squash commits from main++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 84da2e241..a1365b0cf 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -18,13 +18,15 @@ info:success: trueexit_code: 0----- stdout ------Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Cleaning up worktree...-Moved to primary worktree and removed worktree-Path: [REPO]+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add feature file++β [32mPushed to [1m[32mmain[0m[0m+π [36mCleaning up worktree...[0m+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 4b54fc050..9a6c66e71 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -20,10 +20,12 @@ info:success: trueexit_code: 0----- stdout ------Rebasing onto [1mmain[0m...-Fast-forwarding [1mmain[0m to current HEAD...-Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m-Successfully merged to [1mmain[0m (worktree preserved)+π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add feature file++β [32mPushed to [1m[32mmain[0m[0m+β [32mSuccessfully merged to [1m[32mmain[0m (worktree preserved)[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_empty_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_empty_array.snapindex 7d4ea537f..8c438a5fb 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_empty_array.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_empty_array.snap@@ -20,7 +20,8 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature[0m at [REPO].feature+β [32mCreated new worktree for [1m[32mfeature[0m[0m+ [2mPath: [REPO].feature[0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_failing_command.snapindex d70389080..6f33837ab 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_failing_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_failing_command.snap@@ -13,6 +13,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUmUbSmLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -20,10 +21,11 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature[0m at [REPO].feature+β [32mCreated new worktree for [1m[32mfeature[0m[0m+ [2mPath: [REPO].feature[0mTo enable automatic cd, run: wt configure-shell----- stderr ------Executing: exit 1+π [36mExecuting: exit 1[0mπ‘ [33mCommand failed: Command 'exit 1' failed with exit code 1[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_toml.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_toml.snapindex 37de9c630..64c63a665 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_toml.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_toml.snap@@ -20,16 +20,17 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature[0m at [REPO].feature+β [32mCreated new worktree for [1m[32mfeature[0m[0m+ [2mPath: [REPO].feature[0mTo enable automatic cd, run: wt configure-shell----- stderr -----π‘ [33mFailed to load project config from [REPO]/.config/wt.toml[0m-Error: TOML parse error at line 1, column 39+π‘ [2mError details: TOML parse error at line 1, column 39|1 | post-start-commands = [invalid syntax| ^unclosed array, expected `]`- in .config/wt.toml-Skipping post-start commands. Check TOML syntax if file exists.+ in .config/wt.toml[0m+π‘ [2mSkipping post-start commands. Check TOML syntax if file exists.[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_commands.snapindex aec39a194..c39f47f06 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_commands.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_commands.snap@@ -13,6 +13,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwTEnNdLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -22,10 +23,11 @@ exit_code: 0----- stdout -----FirstSecond-Created new branch and worktree for [1mfeature[0m at [REPO].feature+β [32mCreated new worktree for [1m[32mfeature[0m[0m+ [2mPath: [REPO].feature[0mTo enable automatic cd, run: wt configure-shell----- stderr ------Executing: echo 'First'-Executing: echo 'Second'+π [36mExecuting: echo 'First'[0m+π [36mExecuting: echo 'Second'[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_no_config.snapindex 7d4ea537f..8c438a5fb 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_no_config.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_no_config.snap@@ -20,7 +20,8 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature[0m at [REPO].feature+β [32mCreated new worktree for [1m[32mfeature[0m[0m+ [2mPath: [REPO].feature[0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_template_expansion.snapindex 40651000d..961764fce 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_template_expansion.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_template_expansion.snap@@ -13,6 +13,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIvjDOuLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -20,12 +21,13 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature/test[0m at [REPO].feature-test+β [32mCreated new worktree for [1m[32mfeature/test[0m[0m+ [2mPath: [REPO].feature-test[0mTo enable automatic cd, run: wt configure-shell----- stderr ------Executing: echo 'Repo: main' > info.txt-Executing: echo 'Branch: feature-test' >> info.txt-Executing: echo 'Worktree: [REPO].feature-test' >> info.txt-Executing: echo 'Root: [REPO]' >> info.txt+π [36mExecuting: echo 'Repo: main' > info.txt[0m+π [36mExecuting: echo 'Branch: feature-test' >> info.txt[0m+π [36mExecuting: echo 'Worktree: [REPO].feature-test' >> info.txt[0m+π [36mExecuting: echo 'Root: [REPO]' >> info.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_with_approval.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_with_approval.snapindex e7d6bcf07..fa4951199 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_with_approval.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_with_approval.snap@@ -13,6 +13,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpo8Mro1LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -21,9 +22,10 @@ success: trueexit_code: 0----- stdout -----Setup complete-Created new branch and worktree for [1mfeature[0m at [REPO].feature+β [32mCreated new worktree for [1m[32mfeature[0m[0m+ [2mPath: [REPO].feature[0mTo enable automatic cd, run: wt configure-shell----- stderr ------Executing: echo 'Setup complete'+π [36mExecuting: echo 'Setup complete'[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target.snapindex 3012fc04e..b71b31ca5 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap@@ -22,5 +22,7 @@ exit_code: 1----- stderr -----β [31mCannot push: conflicting uncommitted changes in:[0m- - conflict.txt-Commit or stash changes in [REPO] first++ [2mβ’[0m conflict.txt++π‘ [2mCommit or stash these changes in [REPO] first[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex 27a518a85..d2be83cdd 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap@@ -21,5 +21,7 @@ exit_code: 1----- stdout ---------- stderr ------β Not a fast-forward from '[1m[31mmain[0m' to HEAD-π‘ [2mThe target branch has commits not in your current branch. Consider 'git pull' or 'git rebase'[0m+β [31mNot a fast-forward from [1m[31mmain[0m to HEAD[0m++π‘ [2mThe target branch has commits not in your current branch[0m+π‘ [2mConsider: git pull or git rebase[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snapindex edf78ca94..529f67936 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap@@ -21,4 +21,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mFound merge commits in push range. Use --allow-merge-commits to push non-linear history.[0m+β [31mFound merge commits in push range[0m++π‘ [2mUse --allow-merge-commits to push non-linear history[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 18aaa1f03..4a842910c 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -19,7 +19,10 @@ info:success: trueexit_code: 0----- stdout ------Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add test file++β [32mPushed to [1m[32mmain[0m[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 18aaa1f03..b5e196edb 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@@ -19,7 +19,10 @@ info:success: trueexit_code: 0----- stdout ------Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add feature file++β [32mPushed to [1m[32mmain[0m[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 c3bfd30e7..8b6122af4 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -18,7 +18,10 @@ info:success: trueexit_code: 0----- stdout ------Pushing 1 commit to [1mmain[0m-Successfully pushed to [1mmain[0m+π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m++* [SHA] (HEAD -> feature) Add feature file++β [32mPushed to [1m[32mmain[0m[0m----- stderr -----diff --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 b25ffe3f9..dac8e8361 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@@ -18,6 +18,6 @@ info:success: trueexit_code: 0----- stdout ------Already on default branch [1mmain[0m+β [32mAlready on default branch [1m[32mmain[0m[0m----- stderr -----diff --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 b731f2e36..c6385bc19 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@@ -20,4 +20,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mWorking tree has uncommitted changes. Commit or stash them first.[0m+β [31mWorking tree has uncommitted changes[0m++π‘ [2mCommit or stash them first[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 559564c6d..19e72d14a 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -18,8 +18,8 @@ info:success: trueexit_code: 0----- stdout ------Moved to primary worktree and removed worktree-Path: [REPO]+β [32mRemoved worktree and returned to primary[0m+ [2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 947918e0e..b93f8f7ab 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -1,11 +1,12 @@----source: tests/integration_tests/finish.rs+source: tests/integration_tests/remove.rsinfo:program: wtargs:- - finish+ - remove- "--internal"env:+ CLICOLOR_FORCE: "1"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -19,5 +20,6 @@ success: trueexit_code: 0----- stdout -----__WORKTRUNK_CD__[REPO]+β [32mRemoved worktree and returned to primary[0m----- stderr -----diff --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 44bc84681..09cfca0a5 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@@ -18,6 +18,6 @@ info:success: trueexit_code: 0----- stdout ------Switched to default branch [1mmain[0m+β [32mSwitched to default branch [1m[32mmain[0m[0m----- stderr -----diff --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 e30fe2759..edb3507bf 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@@ -21,6 +21,11 @@ info:success: trueexit_code: 0----- stdout -----+β [32mSwitched to worktree for [1m[32mmain[0m[0m++++To enable automatic cd, run: wt configure-shell----- stderr -----π‘ [33m--base flag is only used with --create, ignoring[0mdiff --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 38b9d7db6..8f03e650f 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@@ -22,4 +22,6 @@ exit_code: 1----- stdout ---------- stderr ------β Branch '[1m[31mfeature-y[0m' already exists. Remove --create flag to switch to it.+β [31mBranch [1m[31mfeature-y[0m already exists[0m++π‘ [2mRemove --create flag to switch to it[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex a6db01464..bcc9a2884 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap@@ -20,7 +20,8 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature-x[0m at [REPO].feature-x+β [32mCreated new worktree for [1m[32mfeature-x[0m[0m+ [2mPath: [REPO].feature-x[0mTo enable automatic cd, run: wt configure-shelldiff --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 436572cc1..596dc1642 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@@ -21,4 +21,6 @@ exit_code: 1----- stdout ---------- stderr ------β Worktree directory missing for '[1m[31mmissing-wt[0m'. Run 'git worktree prune' to clean up.+β [31mWorktree directory missing for [1m[31mmissing-wt[0m[0m++π‘ [2mRun 'git worktree prune' to clean up[0mdiff --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 2fb894a08..801fb76bc 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@@ -22,7 +22,8 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfile-test[0m at [REPO].file-test+β [32mCreated new worktree for [1m[32mfile-test[0m[0m+ [2mPath: [REPO].file-test[0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex c1f855829..e2b59454f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -21,5 +21,10 @@ info:success: trueexit_code: 0----- stdout -----+β [32mSwitched to worktree for [1m[32mexisting-exec[0m[0m++++To enable automatic cd, run: wt configure-shell----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex 7451bd884..59550d6d5 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -23,7 +23,8 @@ success: trueexit_code: 0----- stdout -----test output-Created new branch and worktree for [1mexec-test[0m at [REPO].exec-test+β [32mCreated new worktree for [1m[32mexec-test[0m[0m+ [2mPath: [REPO].exec-test[0mTo enable automatic cd, run: wt configure-shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex 92c0b763f..0167acb00 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -1,11 +1,12 @@---source: tests/integration_tests/switch.rsinfo:- program: arbor+ program: wtargs:- switch- feature-zenv:+ CLICOLOR_FORCE: "1"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -18,5 +19,10 @@ info:success: trueexit_code: 0----- stdout -----+β [32mSwitched to worktree for [1m[32mfeature-z[0m[0m++++To enable automatic cd, run: wt configure-shell----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snapindex 00f94471b..cb459b402 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap@@ -7,6 +7,7 @@ info:- "--internal"- existing-wtenv:+ CLICOLOR_FORCE: "1"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -20,5 +21,6 @@ success: trueexit_code: 0----- stdout -----__WORKTRUNK_CD__[WORKTREE_EXISTING_WT]+β [32mSwitched to worktree for [1m[32mexisting-wt[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snapindex cb2e5759a..a371418dc 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap@@ -22,6 +22,6 @@ success: trueexit_code: 0----- stdout -----__WORKTRUNK_CD__[REPO].internal-test-Created new branch and worktree for [1minternal-test[0m at [REPO].internal-test+β [32mCreated new worktree for [1m[32minternal-test[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex a2523adc6..735428af2 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap@@ -22,7 +22,8 @@ info:success: trueexit_code: 0----- stdout ------Created new branch and worktree for [1mfeature-with-base[0m at [REPO].feature-with-base+β [32mCreated new worktree for [1m[32mfeature-with-base[0m[0m+ [2mPath: [REPO].feature-with-base[0mTo enable automatic cd, run: wt configure-shell