Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor: Use type-safe enums for status symbols
Maximilian Roosf17f502718ab
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex c3bb610fb..11d166136 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -440,35 +440,112 @@ impl serde::Serialize for UpstreamDivergence {}}+/// Branch state relative to main/primary branch+///+/// Represents whether the branch matches main or has no commits.+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+pub enum BranchState {+ /// Normal branch state (neither matches main nor empty)+ #[default]+ None,+ /// Working tree identical to main branch+ MatchesMain,+ /// No commits ahead and clean working tree (not matching main)+ NoCommits,+}++impl std::fmt::Display for BranchState {+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {+ match self {+ Self::None => Ok(()),+ Self::MatchesMain => write!(f, "≡"),+ Self::NoCommits => write!(f, "∅"),+ }+ }+}++impl serde::Serialize for BranchState {+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>+ where+ S: serde::Serializer,+ {+ serializer.serialize_str(&self.to_string())+ }+}++/// Git operation in progress+///+/// Represents active rebase or merge operations.+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+pub enum GitOperation {+ /// No git operation in progress+ #[default]+ None,+ /// Rebase in progress+ Rebase,+ /// Merge in progress+ Merge,+}++impl std::fmt::Display for GitOperation {+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {+ match self {+ Self::None => Ok(()),+ Self::Rebase => write!(f, "↻"),+ Self::Merge => write!(f, "⋈"),+ }+ }+}++impl serde::Serialize for GitOperation {+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>+ where+ S: serde::Serializer,+ {+ serializer.serialize_str(&self.to_string())+ }+}+/// Structured status symbols for aligned rendering////// Symbols are categorized to enable vertical alignment in table output:-/// - Position 0: Prefix symbols (=, ≡, ∅, ↻, ⋈, ◇, ⊠, ⚠)-/// - Position 1: Main branch divergence (↑, ↓, or ↕)-/// - Position 2: Remote/upstream divergence (⇡, ⇣, or ⇅)+/// - Position 0a: Conflicts (=)+/// - Position 0b: Branch state (≡, ∅)+/// - Position 0c: Git operation (↻, ⋈)+/// - Position 0d: Worktree attributes (◇, ⊠, ⚠)+/// - Position 1: Main branch divergence (↑, ↓, ↕)+/// - Position 2: Remote/upstream divergence (⇡, ⇣, ⇅)/// - Position 3+: Working tree symbols (?, !, +, », ✘)////// ## Mutual Exclusivity///-/// Symbols within each position may or may not be mutually exclusive:-////// **Mutually exclusive (enforced by type system):**-/// - ↑ vs ↓ vs ↕: Main divergence states (MainDivergence enum)-/// - ⇡ vs ⇣ vs ⇅: Upstream divergence states (UpstreamDivergence enum)-///-/// **Mutually exclusive (not yet type-enforced):**-/// - ≡ vs ∅: Can't both match main AND have no commits-/// - ↻ vs ⋈: Only one git operation at a time+/// - ≡ vs ∅: Branch state (BranchState enum)+/// - ↻ vs ⋈: Git operation (GitOperation enum)+/// - ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)+/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)////// **NOT mutually exclusive (can co-occur):**-/// - = with ↻/⋈: Can have conflicts during rebase/merge+/// - = can occur with any other symbol/// - ◇, ⊠, ⚠: Worktree can be bare+locked, bare+prunable, etc./// - All working tree symbols (?!+»✘): Can have multiple types of changes#[derive(Debug, Clone, Default, serde::Serialize)]pub struct StatusSymbols {- /// Blocking and state symbols: =, ≡, ∅, ↻, ⋈, ◇, ⊠, ⚠- /// Position 0 - NOT mutually exclusive (can combine like "=↻")- prefix: String,+ /// Merge conflicts indicator+ /// Position 0a - Boolean flag (= or empty)+ has_conflicts: bool,++ /// Branch state relative to main+ /// Position 0b - MUTUALLY EXCLUSIVE (enforced by enum)+ branch_state: BranchState,++ /// Git operation in progress+ /// Position 0c - MUTUALLY EXCLUSIVE (enforced by enum)+ git_operation: GitOperation,++ /// Worktree attributes: ◇, ⊠, ⚠+ /// Position 0d - NOT mutually exclusive (can combine like "◇⊠")+ worktree_attrs: String,/// Main branch divergence state/// Position 1 - MUTUALLY EXCLUSIVE (enforced by enum)@@ -487,30 +564,74 @@ impl StatusSymbols {/// Render symbols with full alignment////// Aligns all symbol types at fixed positions:- /// - Position 0: State symbols (=, ≡, ∅, etc.) OR space- /// - Position 1: Main divergence (↑, ↓, or ↕) OR space- /// - Position 2: Upstream divergence (⇡, ⇣, or ⇅) OR space- /// - Position 3+: Working tree symbols (!, +, », ?, ✘)+ /// - Position 0a: Conflicts (= or space)+ /// - Position 0b: Branch state (≡, ∅, or space)+ /// - Position 0c: Git operation (↻, ⋈, or space)+ /// - Position 0d: Worktree attributes (◇⊠⚠ or space)+ /// - Position 1: Main divergence (↑, ↓, ↕, or space)+ /// - Position 2: Upstream divergence (⇡, ⇣, ⇅, or space)+ /// - Position 3+: Working tree symbols (?, !, +, », ✘)////// This ensures vertical scannability - each symbol type appears at the same/// column position across all rows.pub fn render(&self) -> String {- let mut result = String::with_capacity(10);+ let mut result = String::with_capacity(12);- let has_any_content = !self.prefix.is_empty()+ if self.is_empty() {+ return result;+ }++ // Check if we have any symbols after each position (for conditional spacing)+ let has_post_0a = self.branch_state != BranchState::None+ || self.git_operation != GitOperation::None+ || !self.worktree_attrs.is_empty()|| self.main_divergence != MainDivergence::None|| self.upstream_divergence != UpstreamDivergence::None|| !self.working_tree.is_empty();- if !has_any_content {- return result;+ let has_post_0b = self.git_operation != GitOperation::None+ || !self.worktree_attrs.is_empty()+ || self.main_divergence != MainDivergence::None+ || self.upstream_divergence != UpstreamDivergence::None+ || !self.working_tree.is_empty();++ let has_post_0c = !self.worktree_attrs.is_empty()+ || self.main_divergence != MainDivergence::None+ || self.upstream_divergence != UpstreamDivergence::None+ || !self.working_tree.is_empty();++ let has_post_0d = self.main_divergence != MainDivergence::None+ || self.upstream_divergence != UpstreamDivergence::None+ || !self.working_tree.is_empty();++ // Position 0a: Conflicts+ if self.has_conflicts {+ result.push('=');+ } else if has_post_0a {+ result.push(' ');}- // Position 0: Prefix (state symbols)- if self.prefix.is_empty() {+ // Position 0b: Branch state (≡ or ∅)+ let branch_state_str = self.branch_state.to_string();+ if !branch_state_str.is_empty() {+ result.push_str(&branch_state_str);+ } else if has_post_0b {+ result.push(' ');+ }++ // Position 0c: Git operation (↻ or ⋈)+ let git_op_str = self.git_operation.to_string();+ if !git_op_str.is_empty() {+ result.push_str(&git_op_str);+ } else if has_post_0c {+ result.push(' ');+ }++ // Position 0d: Worktree attributes (◇⊠⚠)+ if !self.worktree_attrs.is_empty() {+ result.push_str(&self.worktree_attrs);+ } else if has_post_0d {result.push(' ');- } else {- result.push_str(&self.prefix);}// Position 1: Main divergence (↑, ↓, or ↕)@@ -544,7 +665,10 @@ impl StatusSymbols {/// Check if symbols are emptypub fn is_empty(&self) -> bool {- self.prefix.is_empty()+ !self.has_conflicts+ && self.branch_state == BranchState::None+ && self.git_operation == GitOperation::None+ && self.worktree_attrs.is_empty()&& self.main_divergence == MainDivergence::None&& self.upstream_divergence == UpstreamDivergence::None&& self.working_tree.is_empty()@@ -627,47 +751,43 @@ fn parse_git_status(}}- // Build structured symbols for aligned rendering- let mut symbols = StatusSymbols::default();-- // Conflicts go in prefix (blocking indicator)- if has_conflicts {- symbols.prefix.push('=');- }-- // Main branch divergence - use enum for type safety- symbols.main_divergence = match (main_ahead > 0, main_behind > 0) {- (true, true) => MainDivergence::Diverged, // Both ahead and behind- (true, false) => MainDivergence::Ahead, // Ahead only- (false, true) => MainDivergence::Behind, // Behind only- (false, false) => MainDivergence::None, // Up to date- };-- // Upstream/remote divergence - use enum for type safety- symbols.upstream_divergence = match (upstream_ahead > 0, upstream_behind > 0) {- (true, true) => UpstreamDivergence::Diverged, // Both ahead and behind- (true, false) => UpstreamDivergence::Ahead, // Ahead only- (false, true) => UpstreamDivergence::Behind, // Behind only- (false, false) => UpstreamDivergence::None, // Up to date- };-- // Working tree changes (position 3+)+ // Build working tree string+ let mut working_tree = String::new();if has_untracked {- symbols.working_tree.push('?');+ working_tree.push('?');}if has_modified {- symbols.working_tree.push('!');+ working_tree.push('!');}if has_staged {- symbols.working_tree.push('+');+ working_tree.push('+');}if has_renamed {- symbols.working_tree.push('»');+ working_tree.push('»');}if has_deleted {- symbols.working_tree.push('✘');+ working_tree.push('✘');}+ // Build structured symbols for aligned rendering+ let symbols = StatusSymbols {+ has_conflicts,+ main_divergence: match (main_ahead > 0, main_behind > 0) {+ (true, true) => MainDivergence::Diverged, // Both ahead and behind+ (true, false) => MainDivergence::Ahead, // Ahead only+ (false, true) => MainDivergence::Behind, // Behind only+ (false, false) => MainDivergence::None, // Up to date+ },+ upstream_divergence: match (upstream_ahead > 0, upstream_behind > 0) {+ (true, true) => UpstreamDivergence::Diverged, // Both ahead and behind+ (true, false) => UpstreamDivergence::Ahead, // Ahead only+ (false, true) => UpstreamDivergence::Behind, // Behind only+ (false, false) => UpstreamDivergence::None, // Up to date+ },+ working_tree,+ ..Default::default()+ };+Ok(GitStatusInfo { is_dirty, symbols })}@@ -760,53 +880,46 @@ impl WorktreeInfo {false};- // Build complete status symbols by adding state symbols to prefix+ // Build complete status symbols with type-safe enums// Order: = ≡∅ ↻⋈ ◇⊠⚠ | ↑↓ | ⇡⇣ | ?!+»✘- // ^prefix^ ^main^ ^up^ ^working_tree^+ // ^0a 0b 0c 0d^ ^1^ ^2^ ^3+^let mut symbols = status_info.symbols;// Add merge conflicts indicator if this branch has conflicts with base- // (different from git status conflicts which are already in symbols.prefix)- if has_conflicts && !symbols.prefix.contains('=') {- symbols.prefix.insert(0, '=');+ // (different from git status conflicts which are already in has_conflicts)+ if has_conflicts {+ symbols.has_conflicts = true;}- // Build state symbols to add to prefix- let mut state_symbols = String::new();-- // ≡ matches main (working tree identical to main)- // ∅ no commits (no commits ahead AND clean working tree, AND not matches main)+ // Branch state: ≡ matches main, ∅ no commits (mutually exclusive)if !is_primary {if working_tree_diff_with_main == Some((0, 0)) {- state_symbols.push('≡');+ symbols.branch_state = BranchState::MatchesMain;} else if counts.ahead == 0 && working_tree_diff == (0, 0) {- state_symbols.push('∅');+ symbols.branch_state = BranchState::NoCommits;}}- // ↻ rebase, ⋈ merge (git operations in progress)+ // Git operation: ↻ rebase, ⋈ merge (mutually exclusive)if let Some(state) = &worktree_state {if state.contains("rebase") {- state_symbols.push('↻');+ symbols.git_operation = GitOperation::Rebase;} else if state.contains("merge") {- state_symbols.push('⋈');+ symbols.git_operation = GitOperation::Merge;}}- // ◇ bare, ⊠ locked, ⚠ prunable (worktree attributes)+ // Worktree attributes: ◇ bare, ⊠ locked, ⚠ prunable (can combine)if wt.bare {- state_symbols.push('◇');+ symbols.worktree_attrs.push('◇');}if wt.locked.is_some() {- state_symbols.push('⊠');+ symbols.worktree_attrs.push('⊠');}if wt.prunable.is_some() {- state_symbols.push('⚠');+ symbols.worktree_attrs.push('⚠');}- // Append state symbols to prefix (after any existing conflict marker)- symbols.prefix.push_str(&state_symbols);-// Read user-defined status from git config (worktree-specific or branch-keyed)let user_status = read_user_status(&wt_repo, wt.branch.as_deref());diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex d574d4bec..9d56fca72 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap@@ -12,14 +12,14 @@ info:LC_ALL: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQaBYb5/test-config.toml+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp0c8s5/test-config.toml---success: trueexit_code: 0----- stdout -----Branch Status HEAD± main↕ Path Commit Agefeature ./test-repo.feature 72413a3b 10 months ago-main ∅↓ ↓1 ./test-repo.main 6c3da842 10 months ago+main ∅ ↓ ↓1 ./test-repo.main 6c3da842 10 months ago⚪ Showing 2 worktrees, 1 behind, 1 column hiddendiff --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 a42a89a52..856893507 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAlyKoW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCfJumZ/test-config.toml---success: trueexit_code: 0@@ -57,7 +57,10 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "",+ "has_conflicts": false,+ "branch_state": "",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "","upstream_divergence": "","working_tree": ""@@ -94,14 +97,17 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "",+ "has_conflicts": false,+ "branch_state": "",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "↕","upstream_divergence": "","working_tree": "?!"},"commits_display": "[GREEN]↑2[RESET] [DIM][RED]↓2[RESET]","branch_diff_display": "[GREEN]+1[RESET]",- "status_display": " ↕ ?!",+ "status_display": " ↕ ?!","working_diff_display": "[GREEN]+1[RESET] [RED]-1[RESET]"},{@@ -135,13 +141,16 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "∅",+ "has_conflicts": false,+ "branch_state": "∅",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "↓","upstream_divergence": "","working_tree": ""},"commits_display": "[DIM][RED]↓2[RESET]",- "status_display": "∅↓"+ "status_display": " ∅ ↓"}]diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex d09b1e631..6057d51f5 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAfjdPd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPl6k2G/test-config.toml---success: trueexit_code: 0@@ -57,7 +57,10 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "",+ "has_conflicts": false,+ "branch_state": "",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "","upstream_divergence": "","working_tree": ""@@ -98,12 +101,15 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "≡",+ "has_conflicts": false,+ "branch_state": "≡",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "","upstream_divergence": "","working_tree": ""},- "status_display": "≡"+ "status_display": " ≡"},{"type": "worktree",@@ -140,12 +146,15 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "≡⊠",+ "has_conflicts": false,+ "branch_state": "≡",+ "git_operation": "",+ "worktree_attrs": "⊠","main_divergence": "","upstream_divergence": "","working_tree": ""},- "status_display": "≡⊠"+ "status_display": " ≡ ⊠"}]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 92b69d913..aba3c8eee 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqBB1rp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbITas5/test-config.toml---success: trueexit_code: 0@@ -57,7 +57,10 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "",+ "has_conflicts": false,+ "branch_state": "",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "","upstream_divergence": "","working_tree": ""@@ -98,13 +101,16 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "≡",+ "has_conflicts": false,+ "branch_state": "≡",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "","upstream_divergence": "","working_tree": ""},"user_status": "🔧",- "status_display": "≡🔧"+ "status_display": " ≡🔧"},{"type": "worktree",@@ -141,12 +147,15 @@ exit_code: 0"pr_status": null,"has_conflicts": false,"status_symbols": {- "prefix": "≡",+ "has_conflicts": false,+ "branch_state": "≡",+ "git_operation": "",+ "worktree_attrs": "","main_divergence": "","upstream_divergence": "","working_tree": ""},- "status_display": "≡"+ "status_display": " ≡"}]diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex f8b17bf57..bf6c857e9 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -15,17 +15,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUp8l8d/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVN36Kl/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[36mmain [0m [36m./test-repo [0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago [0m [2mCommit at 01:00[0m-feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago [0m [2mCommit at 03:00[0m-feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago [0m [2mCommit at 02:00[0m-feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago [0m [2mCommit at 00:30[0m+[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago [0m [2mCommit at 01:00[0m+feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago [0m [2mCommit at 03:00[0m+feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago [0m [2mCommit at 02:00[0m+feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago [0m [2mCommit at 00:30[0m⚪ [2mShowing 5 worktrees, 4 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 26a39f857..366280222 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@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFYLour/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvtMChv/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mdevelop [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m ≡ [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m ≡ [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[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 f42012f7a..49c22269e 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsY0W6k/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOCDTsO/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked-no-reason[0m ≡⊠ [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked-no-reason[0m ≡ ⊠ [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[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 d71ceaa26..4b00b71e2 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE4bhkY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpebk8cU/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked-feature[0m ≡⊠ [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked-feature[0m ≡ ⊠ [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[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 1719c3675..e7eeb94e8 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplqfhqe/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKQlDO1/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m-[2mfeature-a[0m ∅↓ [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should test how the...[0m+[2mfeature-a[0m ∅ ↓ [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should test how the...[0m⚪ [2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 630801f9f..e260325de 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -15,17 +15,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyknZhP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRiHv5l/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmedium-name [0m ≡ [2m./medium-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mshort [0m ≡ [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mvery-long-branch-name-here[0m ≡ [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mwith-changes [0m ≡ [2m./with-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmedium-name [0m ≡ [2m./medium-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mshort [0m ≡ [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mvery-long-branch-name-here[0m ≡ [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mwith-changes [0m ≡ [2m./with-changes [0m [2mb834638e[0m [2m10 months ago[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 8f32997d1..26bd50b7a 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4zU27l/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJfdWWQ/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m ≡ [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m ≡ [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex bf8f01887..e82ca8412 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZMUNzJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS0GJoS/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m-[2mfeature-test[0m ∅↓ [2m[31m↓1[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m+[2mfeature-test[0m ∅ ↓ [2m[31m↓1[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m⚪ [2mShowing 2 worktrees, 1 behind[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 021eadac1..163eca588 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@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcgru4Y/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx9I4mh/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2memoji [0m ≡🔄 [2m./emoji [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmulti [0m ≡👨💻 [2m./multi [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2memoji [0m ≡🔄 [2m./emoji [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmulti [0m ≡👨💻 [2m./multi [0m [2mb834638e[0m [2m10 months ago[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 b6ddbb4e7..490ca655d 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -16,14 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpexsbOA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp16jQIn/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-with-worktree [0m ≡ [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-with-worktree [0m ≡ [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2manother-branch [0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfeature-without-worktree[0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfix-bug [0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[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 cc4532ded..43710d63d 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@@ -16,15 +16,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptOGVK9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpItc8fM/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m ≡ [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m ≡ [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex ec5295dc0..e74b0e1b3 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -17,18 +17,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp45lYCx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptaKMqr/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath [0m [1mRemote↕[0m [1mCI[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-ahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m-[2mbehind [0m ≡ ⇣ [2m./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-diverged ↑⇅ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m-[2min-sync [0m ≡ [2m./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[2mno-upstream[0m ≡ [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m+[2mbehind [0m ≡ ⇣ [2m./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+diverged ↑⇅ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m+[2min-sync [0m ≡ [2m./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2mno-upstream[0m ≡ [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[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 a5143ba6c..7723f8834 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap@@ -15,17 +15,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSlVINa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4HxXlx/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mclean-no-status [0m ≡ [2m./clean-no-status [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mclean-with-status[0m ≡⏸️ [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-dirty-no-status ! [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mdirty-with-status[0m ≡ ?🤖 [2m./dirty-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mclean-no-status [0m ≡ [2m./clean-no-status [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mclean-with-status[0m ≡⏸️ [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+dirty-no-status ! [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mdirty-with-status[0m ≡ ?🤖 [2m./dirty-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 5 worktrees, 1 with changes[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 1a33b7384..948b6b7f6 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@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSGpBh2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkaVyXm/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m-[2mfeature[0m ≡ [2m./feature [0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m+[2mfeature[0m ≡ [2m./feature [0m [SHA] [2m10 months ago[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 fb143ad78..f47b71560 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@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZSvZRx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEx8TAY/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2malso-no-changes[0m ≡ [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mno-changes [0m ≡ [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-with-changes ! [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2malso-no-changes[0m ≡ [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mno-changes [0m ≡ [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+with-changes ! [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[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 5ba98c469..4a8dbac7f 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@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph3eUfq/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCLkMmE/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mhuge [0m ≡ ? [2m./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-tiny ! [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mhuge [0m ≡ ? [2m./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+tiny ! [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[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 f90bb5ea8..9c6e04889 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@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwQwohH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg3s0bf/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-large [0m ≡ ? [2m./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-medium[0m ≡ ? [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-small [0m ≡ ? [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-large [0m ≡ ? [2m./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-medium[0m ≡ ? [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-small [0m ≡ ? [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[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 78620dd23..af7477a4f 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@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVsPsec/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHmvr2O/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2manother-extremely-long-name-here[0m ≡ [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mshort [0m ≡ [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mvery-long-feature-branch-name [0m ≡ [2m./very-long-feature-branch-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2manother-extremely-long-name-here[0m ≡ [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mshort [0m ≡ [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mvery-long-feature-branch-name [0m ≡ [2m./very-long-feature-branch-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[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 619f479c1..780b271e3 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@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVYD5U5/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpL0U48b/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlong [0m ≡ [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmedium[0m ≡ [2m./medium-length-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mx [0m ≡ [2m./x [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlong [0m ≡ [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmedium[0m ≡ [2m./medium-length-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mx [0m ≡ [2m./x [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[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 ddaccdaeb..114f68b10 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@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkf2RA5/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvhLesb/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2ma [0m ≡ [2m./a [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbb [0m ≡ [2m./bb [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mccc [0m ≡ [2m./ccc [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2ma [0m ≡ [2m./a [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbb [0m ≡ [2m./bb [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mccc [0m ≡ [2m./ccc [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snapindex 0977db957..444bbb3a8 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPJAlvx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWXVUAD/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-a[0m ≡ [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-b[0m ≡ [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-a[0m ≡ [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-b[0m ≡ [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snapindex 291874552..16d020348 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp65ZXrp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLTsKQ3/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-a[0m ≡ [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-b[0m ≡ [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-a[0m ≡ [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-b[0m ≡ [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snapindex 27e58ecf4..f6ebe4ea1 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmzs03v/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZFoKlA/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with...[0m-[2mfeature-a[0m ≡ [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with...[0m-[2mfeature-b[0m ≡ [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with...[0m+[2mfeature-a[0m ≡ [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with...[0m+[2mfeature-b[0m ≡ [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with...[0m⚪ [2mShowing 3 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 357cedb02..4ffc8218c 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@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa1jWxK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptmS2j8/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath [0m [1mRemote↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mcafe [0m ≡ [2m./café [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnaive [0m ≡ [2m./naïve [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mresume[0m ≡ [2m./résumé [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mcafe [0m ≡ [2m./café [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mnaive [0m ≡ [2m./naïve [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mresume[0m ≡ [2m./résumé [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0m