Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Optimize Status column width for list command
Maximilian Roos6bd0cc36d75a
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex fe166e929..8ea9c731a 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -214,6 +214,7 @@ pub struct DiffWidths {pub deleted_digits: usize, // Second part: - for diffs, ↓ for arrows}+#[derive(Clone, Debug)]pub struct ColumnWidths {pub branch: usize,pub status: usize,@@ -239,6 +240,14 @@ pub struct ColumnDataFlags {pub ci_status: bool,}+/// Layout metadata including position mask for Status column+#[derive(Clone, Debug)]+pub struct LayoutMetadata {+ pub widths: ColumnWidths,+ pub data_flags: ColumnDataFlags,+ pub status_position_mask: super::model::PositionMask,+}+const EMPTY_PENALTY: u8 = 10;fn column_has_data(kind: ColumnKind, flags: &ColumnDataFlags) -> bool {@@ -296,6 +305,7 @@ pub struct LayoutConfig {pub common_prefix: PathBuf,pub max_message_len: usize,pub hidden_nonempty_count: usize,+ pub status_position_mask: super::model::PositionMask,}#[derive(Clone, Copy, Debug)]@@ -366,13 +376,9 @@ fn ideal_for_column(}}-pub fn calculate_column_widths(- items: &[ListItem],- fetch_ci: bool,-) -> (ColumnWidths, ColumnDataFlags) {+pub fn calculate_column_widths(items: &[ListItem], fetch_ci: bool) -> LayoutMetadata {// Track maximum data widths (headers are enforced via fit_header() later)let mut max_branch = 0;- let mut max_status = 0;let mut max_user_status = 0;let mut max_time = 0;let mut max_message = 0;@@ -389,6 +395,9 @@ pub fn calculate_column_widths(let mut max_upstream_ahead_digits = 0;let mut max_upstream_behind_digits = 0;+ // Track which status positions are used across all items+ let mut status_position_mask = super::model::PositionMask::default();+for item in items {let commit = item.commit_details();let counts = item.counts();@@ -402,8 +411,9 @@ pub fn calculate_column_widths(// Status column: git status symbols (worktrees only)// User status column: user-defined status (worktrees and branches)if let Some(info) = worktree_info {- let git_status_width = info.status_symbols.render().width();- max_status = max_status.max(git_status_width);+ // Collect position usage from this item's status symbols+ let item_mask = super::model::PositionMask::from_symbols(&info.status_symbols);+ status_position_mask.merge(&item_mask);if let Some(ref user_status) = info.user_status {max_user_status = max_user_status.max(user_status.width());@@ -474,6 +484,22 @@ pub fn calculate_column_widths(max_upstream_behind_digits,);+ // Calculate Status column width based on position mask+ // Now that we know which positions are used, calculate max width with selective rendering+ let max_status = items+ .iter()+ .filter_map(|item| item.worktree_info())+ .map(|info| {+ info.status_symbols+ .render_with_mask(&status_position_mask)+ .width()+ })+ .max()+ .unwrap_or(0);++ // For Status column: always enforce minimum width to fit header+ // Selective rendering narrows the column by eliminating unused positions,+ // but the column must still be wide enough for the "Status" header textlet has_status_data = max_status > 0;let final_status = fit_header(HEADER_STATUS, max_status);@@ -508,7 +534,11 @@ pub fn calculate_column_widths(ci_status: has_ci_status,};- (widths, data_flags)+ LayoutMetadata {+ widths,+ data_flags,+ status_position_mask,+ }}/// Calculate responsive layout based on terminal width@@ -525,7 +555,10 @@ pub fn calculate_responsive_layout(let common_prefix = find_common_prefix(&paths);// Calculate ideal column widths and track which columns have data- let (ideal_widths, data_flags) = calculate_column_widths(items, fetch_ci);+ let metadata = calculate_column_widths(items, fetch_ci);+ let ideal_widths = metadata.widths;+ let data_flags = metadata.data_flags;+ let status_position_mask = metadata.status_position_mask;// Calculate actual maximum path width (after common prefix removal)let path_data_width = items@@ -669,6 +702,7 @@ pub fn calculate_responsive_layout(common_prefix,max_message_len,hidden_nonempty_count,+ status_position_mask,}}@@ -717,8 +751,8 @@ mod tests {working_diff_display: None,};- let (widths, _data_flags) =- calculate_column_widths(&[super::ListItem::Worktree(info1)], false);+ let metadata = calculate_column_widths(&[super::ListItem::Worktree(info1)], false);+ let widths = metadata.widths;// "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, header "main↕" is also 5assert_eq!(diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex df362becd..cfa52ce3a 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -492,6 +492,59 @@ impl serde::Serialize for GitOperation {}}+/// Tracks which status symbol positions are actually used across all items+///+/// This allows the Status column to only allocate space for positions that+/// have data, rather than reserving space for all possible positions.+///+/// Uses a bit array for compact representation (7 positions = 7 bits).+#[derive(Debug, Clone, Copy, Default)]+pub struct PositionMask {+ /// Bit array: [0a, 0b, 0c, 0d, 1, 2, 3]+ positions: [bool; 7],+}++impl PositionMask {+ const POS_0A_CONFLICTS: usize = 0;+ const POS_0B_BRANCH_STATE: usize = 1;+ const POS_0C_GIT_OPERATION: usize = 2;+ const POS_0D_WORKTREE_ATTRS: usize = 3;+ const POS_1_MAIN_DIVERGENCE: usize = 4;+ const POS_2_UPSTREAM_DIVERGENCE: usize = 5;+ const POS_3_WORKING_TREE: usize = 6;++ /// Full mask with all positions enabled (for JSON output)+ pub const FULL: Self = Self {+ positions: [true; 7],+ };++ /// Create a mask from a StatusSymbols instance+ pub fn from_symbols(symbols: &StatusSymbols) -> Self {+ let mut positions = [false; 7];+ positions[Self::POS_0A_CONFLICTS] = symbols.has_conflicts;+ positions[Self::POS_0B_BRANCH_STATE] = symbols.branch_state != BranchState::None;+ positions[Self::POS_0C_GIT_OPERATION] = symbols.git_operation != GitOperation::None;+ positions[Self::POS_0D_WORKTREE_ATTRS] = !symbols.worktree_attrs.is_empty();+ positions[Self::POS_1_MAIN_DIVERGENCE] = symbols.main_divergence != MainDivergence::None;+ positions[Self::POS_2_UPSTREAM_DIVERGENCE] =+ symbols.upstream_divergence != UpstreamDivergence::None;+ positions[Self::POS_3_WORKING_TREE] = !symbols.working_tree.is_empty();+ Self { positions }+ }++ /// Merge this mask with another, keeping positions that are used in either+ pub fn merge(&mut self, other: &Self) {+ for (i, &other_val) in other.positions.iter().enumerate() {+ self.positions[i] |= other_val;+ }+ }++ /// Check if a position is included in the mask+ fn includes(&self, pos: usize) -> bool {+ self.positions[pos]+ }+}+/// Structured status symbols for aligned rendering////// Symbols are categorized to enable vertical alignment in table output:@@ -547,9 +600,18 @@ pub struct StatusSymbols {}impl StatusSymbols {- /// Render symbols with full alignment+ /// Render symbols with full alignment (all positions)+ ///+ /// This is used for the display fields in JSON output.+ /// For table rendering with selective positions, use `render_with_mask()`.+ pub fn render(&self) -> String {+ self.render_with_mask(&PositionMask::FULL)+ }++ /// Render symbols with selective alignment based on position mask///- /// Aligns all symbol types at fixed positions:+ /// Aligns all symbol types at fixed positions, but only includes positions+ /// that are present in the mask:/// - Position 0a: Conflicts (= or space)/// - Position 0b: Branch state (≡, ∅, or space)/// - Position 0c: Git operation (↻, ⋈, or space)@@ -559,93 +621,71 @@ impl StatusSymbols {/// - 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 {+ /// column position across all rows, while minimizing wasted space.+ pub fn render_with_mask(&self, mask: &PositionMask) -> String {let mut result = String::with_capacity(12);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();-- 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 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(' ');- }-- // Position 1: Main divergence (↑, ↓, or ↕)- let main_str = self.main_divergence.to_string();- if !main_str.is_empty() {- result.push_str(&main_str);- } else {- // Only add space if we have upstream or working_tree symbols- if self.upstream_divergence != UpstreamDivergence::None || !self.working_tree.is_empty()- {- result.push(' ');+ // Build list of (position_index, content, has_data) tuples+ let positions_data = [+ (+ PositionMask::POS_0A_CONFLICTS,+ if self.has_conflicts { "=" } else { "" },+ self.has_conflicts,+ ),+ (+ PositionMask::POS_0B_BRANCH_STATE,+ &self.branch_state.to_string(),+ self.branch_state != BranchState::None,+ ),+ (+ PositionMask::POS_0C_GIT_OPERATION,+ &self.git_operation.to_string(),+ self.git_operation != GitOperation::None,+ ),+ (+ PositionMask::POS_0D_WORKTREE_ATTRS,+ &self.worktree_attrs,+ !self.worktree_attrs.is_empty(),+ ),+ (+ PositionMask::POS_1_MAIN_DIVERGENCE,+ &self.main_divergence.to_string(),+ self.main_divergence != MainDivergence::None,+ ),+ (+ PositionMask::POS_2_UPSTREAM_DIVERGENCE,+ &self.upstream_divergence.to_string(),+ self.upstream_divergence != UpstreamDivergence::None,+ ),+ (+ PositionMask::POS_3_WORKING_TREE,+ &self.working_tree,+ !self.working_tree.is_empty(),+ ),+ ];++ // Render each position that's included in the mask (without allocating Vec)+ for (i, (pos, content, has_data)) in positions_data.iter().enumerate() {+ if !mask.includes(*pos) {+ continue; // Skip positions not in mask}- }- // Position 2: Upstream divergence (⇡, ⇣, or ⇅)- let upstream_str = self.upstream_divergence.to_string();- if !upstream_str.is_empty() {- result.push_str(&upstream_str);- } else {- // Only add space if we have working_tree symbols- if !self.working_tree.is_empty() {- result.push(' ');+ // Check if any later position (that's included in mask) has data+ let has_content_after = positions_data[(i + 1)..]+ .iter()+ .any(|(later_pos, _, later_has_data)| mask.includes(*later_pos) && *later_has_data);++ if *has_data {+ result.push_str(content);+ } else if has_content_after {+ result.push(' '); // Spacing for alignment}}- // Position 3+: Working tree symbols- result.push_str(&self.working_tree);-result}diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex bd8c23142..a9adbd735 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -209,7 +209,10 @@ pub fn format_header_line(layout: &LayoutConfig) {let is_last = i == layout.columns.len() - 1;let header_start = line.width();- line.push_styled(column.header.to_string(), style);+ // Only render non-empty headers to avoid visual artifacts from styled empty strings+ if !column.header.is_empty() {+ line.push_styled(column.header.to_string(), style);+ }if !is_last {line.pad_to(header_start + column.width);@@ -313,7 +316,10 @@ pub fn format_list_item_line((ColumnKind::Status, _) => {// Git status symbols only (no user-defined status)if let Some(info) = worktree_info {- let git_status = info.status_symbols.render();+ // Render git status symbols with position mask+ let git_status = info+ .status_symbols+ .render_with_mask(&layout.status_position_mask);let status_start = line.width();// Status column never inherits row colordiff --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 30bec7769..5a2fecad2 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@@ -14,14 +14,14 @@ info:LC_ALL: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdVovT7/test-config.toml+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpllqSg0/test-config.toml---success: trueexit_code: 0----- stdout -----Branch Status HEAD± main↕ Path Remote↕ Commit Age Messagefeature ./test-repo.feature 72413a3b 10 months ago Work on feature-main ∅ ↓ ↓1 ./test-repo.main 6c3da842 10 months ago Initial commit on main+main ∅↓ ↓1 ./test-repo.main 6c3da842 10 months ago Initial commit on main⚪ Showing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snapindex 0e6b47f38..897757e03 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRXxM1r/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXHPHLU/test-config.toml---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snapindex 2bdcc791e..8fdae05c7 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoJOgio/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX8e3VE/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1m[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote↕[0m [1mCommit[0m [1mAge[0m [1mMessage[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote↕[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m 🏠 [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mbranch-only[0m 🌿 [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 8b813a220..f732260b9 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWdVbzD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaLlst9/test-config.toml---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 0233c7e25..6df4229a3 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/.tmpybO5k3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdmj7PL/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 08b3998c2..0d7ce587c 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/.tmpSg5Jbh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpW3oaUM/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 55cbb6cad..1a10ac0f1 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/.tmpdSqKUl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHmj94V/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 c8387af06..0f7eec760 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/.tmpjlYXTK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3gMtDy/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 01c4d7a6a..a58374474 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/.tmpTnj240/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXJPOIJ/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[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 0bd207ecf..c2b943569 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/.tmpc1p6ui/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe9t7f7/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 221caec42..e907f73c9 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/.tmpZtdqHh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplmS4IS/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__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 79fb846d6..253e4f691 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHJAtx9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfvklCh/test-config.toml---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 36e65dafe..04eb4833f 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/.tmp40cmmH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUkHGgN/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[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 64ce9b08a..578eb6dee 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/.tmpz8bd4m/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3HzMp0/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1m[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote↕[0m [1mCommit[0m [1mAge[0m [1mMessage[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-[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 2cc8f34a2..e03175fde 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/.tmp2zlR7z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphTKRJG/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 ccd38ee89..c169f9ea0 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/.tmpAeVNH0/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCm8FkZ/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_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snapindex 49fb88b94..f1e303e00 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHJD6VJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYPRv8S/test-config.toml---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex d749b6657..3ce360740 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/.tmpYC2mEF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7iO4Uu/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 d41902ae6..b7904f63c 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/.tmpTwICoU/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoGW0OT/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1m[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 0c74ee603..1bd2b1145 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/.tmp8s96uL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxfBHVp/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__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snapindex 0f991358f..0cfe14899 100644--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMvLZSx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkcUHm4/test-config.toml---success: trueexit_code: 0diff --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 85a520c59..72eaf6cf3 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/.tmpOWIvjQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVrIGlf/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 bbc569f10..5fd3fa674 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/.tmpiKG71I/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxGgjcg/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 cb37d9f81..d169bc98e 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/.tmpTtJ7zr/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHfrH3M/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 6443739f7..bd1d4a8e7 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/.tmpldRIzz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1ihMSr/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 abe6b75a2..4eda12938 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/.tmpbX8BzY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphMYBVd/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 e2e4eeb49..b0f6a2bc8 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/.tmpP1gIXm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDOlrgX/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__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snapindex 7aca87780..56a97d23e 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/.tmpQWWUFK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphlzQuH/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