Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor: Use underscore for "No commits" symbol
Maximilian Roos2f9dacf45f0d
diff --git a/README.md b/README.mdindex e38ab3175..795221912 100644--- a/README.md+++ b/README.md@@ -716,7 +716,7 @@ Options:## Status Symbols-Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`+Order: `+!? ✖⚠≡_ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`- `+` Staged files (ready to commit)- `!` Modified files (unstaged changes)@@ -724,7 +724,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`- `✖` **Merge conflicts** - unresolved conflicts in working tree (fix before continuing)- `⚠` **Would conflict** - merging into main would fail- `≡` Working tree matches main (identical contents, regardless of commit history)-- `∅` No commits (no commits ahead AND no uncommitted changes)+- `_` No commits (no commits ahead AND no uncommitted changes)- `↻` Rebase in progress- `⋈` Merge in progress- `↑` Ahead of main branch@@ -737,7 +737,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`- `⌫` Prunable worktree (directory missing, can be pruned)- `⊠` Locked worktree (protected from auto-removal)-*Rows are dimmed when there's no marginal contribution (≡ matches main OR ∅ no commits).*+*Rows are dimmed when there's no marginal contribution (≡ matches main OR _ no commits).*## JSON Output@@ -933,10 +933,10 @@ git config worktrunk.status.feature-x "💬"$ wt listBranch Status HEAD± main↕ Path Remote⇅ Commit Age Message@ main ^ ./repo f0879504 1d Initial commit-+ clean-no-status ∅ ./repo.clean-no-status f0879504 1d Initial commit-+ clean-with-status ∅ 💬 ./repo.clean-with-status f0879504 1d Initial commit++ clean-no-status _ ./repo.clean-no-status f0879504 1d Initial commit++ clean-with-status _ 💬 ./repo.clean-with-status f0879504 1d Initial commit+ dirty-no-status ! +1 -1 ./repo.dirty-no-status f0879504 1d Initial commit-+ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit⚪ Showing 5 worktrees, 1 with changes```@@ -962,10 +962,10 @@ When using Claude:$ wt listBranch Status HEAD± main↕ Path Remote⇅ Commit Age Message@ main ^ ./repo f0879504 1d Initial commit-+ clean-no-status ∅ ./repo.clean-no-status f0879504 1d Initial commit-+ clean-with-status ∅ 💬 ./repo.clean-with-status f0879504 1d Initial commit++ clean-no-status _ ./repo.clean-no-status f0879504 1d Initial commit++ clean-with-status _ 💬 ./repo.clean-with-status f0879504 1d Initial commit+ dirty-no-status ! +1 -1 ./repo.dirty-no-status f0879504 1d Initial commit-+ dirty-with-status ?∅ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit++ dirty-with-status ?_ 🤖 ./repo.dirty-with-status f0879504 1d Initial commit⚪ Showing 5 worktrees, 1 with changes```diff --git a/src/cli.rs b/src/cli.rsindex 721fdafbc..36f9e3466 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -611,7 +611,7 @@ Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>## Status Symbols-Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`+Order: `+!? ✖⚠≡_ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`- `+` Staged files (ready to commit)- `!` Modified files (unstaged changes)@@ -619,7 +619,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`- `✖` **Merge conflicts** - unresolved conflicts in working tree (fix before continuing)- `⚠` **Would conflict** - merging into main would fail- `≡` Working tree matches main (identical contents, regardless of commit history)-- `∅` No commits (no commits ahead AND no uncommitted changes)+- `_` No commits (no commits ahead AND no uncommitted changes)- `↻` Rebase in progress- `⋈` Merge in progress- `↑` Ahead of main branch@@ -632,7 +632,7 @@ Order: `+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠`- `⌫` Prunable worktree (directory missing, can be pruned)- `⊠` Locked worktree (protected from auto-removal)-*Rows are dimmed when there's no marginal contribution (≡ matches main OR ∅ no commits).*+*Rows are dimmed when there's no marginal contribution (≡ matches main OR _ no commits).*## JSON Outputdiff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex f68bc918e..afa7da670 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -720,7 +720,7 @@ impl serde::Serialize for WorktreeState {/// 3. Merge (⋈) - active operation/// 4. MergeTreeConflicts (⚠) - potential problem/// 5. MatchesMain (≡) - removable-/// 6. NoCommits (∅) - removable+/// 6. NoCommits (_) - removable#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]pub enum BranchOpState {#[strum(serialize = "")]@@ -750,7 +750,7 @@ impl std::fmt::Display for BranchOpState {Self::Merge => write!(f, "⋈"),Self::MergeTreeConflicts => write!(f, "⚠"),Self::MatchesMain => write!(f, "≡"),- Self::NoCommits => write!(f, "∅"),+ Self::NoCommits => write!(f, "_"),}}}@@ -819,7 +819,7 @@ impl PositionMask {1, // STAGED: + (1 char)1, // MODIFIED: ! (1 char)1, // UNTRACKED: ? (1 char)- 1, // BRANCH_OP_STATE: ✖↻⋈⚠≡∅ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)+ 1, // BRANCH_OP_STATE: ✖↻⋈⚠≡_ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)1, // WORKTREE_STATE: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)@@ -837,7 +837,7 @@ impl PositionMask {////// Symbols are categorized to enable vertical alignment in table output:/// - Working tree: +, !, ? (staged, modified, untracked - priority order)-/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, ∅ (combined position with priority)+/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, _ (combined position with priority)/// - Main divergence: ^, ↑, ↓, ↕/// - Upstream divergence: ⇡, ⇣, ⇅/// - Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority-only)@@ -846,13 +846,13 @@ impl PositionMask {/// ## Mutual Exclusivity////// **Combined with priority (branch state + git operation):**-/// Priority: ✖ > ↻ > ⋈ > ⚠ > ≡ > ∅+/// Priority: ✖ > ↻ > ⋈ > ⚠ > ≡ > _/// - ✖: Actual conflicts (must resolve)/// - ↻: Rebase in progress/// - ⋈: Merge in progress/// - ⚠: Merge-tree conflicts (potential problem)/// - ≡: Matches main (removable)-/// - ∅: No commits (removable)+/// - _: No commits (removable)////// **Mutually exclusive (enforced by type system):**/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)@@ -867,7 +867,7 @@ impl PositionMask {#[derive(Debug, Clone, Default)]pub struct StatusSymbols {/// Combined branch and operation state (mutually exclusive with priority)- /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (∅)+ /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (_)pub(crate) branch_op_state: BranchOpState,/// Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)diff --git a/src/md_help.rs b/src/md_help.rsindex d0652cc92..131f34f35 100644--- a/src/md_help.rs+++ b/src/md_help.rs@@ -122,7 +122,7 @@ fn colorize_status_symbols(text: &str) -> String {"≡ Working tree matches",&format!("{hint}≡{hint:#} Working tree matches"),)- .replace("∅ No commits", &format!("{hint}∅{hint:#} No commits"))+ .replace("_ No commits", &format!("{hint}_{hint:#} No commits")).replace("· Branch without",&format!("{hint}·{hint:#} Branch without"),diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rsindex cd7ea4d7b..2d01c80d9 100644--- a/tests/integration_tests/shell_wrapper.rs+++ b/tests/integration_tests/shell_wrapper.rs@@ -197,12 +197,18 @@ complete --keep-order --exclusive --command wt --arguments "(COMPLETE=fish \$WOR/// Quote a shell argument if it contains special charactersfn quote_arg(arg: &str) -> String {if arg.contains(' ') || arg.contains(';') || arg.contains('\'') {- format!("'{}'", arg.replace('\'', "'\\''"))+ shell_quote(arg)} else {arg.to_string()}}+/// Always quote a string for shell use, properly escaping single quotes.+/// Handles paths like `/path/to/worktrunk.'∅'/target/debug/wt`+fn shell_quote(s: &str) -> String {+ format!("'{}'", s.replace('\'', "'\\''"))+}+/// Build a shell script that sources the wrapper and runs a commandfn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&str]) -> String {let wt_bin = get_cargo_bin("wt");@@ -213,12 +219,16 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s// Don't use 'set -e' in bash/zsh - we want to capture failures and their exit codes.// This is tested by test_wrapper_handles_command_failure which verifies// that command failures return proper exit codes rather than aborting the script.+ // Properly quote paths to handle special characters like single quotes+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_path_quoted = shell_quote(&repo.test_config_path().display().to_string());+match shell {"fish" => {- script.push_str(&format!("set -x WORKTRUNK_BIN '{}'\n", wt_bin.display()));+ script.push_str(&format!("set -x WORKTRUNK_BIN {}\n", wt_bin_quoted));script.push_str(&format!(- "set -x WORKTRUNK_CONFIG_PATH '{}'\n",- repo.test_config_path().display()+ "set -x WORKTRUNK_CONFIG_PATH {}\n",+ config_path_quoted));script.push_str("set -x CLICOLOR_FORCE 1\n");}@@ -229,19 +239,19 @@ fn build_shell_script(shell: &str, repo: &TestRepo, subcommand: &str, args: &[&s// but compinit is safe since it only sets up completion functionsscript.push_str("autoload -Uz compinit && compinit -i 2>/dev/null\n");- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));script.push_str(&format!(- "export WORKTRUNK_CONFIG_PATH='{}'\n",- repo.test_config_path().display()+ "export WORKTRUNK_CONFIG_PATH={}\n",+ config_path_quoted));script.push_str("export CLICOLOR_FORCE=1\n");}_ => {// bash- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));script.push_str(&format!(- "export WORKTRUNK_CONFIG_PATH='{}'\n",- repo.test_config_path().display()+ "export WORKTRUNK_CONFIG_PATH={}\n",+ config_path_quoted));script.push_str("export CLICOLOR_FORCE=1\n");}@@ -1087,9 +1097,18 @@ approved-commands = [repo.commit("Initial commit");repo.setup_remote("main");- // Get path to the test fixture script+ // Copy the fixture script to the test repo to avoid path issues with special characters+ // (CARGO_MANIFEST_DIR may contain single quotes like worktrunk.'∅' which break shell parsing)let fixtures_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures");- let script_path = fixtures_dir.join("mixed-output.sh");+ let script_content = fs::read(&fixtures_dir.join("mixed-output.sh")).unwrap();+ let script_path = repo.root_path().join("mixed-output.sh");+ fs::write(&script_path, &script_content).unwrap();+ // Make the script executable+ #[cfg(unix)]+ {+ use std::os::unix::fs::PermissionsExt;+ fs::set_permissions(&script_path, fs::Permissions::from_mode(0o755)).unwrap();+ }// Create project config with pre-merge commands that output to both stdout and stderrlet config_dir = repo.root_path().join(".config");@@ -1506,32 +1525,25 @@ approved-commands = ["echo 'fish background task'"]let wrapper_script = generate_wrapper(&repo, shell);let mut script = String::new();- // Set environment variables+ // Set environment variables (use shell_quote to handle paths with special chars)+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());match shell {"fish" => {- script.push_str(&format!("set -x WORKTRUNK_BIN '{}'\n", wt_bin.display()));- script.push_str(&format!(- "set -x WORKTRUNK_CONFIG_PATH '{}'\n",- repo.test_config_path().display()- ));+ script.push_str(&format!("set -x WORKTRUNK_BIN {}\n", wt_bin_quoted));+ script.push_str(&format!("set -x WORKTRUNK_CONFIG_PATH {}\n", config_quoted));script.push_str("set -x CLICOLOR_FORCE 1\n");}"zsh" => {script.push_str("autoload -Uz compinit && compinit -i 2>/dev/null\n");- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));- script.push_str(&format!(- "export WORKTRUNK_CONFIG_PATH='{}'\n",- repo.test_config_path().display()- ));+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));+ script.push_str(&format!("export WORKTRUNK_CONFIG_PATH={}\n", config_quoted));script.push_str("export CLICOLOR_FORCE=1\n");}_ => {// bash- script.push_str(&format!("export WORKTRUNK_BIN='{}'\n", wt_bin.display()));- script.push_str(&format!(- "export WORKTRUNK_CONFIG_PATH='{}'\n",- repo.test_config_path().display()- ));+ script.push_str(&format!("export WORKTRUNK_BIN={}\n", wt_bin_quoted));+ script.push_str(&format!("export WORKTRUNK_CONFIG_PATH={}\n", config_quoted));script.push_str("export CLICOLOR_FORCE=1\n");}}@@ -1694,14 +1706,14 @@ approved-commands = ["echo 'bash background'"]// Build the setup script that defines the wt functionlet wt_bin = get_cargo_bin("wt");let wrapper_script = generate_wrapper(&repo, "bash");+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());let setup_script = format!(- "export WORKTRUNK_BIN='{}'\n\- export WORKTRUNK_CONFIG_PATH='{}'\n\+ "export WORKTRUNK_BIN={}\n\+ export WORKTRUNK_CONFIG_PATH={}\n\export CLICOLOR_FORCE=1\n\{}",- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script+ wt_bin_quoted, config_quoted, wrapper_script);let config_path = repo.test_config_path().to_string_lossy().to_string();@@ -1759,17 +1771,17 @@ approved-commands = ["echo 'bash background'"]// Script that sources wrapper and checks if completion is registered// (completions are inline in the wrapper via lazy loading)+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());let script = format!(r#"- export WORKTRUNK_BIN='{}'- export WORKTRUNK_CONFIG_PATH='{}'+ export WORKTRUNK_BIN={}+ export WORKTRUNK_CONFIG_PATH={}{}# Check if wt completion is registeredcomplete -p wt 2>/dev/null && echo "__COMPLETION_REGISTERED__" || echo "__NO_COMPLETION__""#,- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script+ wt_bin_quoted, config_quoted, wrapper_script);let final_script = format!("( {} ) 2>&1", script);@@ -1799,10 +1811,12 @@ approved-commands = ["echo 'bash background'"]let completions_script = generate_completions(&repo, "fish");// Script that sources wrapper, completions, and checks if completion is registered+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());let script = format!(r#"- set -x WORKTRUNK_BIN '{}'- set -x WORKTRUNK_CONFIG_PATH '{}'+ set -x WORKTRUNK_BIN {}+ set -x WORKTRUNK_CONFIG_PATH {}{}{}# Check if wt completions are registered@@ -1812,10 +1826,7 @@ approved-commands = ["echo 'bash background'"]echo "__NO_COMPLETION__"end"#,- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script,- completions_script+ wt_bin_quoted, config_quoted, wrapper_script, completions_script);let final_script = format!("begin\n{}\nend 2>&1", script);@@ -1845,10 +1856,12 @@ approved-commands = ["echo 'bash background'"]let wrapper_script = generate_wrapper(&repo, "zsh");// Script that sources wrapper and checks if wt function exists+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());let script = format!(r#"- export WORKTRUNK_BIN='{}'- export WORKTRUNK_CONFIG_PATH='{}'+ export WORKTRUNK_BIN={}+ export WORKTRUNK_CONFIG_PATH={}{}# Check if wt wrapper function is definedif (( $+functions[wt] )); then@@ -1857,9 +1870,7 @@ approved-commands = ["echo 'bash background'"]echo "__NO_WRAPPER__"fi"#,- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script+ wt_bin_quoted, config_quoted, wrapper_script);let final_script = format!("( {} ) 2>&1", script);@@ -1945,6 +1956,10 @@ approved-commands = ["echo 'bash background'"]let wt_bin = get_cargo_bin("wt");let wrapper_script = generate_wrapper(&repo, shell);+ // Use shell_quote to handle paths with special chars (like single quotes)+ let wt_bin_quoted = shell_quote(&wt_bin.display().to_string());+ let config_quoted = shell_quote(&repo.test_config_path().display().to_string());+// Script that explicitly removes wt from PATH but sets WORKTRUNK_BINlet script = match shell {"zsh" => format!(@@ -1952,46 +1967,40 @@ approved-commands = ["echo 'bash background'"]autoload -Uz compinit && compinit -i 2>/dev/null# Clear PATH to ensure wt is not found via PATHexport PATH="/usr/bin:/bin"- export WORKTRUNK_BIN='{}'- export WORKTRUNK_CONFIG_PATH='{}'+ export WORKTRUNK_BIN={}+ export WORKTRUNK_CONFIG_PATH={}export CLICOLOR_FORCE=1{}wt switch --create fallback-testecho "__PWD__ $PWD""#,- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script+ wt_bin_quoted, config_quoted, wrapper_script),"fish" => format!(r#"# Clear PATH to ensure wt is not found via PATHset -x PATH /usr/bin /bin- set -x WORKTRUNK_BIN '{}'- set -x WORKTRUNK_CONFIG_PATH '{}'+ set -x WORKTRUNK_BIN {}+ set -x WORKTRUNK_CONFIG_PATH {}set -x CLICOLOR_FORCE 1{}wt switch --create fallback-testecho "__PWD__ $PWD""#,- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script+ wt_bin_quoted, config_quoted, wrapper_script),_ => format!(r#"# Clear PATH to ensure wt is not found via PATHexport PATH="/usr/bin:/bin"- export WORKTRUNK_BIN='{}'- export WORKTRUNK_CONFIG_PATH='{}'+ export WORKTRUNK_BIN={}+ export WORKTRUNK_CONFIG_PATH={}export CLICOLOR_FORCE=1{}wt switch --create fallback-testecho "__PWD__ $PWD""#,- wt_bin.display(),- repo.test_config_path().display(),- wrapper_script+ wt_bin_quoted, config_quoted, wrapper_script),};diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snapindex e7824ef98..b753efab4 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap@@ -5,8 +5,8 @@ expression: normalized> [QUERY] │[PREVIEW_HEADER]Branch Status HEAD± main↕ Path │ctrl-u/d: scroll> @ main ^ ./repo ..│- + feature-one ∅ ./repo.fea..│⚪ No uncommitted changes- + feature-two ∅ ./repo.fea..│+ + feature-one _ ./repo.fea..│⚪ No uncommitted changes+ + feature-two _ ./repo.fea..││││diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snapindex b91dfe581..48752acba 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap@@ -5,8 +5,8 @@ expression: normalized> [QUERY] │[PREVIEW_HEADER]Branch Status HEAD± main↕ Path │ctrl-u/d: scroll> @ main ^ ./repo │- + active-worktree ∅ ./repo..│⚪ No uncommitted changes- orphan-branch ∅ ⎇ │+ + active-worktree _ ./repo..│⚪ No uncommitted changes+ orphan-branch _ ⎇ ││││diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snapindex 6e385ff83..84638fef0 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mcheck1[0m:[0m-[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check1 3[0m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1[check1] stdout line 2@@ -13,7 +13,7 @@ expression: output.normalized()[check1] stdout complete[check1] stderr complete🔄 [36mRunning pre-merge [1mcheck2[0m:[0m-[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check2 3[0m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snapindex 6e385ff83..84638fef0 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---🔄 [36mRunning pre-merge [1mcheck1[0m:[0m-[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check1 3[0m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1[check1] stdout line 2@@ -13,7 +13,7 @@ expression: output.normalized()[check1] stdout complete[check1] stderr complete🔄 [36mRunning pre-merge [1mcheck2[0m:[0m-[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check2 3[0m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snapindex d7c79911a..ab0fac1ff 100644--- a/tests/snapshots/integration__integration_tests__help__help_list.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap@@ -76,7 +76,7 @@ Global Options:[32mStatus Symbols[0m-Order: [2m+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠[0m+Order: [2m+!? ✖⚠≡_ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠[0m- [2m+[0m Staged files (ready to commit)- [2m![0m Modified files (unstaged changes)@@ -84,7 +84,7 @@ Order: [2m+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠[0m- [2m✖[0m [1mMerge conflicts[0m - unresolved conflicts in working tree (fix before continuing)- [2m⚠[0m [1mWould conflict[0m - merging into main would fail- [2m≡[0m Working tree matches main (identical contents, regardless of commit history)-- [2m∅[0m No commits (no commits ahead AND no uncommitted changes)+- [2m_[0m No commits (no commits ahead AND no uncommitted changes)- [2m↻[0m Rebase in progress- [2m⋈[0m Merge in progress- [2m↑[0m Ahead of main branch@@ -97,7 +97,7 @@ Order: [2m+!? ✖⚠≡∅ ↻⋈ ↑↓↕ ⇡⇣⇅ ⎇⌫⊠[0m- [2m⌫[0m Prunable worktree (directory missing, can be pruned)- [2m⊠[0m Locked worktree (protected from auto-removal)-*Rows are dimmed when there's no marginal contribution (≡ matches main OR ∅ no commits).*+*Rows are dimmed when there's no marginal contribution (≡ matches main OR _ no commits).*[32mJSON Output[0mdiff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 9845158ae..97e8363da 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap@@ -26,6 +26,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mbranch-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mbranch-only[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snapindex 501b4c4d6..6f49c2437 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2m-[0m [2m∅[0m [33m⚐[0m [2m./repo.feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2m-[0m [2m_[0m [33m⚐[0m [2m./repo.feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snapindex 4c710793b..36f18ac69 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap@@ -156,13 +156,13 @@ exit_code: 0},"status_symbols": {"working_tree": "",- "branch_op_state": "∅",+ "branch_op_state": "_","main_divergence": "↓","upstream_divergence": "","worktree_state": ""},"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",- "status_line": "feature-behind /u001b[2m∅/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",+ "status_line": "feature-behind /u001b[2m_/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m","type": "worktree","path": "[REPO].feature-behind","bare": false,diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex d51b189a0..eaeeeae44 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -105,12 +105,12 @@ exit_code: 0},"status_symbols": {"working_tree": "",- "branch_op_state": "∅",+ "branch_op_state": "_","main_divergence": "","upstream_divergence": "","worktree_state": ""},- "status_line": "feature-detached /u001b[2m∅/u001b[0m",+ "status_line": "feature-detached /u001b[2m_/u001b[0m","type": "worktree","path": "[REPO].feature-detached","bare": false,@@ -156,12 +156,12 @@ exit_code: 0},"status_symbols": {"working_tree": "",- "branch_op_state": "∅",+ "branch_op_state": "_","main_divergence": "","upstream_divergence": "","worktree_state": "⊠"},- "status_line": "locked-feature /u001b[2m∅/u001b[0m/u001b[33m⊠/u001b[0m",+ "status_line": "locked-feature /u001b[2m_/u001b[0m/u001b[33m⊠/u001b[0m","type": "worktree","path": "[REPO].locked-feature","bare": false,diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snapindex 4ef4901dd..023541c25 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap@@ -106,13 +106,13 @@ exit_code: 0},"status_symbols": {"working_tree": "",- "branch_op_state": "∅",+ "branch_op_state": "_","main_divergence": "","upstream_divergence": "","worktree_state": "","user_status": "🔧"},- "status_line": "with-status /u001b[2m∅/u001b[0m🔧",+ "status_line": "with-status /u001b[2m_/u001b[0m🔧","type": "worktree","path": "[REPO].with-status","bare": false,@@ -158,12 +158,12 @@ exit_code: 0},"status_symbols": {"working_tree": "",- "branch_op_state": "∅",+ "branch_op_state": "_","main_divergence": "","upstream_divergence": "","worktree_state": ""},- "status_line": "without-status /u001b[2m∅/u001b[0m",+ "status_line": "without-status /u001b[2m_/u001b[0m","type": "worktree","path": "[REPO].without-status","bare": false,diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex a90b1d3fa..3fd143a47 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -27,6 +27,6 @@ exit_code: 0@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ diverged [36m![0m [2m↑[0m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./repo.diverged [2m8ba5aa92[0m [2m10mo[0m [2mDiverged commit[0m+ feature-changes [36m![0m[36m?[0m [2m↑[0m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./repo.feature-changes [2mb854b166[0m [2m10mo[0m [2mAdd 100 lines[0m-+ [2mfix[0m [36m?[0m[2m∅[0m 💬 [2m./repo.fix[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfix[0m [36m?[0m[2m_[0m 💬 [2m./repo.fix[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snapindex 2c00cee8c..5d43961e1 100644--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mdevelop[0m [2m^[0m [33m⚐[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m∅[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[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 2c0779921..e2b1e03bc 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@@ -19,8 +19,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m∅[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m11mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m11mo[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m11mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex f9e481fb6..72d8ed99f 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mlocked-no-reason[0m [2m∅[0m [33m⊠[0m [2m./repo.locked-no-reason[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mlocked-no-reason[0m [2m_[0m [33m⊠[0m [2m./repo.locked-no-reason[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex d52c52b1a..54e67fca3 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mlocked-feature[0m [2m∅[0m [33m⊠[0m [2m./repo.locked-feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mlocked-feature[0m [2m_[0m [33m⊠[0m [2m./repo.locked-feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex a49d3e915..fd5bb9d98 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2m1310bfb9[0m [2m10mo[0m [2mShort message[0m-+ [2mfeature-a[0m [2m∅[0m[2m↓[0m [2m[31m↓1[0m [2m./repo.feature-a[0m [2mf078644e[0m [2m10mo[0m [2mThis is a very long commit message that should test how the…[0m++ [2mfeature-a[0m [2m_[0m[2m↓[0m [2m[31m↓1[0m [2m./repo.feature-a[0m [2mf078644e[0m [2m10mo[0m [2mThis is a very long commit message that should test how the…[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 0764f8540..ea52cbf8e 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -25,9 +25,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mmedium-name[0m [2m∅[0m [2m./repo.medium-name[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mshort[0m [2m∅[0m [2m./repo.short[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mvery-long-branch-name-here[0m [2m∅[0m [2m./repo.very-long-branch-name-here[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mwith-changes[0m [2m∅[0m [2m./repo.with-changes[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mmedium-name[0m [2m_[0m [2m./repo.medium-name[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mshort[0m [2m_[0m [2m./repo.short[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mvery-long-branch-name-here[0m [2m_[0m [2m./repo.very-long-branch-name-here[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mwith-changes[0m [2m_[0m [2m./repo.with-changes[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 5 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 698f17ec9..1dfe50886 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m∅[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex 8fff02b8a..35214db99 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -26,6 +26,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature[0m [2m∅[0m [2m./repo.feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature[0m [2m_[0m [2m./repo.feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snapindex 5e1181e25..fe15d5acb 100644--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-- [2mfeature[0m [2m∅[0m [2m./repo.feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+- [2mfeature[0m [2m_[0m [2m./repo.feature[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex 4d28b8e63..a81122170 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m∅[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex 54fa020f1..f5e7f845a 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -27,8 +27,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morphan-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morphan-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morphan-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morphan-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 2 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snapindex 0eae34993..33540420c 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap@@ -27,7 +27,7 @@ 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@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [36m?[0m[2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [36m?[0m[2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ feature-b [2m↑[0m [32m↑1[0m [32m+1[0m [31m-1[0m ./repo.feature-b [2m2d37ca75[0m [2m10mo[0m [2mTest commit[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex e9dfa4b67..958e6a440 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap@@ -26,15 +26,15 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-1[0m [2m∅[0m [2m./repo.feature-1[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-10[0m [2m∅[0m [2m./repo.feature-10[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-2[0m [2m∅[0m [2m./repo.feature-2[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-3[0m [2m∅[0m [2m./repo.feature-3[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-4[0m [2m∅[0m [2m./repo.feature-4[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-5[0m [2m∅[0m [2m./repo.feature-5[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-6[0m [2m∅[0m [2m./repo.feature-6[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-7[0m [2m∅[0m [2m./repo.feature-7[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-8[0m [2m∅[0m [2m./repo.feature-8[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-9[0m [2m∅[0m [2m./repo.feature-9[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-1[0m [2m_[0m [2m./repo.feature-1[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-10[0m [2m_[0m [2m./repo.feature-10[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-2[0m [2m_[0m [2m./repo.feature-2[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-3[0m [2m_[0m [2m./repo.feature-3[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-4[0m [2m_[0m [2m./repo.feature-4[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-5[0m [2m_[0m [2m./repo.feature-5[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-6[0m [2m_[0m [2m./repo.feature-6[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-7[0m [2m_[0m [2m./repo.feature-7[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-8[0m [2m_[0m [2m./repo.feature-8[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-9[0m [2m_[0m [2m./repo.feature-9[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 11 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex 99532be9f..b68da04b2 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap@@ -26,8 +26,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m∅[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-c[0m [2m∅[0m [2m./repo.feature-c[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-c[0m [2m_[0m [2m./repo.feature-c[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex acf0f74c1..05bde4276 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mlocked[0m [2m∅[0m [33m⊠[0m [2m./repo.locked[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mnormal[0m [2m∅[0m [2m./repo.normal[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mlocked[0m [2m_[0m [33m⊠[0m [2m./repo.locked[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mnormal[0m [2m_[0m [2m./repo.normal[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex 01a064ab0..c48a49846 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap@@ -28,6 +28,6 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m+ ahead [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2m[31m⇣0[0m [2m2fff52c2[0m [2m10mo[0m [2mAhead commit[0m-+ [2min-sync[0m [2m∅[0m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m++ [2min-sync[0m [2m_[0m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex e40962b5e..c05d1cd5f 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2me4614cb7[0m [2m10mo[0m [2mFix bug with café ☕ handling[0m-+ [2mfeature-test[0m [2m∅[0m[2m↓[0m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m0c53695b[0m [2m10mo[0m [2mAdd support for 日本語 and émoji 🎉[0m++ [2mfeature-test[0m [2m_[0m[2m↓[0m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m0c53695b[0m [2m10mo[0m [2mAdd support for 日本語 and émoji 🎉[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snapindex 20e0e7fc6..269a1501a 100644--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2memoji[0m [2m∅[0m 🔄 [2m./repo.emoji[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mmulti[0m [2m∅[0m 👨💻 [2m./repo.multi[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2memoji[0m [2m_[0m 🔄 [2m./repo.emoji[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mmulti[0m [2m_[0m 👨💻 [2m./repo.multi[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex b69cb70b5..c96259805 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -26,9 +26,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-with-worktree[0m [2m∅[0m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2manother-branch[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mfeature-without-worktree[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mfix-bug[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-with-worktree[0m [2m_[0m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2manother-branch[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mfeature-without-worktree[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mfix-bug[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snapindex 4864e9384..2f1f431b8 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m∅[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m∅[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snapindex b864f100f..445e0d254 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap@@ -26,8 +26,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mbranch-alpha[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mbranch-beta[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mbranch-gamma[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mbranch-alpha[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mbranch-beta[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mbranch-gamma[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex 7160acca7..3ad27cf0c 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap@@ -27,9 +27,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mlocal-only-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2mlocal-only-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morigin/remote-only-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morigin/remote-only-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mlocal-only-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mlocal-only-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morigin/remote-only-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morigin/remote-only-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 2 branches, 2 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex 072870d14..eb1516336 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-with-worktree[0m [2m∅[0m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morigin/remote-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-with-worktree[0m [2m_[0m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morigin/remote-only[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 1 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex 6517a3250..c393a59f5 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morigin/remote-feature-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m- [2morigin/remote-feature-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morigin/remote-feature-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2morigin/remote-feature-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 2 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex af88be544..eef87073c 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -29,9 +29,9 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./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 ./repo.ahead [32m⇡2[0m [2m[31m⇣0[0m [SHA] [2m10mo[0m [2mAhead commit 2[0m-+ [2mbehind[0m [2m∅[0m [2m⇣[0m [2m./repo.behind[0m [32m⇡0[0m [2m[31m⇣1[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ [2mbehind[0m [2m_[0m [2m⇣[0m [2m./repo.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 ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [SHA] [2m10mo[0m [2mDiverged local commit[0m-+ [2min-sync[0m [2m∅[0m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m-+ [2mno-upstream[0m [2m∅[0m [2m./repo.no-upstream[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ [2min-sync[0m [2m_[0m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ [2mno-upstream[0m [2m_[0m [2m./repo.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__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snapindex 6ed98d6ef..43e3fe088 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap@@ -25,9 +25,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m-+ [2mclean-no-status[0m [2m∅[0m [2m./repo.clean-no-status[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m-+ [2mclean-with-status[0m [2m∅[0m 💬 [2m./repo.clean-with-status[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m++ [2mclean-no-status[0m [2m_[0m [2m./repo.clean-no-status[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m++ [2mclean-with-status[0m [2m_[0m 💬 [2m./repo.clean-with-status[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m+ dirty-no-status [36m![0m [32m+1[0m [31m-1[0m ./repo.dirty-no-status [2mf0879504[0m [2m1d[0m [2mInitial commit[0m-+ [2mdirty-with-status[0m [36m?[0m[2m∅[0m 🤖 [2m./repo.dirty-with-status[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m++ [2mdirty-with-status[0m [36m?[0m[2m_[0m 🤖 [2m./repo.dirty-with-status[0m [2mf0879504[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 5 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snapindex c7a4fb49c..7fa58c249 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap@@ -28,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m.[0m [SHA] [2m10mo[0m [2mInitial commit[0m- [2mfeature[0m [2m∅[0m [2m⎇[0m [SHA] [2m10mo[0m [2mInitial commit[0m+ [2mfeature[0m [2m_[0m [2m⎇[0m [SHA] [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snapindex 6fd8eb546..d279a9146 100644--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [SHA] [2m10mo[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m-+ [2mfeature[0m [2m∅[0m [2m./repo.feature[0m [SHA] [2m10mo[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m++ [2mfeature[0m [2m_[0m [2m./repo.feature[0m [SHA] [2m10mo[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex abb2f92ee..bfcbd07a4 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2malso-no-changes[0m [2m∅[0m [2m./repo.also-no-changes[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mno-changes[0m [2m∅[0m [2m./repo.no-changes[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2malso-no-changes[0m [2m_[0m [2m./repo.also-no-changes[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mno-changes[0m [2m_[0m [2m./repo.no-changes[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ with-changes [36m![0m [32m+1[0m [31m-1[0m ./repo.with-changes [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snapindex ae9c66e55..258968e74 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mhuge[0m [36m?[0m[2m∅[0m [2m./repo.huge[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mhuge[0m [36m?[0m[2m_[0m [2m./repo.huge[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ tiny [36m![0m [32m+1[0m [31m-1[0m ./repo.tiny [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snapindex 8e7ba9e42..d712fcf14 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-large[0m [36m?[0m[2m∅[0m [2m./repo.feature-large[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-medium[0m [36m?[0m[2m∅[0m [2m./repo.feature-medium[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mfeature-small[0m [36m?[0m[2m∅[0m [2m./repo.feature-small[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-large[0m [36m?[0m[2m_[0m [2m./repo.feature-large[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-medium[0m [36m?[0m[2m_[0m [2m./repo.feature-medium[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mfeature-small[0m [36m?[0m[2m_[0m [2m./repo.feature-small[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snapindex cb93ee358..b0d6d965f 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m-+ [2manother-extremely-long-name-here[0m [2m∅[0m [2m./repo.another-extremely-long-name-here[0m [2mb834638e[0m [2m10mo[0m-+ [2mshort[0m [2m∅[0m [2m./repo.short[0m [2mb834638e[0m [2m10mo[0m-+ [2mvery-long-feature-branch-name[0m [2m∅[0m [2m./repo.very-long-feature-branch-name[0m [2mb834638e[0m [2m10mo[0m++ [2manother-extremely-long-name-here[0m [2m_[0m [2m./repo.another-extremely-long-name-here[0m [2mb834638e[0m [2m10mo[0m++ [2mshort[0m [2m_[0m [2m./repo.short[0m [2mb834638e[0m [2m10mo[0m++ [2mvery-long-feature-branch-name[0m [2m_[0m [2m./repo.very-long-feature-branch-name[0m [2mb834638e[0m [2m10mo[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snapindex baa31a482..8eab11bd3 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m∅[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mmedium[0m [2m∅[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mx[0m [2m∅[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m_[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mmedium[0m [2m_[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mx[0m [2m_[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snapindex b25444f0e..e1e354c06 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2ma[0m [2m∅[0m [2m./repo.a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mbb[0m [2m∅[0m [2m./repo.bb[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mccc[0m [2m∅[0m [2m./repo.ccc[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2ma[0m [2m_[0m [2m./repo.a[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mbb[0m [2m_[0m [2m./repo.bb[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mccc[0m [2m_[0m [2m./repo.ccc[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snapindex 65b8f7da8..5566fb5f2 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mcafe[0m [2m∅[0m [2m./repo.cafe[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mnaive[0m [2m∅[0m [2m./repo.naive[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m-+ [2mresume[0m [2m∅[0m [2m./repo.resume[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mcafe[0m [2m_[0m [2m./repo.cafe[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mnaive[0m [2m_[0m [2m./repo.naive[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m++ [2mresume[0m [2m_[0m [2m./repo.resume[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0m