Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Deprioritize Path column when paths match naming template (#225)
Maximilian Roosdcb855f720eb
diff --git a/docs/content/list.md b/docs/content/list.mdindex fabe7180d..dff617d0a 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -36,10 +36,10 @@ Include CI status and line diffs:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list --full</span>- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span>-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span>-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span>+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>+^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened…</span>++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>{% end %}@@ -52,12 +52,12 @@ Include branches that don't have worktrees:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list --branches --full</span>- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span>-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span>-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span>- exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>99e114de</span> <span class=d>2d</span>- wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>d62fd0e8</span> <span class=d>3d</span>+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>+^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened…</span>++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>+ exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>99e114de</span> <span class=d>2d</span> <span class=d>Add GraphQL resolvers…</span>+ wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>d62fd0e8</span> <span class=d>3d</span> <span class=d>Start API documentation</span>⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>{% end %}diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex 055f64f21..8792868e4 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -854,7 +854,7 @@ pub fn collect(let final_msg = super::format_summary_message(&all_items,show_branches || show_remotes,- layout.hidden_nonempty_count,+ layout.hidden_column_count,);if table.is_tty() {@@ -882,7 +882,7 @@ pub fn collect(let final_msg = super::format_summary_message(&all_items,show_branches || show_remotes,- layout.hidden_nonempty_count,+ layout.hidden_column_count,);crate::output::table(layout.format_header_line())?;diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex 74c342026..95d06cd9b 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -88,6 +88,19 @@//! - Narrow terminals: Data columns + message (hide empty columns)//! - Wide terminals: Data columns + message + empty columns (visual consistency)//!+//! ## Limitation: Progressive Mode+//!+//! The empty penalty system requires knowing whether columns have data, but progressive rendering+//! computes layout before data arrives. Currently we assume most columns have data (optimistic),+//! which means empty penalties don't apply in progressive mode.+//!+//! Exceptions that we can compute instantly from items:+//! - `path`: true only if any worktree has `path_mismatch` (computed from items)+//! - `branch_diff`/`ci_status`: false if their required task is skipped+//!+//! Other columns (status, working_diff, ahead_behind, upstream) require expensive git operations,+//! so we assume they have data until proven otherwise.+//!//! ## Special Cases//!//! Three columns have non-standard behavior that extends beyond the basic two-tier model:@@ -263,6 +276,7 @@ pub struct ColumnDataFlags {pub branch_diff: bool,pub upstream: bool,pub ci_status: bool,+ pub path: bool, // True if any worktree has path_mismatch (path doesn't match template)}/// Layout metadata including position mask for Status column@@ -316,7 +330,7 @@ impl ColumnKind {ColumnKind::WorkingDiff => flags.working_diff,ColumnKind::AheadBehind => flags.ahead_behind,ColumnKind::BranchDiff => flags.branch_diff,- ColumnKind::Path => true,+ ColumnKind::Path => flags.path,ColumnKind::Upstream => flags.upstream,ColumnKind::Time => true,ColumnKind::CiStatus => flags.ci_status,@@ -379,7 +393,7 @@ pub struct LayoutConfig {pub columns: Vec<ColumnLayout>,pub common_prefix: PathBuf,pub max_message_len: usize,- pub hidden_nonempty_count: usize,+ pub hidden_column_count: usize,pub status_position_mask: super::model::PositionMask,}@@ -438,7 +452,11 @@ struct PendingColumn<'a> {/// Uses generous fixed allocations for expensive-to-compute columns (status, diffs, time, CI)/// that handle overflow with compact notation (K suffix). This provides consistent layout/// without requiring a data scan.-fn build_estimated_widths(max_branch: usize, skip_tasks: &HashSet<TaskKind>) -> LayoutMetadata {+fn build_estimated_widths(+ max_branch: usize,+ skip_tasks: &HashSet<TaskKind>,+ has_path_mismatch: bool,+) -> LayoutMetadata {// Fixed widths for slow columns (require expensive git operations)// Values exceeding these widths use compact notation (K suffix)//@@ -452,8 +470,13 @@ fn build_estimated_widths(max_branch: usize, skip_tasks: &HashSet<TaskKind>) ->let age_estimate = 4; // "11mo" (short format)let ci_estimate = fit_header(HEADER_CI, 1); // Single indicator symbol- // Assume columns will have data (better to show and hide than to not show)- // Columns whose required task is skipped won't have data+ // Assume columns will have data (better to show and hide than to not show).+ // This is a limitation of progressive mode - we can't know which columns have data+ // before the data arrives, so empty penalties don't apply properly.+ //+ // Exceptions that we can compute instantly from items:+ // - path: true only if any worktree has path_mismatch (path doesn't match template)+ // - branch_diff/ci_status: false if their required task is skippedlet data_flags = ColumnDataFlags {status: true,working_diff: true,@@ -461,6 +484,7 @@ fn build_estimated_widths(max_branch: usize, skip_tasks: &HashSet<TaskKind>) ->branch_diff: !skip_tasks.contains(&TaskKind::BranchDiff),upstream: true,ci_status: !skip_tasks.contains(&TaskKind::CiStatus),+ path: has_path_mismatch,};let widths = ColumnWidths {@@ -543,7 +567,6 @@ fn allocate_columns_with_priority(.collect();const MIN_MESSAGE: usize = 20;- const PREFERRED_MESSAGE: usize = 50;const MAX_MESSAGE: usize = 100;let mut pending: Vec<PendingColumn> = Vec::new();@@ -564,10 +587,11 @@ fn allocate_columns_with_priority(let available = remaining - spacing_cost;let mut message_width = 0;- if available >= PREFERRED_MESSAGE {- message_width = PREFERRED_MESSAGE.min(metadata.widths.message);- } else if available >= MIN_MESSAGE {- message_width = available.min(metadata.widths.message);+ // Allocate at minimum width initially. Post-allocation expansion will+ // bring it up to preferred/max width after empty columns have a chance+ // to be allocated.+ if available >= MIN_MESSAGE {+ message_width = MIN_MESSAGE.min(metadata.widths.message);}if message_width > 0 {@@ -647,19 +671,20 @@ fn allocate_columns_with_priority(});}- // Count how many non-empty columns were hidden (not allocated)+ // Count how many columns were hidden (not allocated).+ // This includes both data columns and empty columns that could show with more width.let allocated_kinds: std::collections::HashSet<_> =columns.iter().map(|col| col.kind).collect();- let hidden_nonempty_count = candidates_with_data+ let hidden_column_count = candidates_with_data.iter()- .filter(|(kind, has_data)| !allocated_kinds.contains(kind) && *has_data)+ .filter(|(kind, _has_data)| !allocated_kinds.contains(kind)).count();LayoutConfig {columns,common_prefix,max_message_len,- hidden_nonempty_count,+ hidden_column_count,status_position_mask: metadata.status_position_mask,}}@@ -726,8 +751,15 @@ pub fn calculate_layout_with_width(.unwrap_or(0);let max_path_width = fit_header(HEADER_PATH, path_data_width);+ // Check if any worktree has a path that doesn't match the expected template.+ // Path column is only useful when there's a mismatch; otherwise it's redundant with branch.+ let has_path_mismatch = items+ .iter()+ .filter_map(|item| item.worktree_data())+ .any(|data| data.path_mismatch);+// Build pre-allocated width estimates (same as buffered mode)- let metadata = build_estimated_widths(max_branch, skip_tasks);+ let metadata = build_estimated_widths(max_branch, skip_tasks, has_path_mismatch);let commit_width = fit_header(HEADER_COMMIT, COMMIT_HASH_WIDTH);@@ -796,6 +828,7 @@ mod tests {branch_diff: true,upstream: true,ci_status: true,+ path: true,};let all_false = ColumnDataFlags {status: false,@@ -804,12 +837,12 @@ mod tests {branch_diff: false,upstream: false,ci_status: false,+ path: false,};// Always-have-data columnsassert!(ColumnKind::Gutter.has_data(&all_false));assert!(ColumnKind::Branch.has_data(&all_false));- assert!(ColumnKind::Path.has_data(&all_false));assert!(ColumnKind::Time.has_data(&all_false));assert!(ColumnKind::Commit.has_data(&all_false));assert!(ColumnKind::Message.has_data(&all_false));@@ -827,6 +860,8 @@ mod tests {assert!(!ColumnKind::Upstream.has_data(&all_false));assert!(ColumnKind::CiStatus.has_data(&all_true));assert!(!ColumnKind::CiStatus.has_data(&all_false));+ assert!(ColumnKind::Path.has_data(&all_true));+ assert!(!ColumnKind::Path.has_data(&all_false));}#[test]@@ -957,7 +992,8 @@ mod tests {fn test_pre_allocated_width_estimates() {// Test that build_estimated_widths() returns correct pre-allocated estimates// Empty skip set means all tasks are computed (equivalent to --full)- let metadata = build_estimated_widths(20, &HashSet::new());+ // has_path_mismatch=true to test the path flag is passed through+ let metadata = build_estimated_widths(20, &HashSet::new(), true);let widths = metadata.widths;// Line diffs (Signs variant: +/-) allocate 3 digits for 100-999 rangediff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex f1085d640..f1821a615 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -354,7 +354,7 @@ impl SummaryMetrics {pub(crate) fn format_summary_message(items: &[ListItem],show_branches: bool,- hidden_nonempty_count: usize,+ hidden_column_count: usize,) -> String {use anstyle::Style;use worktrunk::styling::INFO_EMOJI;@@ -362,7 +362,7 @@ pub(crate) fn format_summary_message(let metrics = SummaryMetrics::from_items(items);let dim = Style::new().dimmed();let summary = metrics- .summary_parts(show_branches, hidden_nonempty_count)+ .summary_parts(show_branches, hidden_column_count).join(", ");format!("{INFO_EMOJI} {dim}Showing {summary}{dim:#}")}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snapindex 6e2ffcbf0..dfdfaf837 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap@@ -3,10 +3,10 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog-> @ main ^ ./repo ..│- + feature-one _ ./repo.feat..│⚪ main has no uncommitted changes- + feature-two _ ./repo.feat..│+ Branch Status HEAD± main↕ Remote⇅ Comm│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog+> @ main ^ a1..│+ + feature-one _ a1..│⚪ main has no uncommitted changes+ + feature-two _ a1..││││diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snapindex 804f919b5..74762f291 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog-> + feature ↑ ↑5 ./repo.feature ..│+ Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog+> + feature ↑ ↑5 a7f9eb..││* a7f9ebb +1 1d (feature) Add file 5 with content│* cd19d36 +1 1d Add file 4 with content│* 17c13c5 +1 1d Add file 3 with contentdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snapindex 163918e36..5c0b49930 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog-> + feature ↑ ↑2 ./repo.feature ..│+ Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog+> + feature ↑ ↑2 b03ed3..││ feature_code.rs | 6 ++++++│ tests.rs | 4 ++++│ 2 files changed, 10 insertions(+)diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snapindex 52438832b..7b1d43721 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog-> + feature ! ↑ +3 -1 ↑1 ./repo.feature ..│+ Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog+> + feature ! ↑ +3 -1 ↑1 ef7f61..││ tracked.txt | 4 +++-│ 1 file changed, 3 insertions(+), 1 deletion(-)│diff --git a/tracked.txt b/tracked.txtdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snapindex 8735a3351..abdd4801a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap@@ -3,10 +3,10 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog-> @ main ^ ./repo │- + active-worktree _ ./repo...│⚪ main has no uncommitted changes- orphan-branch /_ │+ Branch Status HEAD± main↕ Remote⇅ │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog+> @ main ^ ..│+ + active-worktree _ ..│⚪ main has no uncommitted changes+ orphan-branch /_ ..││││diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snapindex 35df6f87c..4d3664a40 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap@@ -29,11 +29,11 @@ exit_code: 0----- stdout ---------- stderr ------ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge-@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2mec97decc[0m [2m30m-^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m6088adb3[0m [2m4d-+ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m127407de[0m [2m5h- exp [2m/[22m[2m↕[22m [32m↑2[0m [2m[31m↓1[0m [32m+137[0m [2m99e114de[0m [2m2d- wip [2m/[22m[2m↕[22m [32m↑1[0m [2m[31m↓1[0m [32m+33[0m [2md62fd0e8[0m [2m3d+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage+@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [32m⇡3[0m [2m[34m●[0m [2mec97decc[0m [2m30m[0m [2mAdd API tests+^ main [2m^[22m[2m⇅[22m [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m6088adb3[0m [2m4d[0m [2mMerge fix-auth: hardened…++ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m [2m|[0m [32m●[0m [2m127407de[0m [2m5h[0m [2mAdd secure token storage+ exp [2m/[22m[2m↕[22m [32m↑2[0m [2m[31m↓1[0m [32m+137[0m [2m99e114de[0m [2m2d[0m [2mAdd GraphQL resolvers…+ wip [2m/[22m[2m↕[22m [32m↑1[0m [2m[31m↓1[0m [32m+33[0m [2md62fd0e8[0m [2m3d[0m [2mStart API documentation⚪ [2mShowing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snapindex 64aad8b6c..eef45fb78 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap@@ -28,9 +28,9 @@ exit_code: 0----- stdout ---------- stderr ------ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge-@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2mec97decc[0m [2m30m-^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m6088adb3[0m [2m4d-+ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m127407de[0m [2m5h+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage+@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [32m⇡3[0m [2m[34m●[0m [2mec97decc[0m [2m30m[0m [2mAdd API tests+^ main [2m^[22m[2m⇅[22m [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m6088adb3[0m [2m4d[0m [2mMerge fix-auth: hardened…++ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m [2m|[0m [32m●[0m [2m127407de[0m [2m5h[0m [2mAdd secure token storage⚪ [2mShowing 3 worktrees, 1 with changes, 2 ahead, 1 column hiddendiff --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 7e92c4209..01da47dd5 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@@ -27,10 +27,10 @@ exit_code: 0----- stdout ---------- stderr ------ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge-@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d-+ [2manother-extremely-long-name-here[0m [2m_[22m [2m./repo.another-extremely-long-name-here[0m [2ma1e809f5[0m [2m1d-+ [2mshort[0m [2m_[22m [2m./repo.short[0m [2ma1e809f5[0m [2m1d-+ [2mvery-long-feature-branch-name[0m [2m_[22m [2m./repo.very-long-feature-branch-name[0m [2ma1e809f5[0m [2m1d+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage+@ [1mmain[0m [2m^[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2manother-extremely-long-name-here[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mshort[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mvery-long-feature-branch-name[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktrees, 1 column hidden