Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat(switch): add wall-clock budget for picker data collection (#1487)
Maximilian Roos3d6f0d051d2f
diff --git a/src/commands/list/collect/mod.rs b/src/commands/list/collect/mod.rsindex 041058417..ea1411e8b 100644--- a/src/commands/list/collect/mod.rs+++ b/src/commands/list/collect/mod.rs@@ -228,12 +228,17 @@ pub enum ShowConfig {/// The `skip_expensive_for_stale` parameter enables batch-fetching ahead/behind counts and/// skipping expensive merge-base operations for branches far behind the default branch./// This dramatically improves performance for repos with many stale branches.+///+/// When `collect_deadline` is `Some`, drain stops at the deadline and returns partial data+/// silently (budget-based truncation is expected). When `None`, uses the default+/// [`DRAIN_TIMEOUT`](results::DRAIN_TIMEOUT) and shows a user-facing warning on timeout.pub fn collect(repo: &Repository,show_config: ShowConfig,show_progress: bool,render_table: bool,skip_expensive_for_stale: bool,+ collect_deadline: Option<std::time::Instant>,) -> anyhow::Result<Option<super::model::ListData>> {use super::progressive_table::ProgressiveTable;worktrunk::shell_exec::trace_instant("List collect started");@@ -808,11 +813,14 @@ pub fn collect(let mut first_result_traced = false;// Drain task results with conditional progressive rendering+ let drain_deadline =+ collect_deadline.unwrap_or_else(|| std::time::Instant::now() + results::DRAIN_TIMEOUT);let drain_outcome = drain_results(rx,&mut all_items,&mut errors,&expected_results,+ drain_deadline,|item_idx, item, ctx| {// Trace first result arrivalif !first_result_traced {@@ -822,9 +830,7 @@ pub fn collect(// Compute/recompute status symbols as data arrives (both modes).// This is idempotent and updates status as new data (like upstream) arrives.- if let Some(ref target) = integration_target {- ctx.apply_to(item, target.as_str());- }+ ctx.apply_to(item, integration_target.as_deref());// Progressive mode only: update UIif let Some(ref mut table) = progressive_table {@@ -867,11 +873,14 @@ pub fn collect();worktrunk::shell_exec::trace_instant("All results drained");- // Handle timeout if it occurred- if let DrainOutcome::TimedOut {- received_count,- items_with_missing,- } = drain_outcome+ // Handle timeout if it occurred.+ // Budget-based deadlines (collect_deadline) are intentional truncation — don't warn.+ // Only warn for the default DRAIN_TIMEOUT (120s), which indicates a hung command.+ if collect_deadline.is_none()+ && let DrainOutcome::TimedOut {+ received_count,+ items_with_missing,+ } = drain_outcome{// Warning: what happened + gutter showing which results are missinglet mut diag = format!(@@ -913,9 +922,7 @@ pub fn collect({// Use default context - no tasks ran, so no conflict/status infolet ctx = StatusContext::default();- if let Some(ref target) = integration_target {- ctx.apply_to(item, target.as_str());- }+ ctx.apply_to(item, integration_target.as_deref());}}@@ -1201,10 +1208,9 @@ pub fn populate_item(std::slice::from_mut(item),&mut errors,&expected_results,+ std::time::Instant::now() + results::DRAIN_TIMEOUT,|_item_idx, item, ctx| {- if let Some(ref t) = target {- ctx.apply_to(item, t);- }+ ctx.apply_to(item, target.as_deref());},);diff --git a/src/commands/list/collect/results.rs b/src/commands/list/collect/results.rsindex 9230013b6..90d3fc055 100644--- a/src/commands/list/collect/results.rs+++ b/src/commands/list/collect/results.rs@@ -104,8 +104,8 @@ pub(super) fn apply_default(/// item index and a reference to the updated item, allowing progressive mode/// to update the live table while buffered mode does nothing.///-/// Uses [`DRAIN_TIMEOUT`] to prevent infinite hangs if git commands stall.-/// When timeout occurs, returns `DrainOutcome::TimedOut` with diagnostic info.+/// Uses a caller-provided `deadline` to cap wall-clock time. When the deadline+/// is reached, returns `DrainOutcome::TimedOut` with diagnostic info.////// Errors are collected in the `errors` vec for display after rendering./// Default values are applied for failed tasks so the UI can still render.@@ -118,10 +118,9 @@ pub(super) fn drain_results(items: &mut [ListItem],errors: &mut Vec<TaskError>,expected_results: &ExpectedResults,+ deadline: Instant,mut on_result: impl FnMut(usize, &mut ListItem, &StatusContext),) -> DrainOutcome {- let deadline = Instant::now() + DRAIN_TIMEOUT;-// Track which result kinds we've received per item (for timeout diagnostics)let mut received_by_item: Vec<Vec<TaskKind>> = vec![Vec::new(); items.len()];@@ -345,8 +344,59 @@ mod tests {.unwrap();drop(tx);- let outcome = drain_results(rx, &mut items, &mut errors, &expected, |_, _, _| {});+ let outcome = drain_results(+ rx,+ &mut items,+ &mut errors,+ &expected,+ Instant::now() + DRAIN_TIMEOUT,+ |_, _, _| {},+ );assert!(matches!(outcome, DrainOutcome::Complete));assert_eq!(items[0].summary, Some(Some("Add feature".into())));}++ #[test]+ fn test_drain_results_timeout_returns_missing_diagnostics() {+ let (_tx, rx) = crossbeam_channel::unbounded();+ let mut items = vec![ListItem::new_branch("abc123".into(), "feat".into())];+ let mut errors = Vec::new();++ // Register expected results but don't send any — simulates tasks still running+ let expected = ExpectedResults::default();+ expected.expect(0, TaskKind::CommitDetails);+ expected.expect(0, TaskKind::AheadBehind);++ // Use an already-expired deadline — remaining.is_zero() triggers immediately+ let outcome = drain_results(+ rx,+ &mut items,+ &mut errors,+ &expected,+ Instant::now(),+ |_, _, _| {},+ );++ let DrainOutcome::TimedOut {+ received_count,+ items_with_missing,+ } = outcome+ else {+ panic!("expected TimedOut with immediate deadline");+ };++ assert_eq!(received_count, 0);+ assert_eq!(items_with_missing.len(), 1);+ assert_eq!(items_with_missing[0].name, "feat");+ assert!(+ items_with_missing[0]+ .missing_kinds+ .contains(&TaskKind::CommitDetails)+ );+ assert!(+ items_with_missing[0]+ .missing_kinds+ .contains(&TaskKind::AheadBehind)+ );+ }}diff --git a/src/commands/list/collect/types.rs b/src/commands/list/collect/types.rsindex 0ea3111d1..7a079eb23 100644--- a/src/commands/list/collect/types.rs+++ b/src/commands/list/collect/types.rs@@ -30,7 +30,7 @@ pub(super) struct StatusContext {}impl StatusContext {- pub fn apply_to(&self, item: &mut ListItem, target: &str) {+ pub fn apply_to(&self, item: &mut ListItem, target: Option<&str>) {// Main worktree case is handled inside check_integration_state()//// Prefer working tree conflicts (--full) when available.@@ -40,7 +40,7 @@ impl StatusContext {.unwrap_or(self.has_merge_tree_conflicts);item.compute_status_symbols(- Some(target),+ target,has_conflicts,self.user_marker.clone(),self.working_tree_status,diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex 452372ddd..6fccee9b8 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -178,6 +178,7 @@ pub fn handle_list(show_progress,render_table,skip_expensive_for_stale,+ None, // no deadline — wt list waits for all results)?;let Some(ListData { items, .. }) = list_data else {diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex 843143f0b..28cc541db 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -237,6 +237,17 @@ impl LayoutConfig {/// Render list item line as StyledLine (for extracting both plain and styled text)pub fn render_list_item_line(&self, item: &ListItem) -> StyledLine {+ self.render_item_with_placeholder(item, "⋯")+ }++ /// Render with stale placeholders for items where data collection was truncated.+ /// Uses `·` instead of `⋯` to indicate data won't arrive.+ #[cfg_attr(windows, allow(dead_code))] // Used only by select module (unix-only)+ pub fn render_list_item_stale(&self, item: &ListItem) -> StyledLine {+ self.render_item_with_placeholder(item, "·")+ }++ fn render_item_with_placeholder(&self, item: &ListItem, placeholder: &str) -> StyledLine {self.render_line(|column| {column.render_cell(item,@@ -244,6 +255,7 @@ impl LayoutConfig {&self.main_worktree_path,self.max_message_len,self.max_summary_len,+ placeholder,)})}@@ -270,6 +282,8 @@ impl LayoutConfig {ColumnKind::Gutter => {// Skeleton shows placeholder gutter - actual symbols (including is_previous)// appear when WorktreeData is populated post-skeleton.+ // TODO: is this ever visible? The skeleton renders for ~50ms before data+ // arrives. If not, consider removing the middle dot.let symbol = if wt_data.is_some() {"· " // Placeholder for worktrees} else {@@ -347,6 +361,7 @@ impl ColumnLayout {main_worktree_path: &Path,max_message_len: usize,max_summary_len: usize,+ placeholder: &str,) -> StyledLine {// Compute derived values inline (avoids separate context struct)let worktree_data = item.worktree_data();@@ -376,7 +391,7 @@ impl ColumnLayout {}ColumnKind::Status => {let Some(ref status_symbols) = item.status_symbols else {- return self.placeholder_cell("⋯");+ return self.placeholder_cell(placeholder);};let mut cell = StyledLine::new();cell.push_raw(status_symbols.render_with_mask(status_mask));@@ -385,6 +400,8 @@ impl ColumnLayout {cell}ColumnKind::WorkingDiff => {+ // TODO: show placeholder when data is missing (currently blank,+ // inconsistent with other columns that show ⋯/· for unloaded data)let Some(diff) = worktree_data.and_then(|data| data.working_tree_diff.as_ref())else {return StyledLine::new();@@ -398,7 +415,7 @@ impl ColumnLayout {match item.counts {Some(counts) if counts.ahead == 0 && counts.behind == 0 => StyledLine::new(),Some(counts) => self.render_diff_cell(counts.ahead, counts.behind),- None => self.placeholder_cell("⋯"), // Not loaded yet+ None => self.placeholder_cell(placeholder), // Not loaded yet}}ColumnKind::BranchDiff => {@@ -407,7 +424,7 @@ impl ColumnLayout {}match item.branch_diff() {Some(bd) => self.render_diff_cell(bd.diff.added, bd.diff.deleted),- None => self.placeholder_cell("…"), // Task was skipped+ None => self.placeholder_cell(placeholder),}}ColumnKind::Path => {@@ -418,6 +435,8 @@ impl ColumnLayout {self.render_text_cell(&path_str, text_style)}ColumnKind::Upstream => {+ // TODO: show placeholder when data is missing (currently blank,+ // inconsistent with other columns that show ⋯/· for unloaded data)let upstream = item.upstream();let Some(active) = upstream.active() else {return StyledLine::new();@@ -437,7 +456,7 @@ impl ColumnLayout {}ColumnKind::Time => {let Some(ref commit) = item.commit else {- return self.placeholder_cell("⋯");+ return self.placeholder_cell(placeholder);};let mut cell = StyledLine::new();cell.push_styled(@@ -479,8 +498,8 @@ impl ColumnLayout {// - Some(None) = loaded, no CI (show nothing)// - Some(Some(status)) = loaded with CI (show status)match &item.pr_status {- None => self.placeholder_cell("⋯"), // Not loaded yet- Some(None) => StyledLine::new(), // Loaded, no CI+ None => self.placeholder_cell(placeholder), // Not loaded yet+ Some(None) => StyledLine::new(), // Loaded, no CISome(Some(pr_status)) => {let mut cell = StyledLine::new();cell.push_raw(@@ -505,7 +524,7 @@ impl ColumnLayout {// - Some(None) = no summary (blank)// - Some(Some(text)) = has summarymatch &item.summary {- None => self.placeholder_cell("⋯"),+ None => self.placeholder_cell(placeholder),Some(None) => StyledLine::new(),Some(Some(summary)) => {let mut cell = StyledLine::new();@@ -517,7 +536,7 @@ impl ColumnLayout {}ColumnKind::Message => {let Some(ref commit) = item.commit else {- return self.placeholder_cell("⋯");+ return self.placeholder_cell(placeholder);};let mut cell = StyledLine::new();let msg = truncate_to_width(&commit.commit_message, max_message_len);@@ -1284,6 +1303,44 @@ mod tests {insta::assert_snapshot!(arrow_overflow2.render(), @"[32m↑50[0m [1m[31m↓1K[0m");}+ #[test]+ fn test_render_list_item_stale_uses_middle_dot() {+ use super::super::layout::{ColumnLayout, LayoutConfig};+ use super::super::model::{ListItem, PositionMask};+ use std::path::PathBuf;++ // Minimal layout with just a Status column+ let layout = LayoutConfig {+ columns: vec![ColumnLayout {+ kind: ColumnKind::Status,+ header: "Status",+ start: 0,+ width: 10,+ format: ColumnFormat::Text,+ }],+ main_worktree_path: PathBuf::from("/tmp"),+ max_message_len: 0,+ max_summary_len: 0,+ hidden_column_count: 0,+ status_position_mask: PositionMask::FULL,+ };++ // Item with no status_symbols (simulates budget timeout)+ let item = ListItem::new_branch("abc123".into(), "feat".into());+ assert!(item.status_symbols.is_none());++ // render_list_item_line uses ⋯+ let line = layout.render_list_item_line(&item);+ let rendered = line.render();+ assert!(rendered.contains('⋯'), "expected ⋯ in: {rendered}");++ // render_list_item_stale uses · (middle dot)+ let stale = layout.render_list_item_stale(&item);+ let stale_rendered = stale.render();+ assert!(stale_rendered.contains('·'));+ assert!(!stale_rendered.contains('⋯'));+ }+#[test]fn test_summary_column_rendering() {use super::super::layout::ColumnLayout;@@ -1304,17 +1361,17 @@ mod tests {// Case 1: summary = None (not loaded yet → placeholder)let mut item = ListItem::new_branch("abc123".into(), "feat".into());item.summary = None;- let cell = summary_col.render_cell(&item, &mask, &main_path, 50, 40);+ let cell = summary_col.render_cell(&item, &mask, &main_path, 50, 40, "⋯");insta::assert_snapshot!(cell.render(), @"[2m⋯[0m");// Case 2: summary = Some(None) (loaded, no summary → blank)item.summary = Some(None);- let cell = summary_col.render_cell(&item, &mask, &main_path, 50, 40);+ let cell = summary_col.render_cell(&item, &mask, &main_path, 50, 40, "⋯");assert!(cell.render().is_empty());// Case 3: summary = Some(Some(text)) (has summary)item.summary = Some(Some("Add user authentication".into()));- let cell = summary_col.render_cell(&item, &mask, &main_path, 50, 40);+ let cell = summary_col.render_cell(&item, &mask, &main_path, 50, 40, "⋯");insta::assert_snapshot!(cell.render(), @"Add user authentication");}}diff --git a/src/commands/select/mod.rs b/src/commands/select/mod.rsindex 0d7ccd813..3a46a4c55 100644--- a/src/commands/select/mod.rs+++ b/src/commands/select/mod.rs@@ -10,6 +10,7 @@ mod summary;use std::io::IsTerminal;use std::sync::Arc;+use std::time::{Duration, Instant};use anyhow::Context;use dashmap::DashMap;@@ -73,6 +74,16 @@ pub fn handle_select(// Operations that timeout fail silently (data not shown), but TUI stays responsive.let command_timeout = config.switch_picker.picker_command_timeout();+ // Wall-clock budget for the entire collect phase. Tasks that complete within+ // the budget contribute data; tasks still running when it expires are abandoned.+ // This caps total latency regardless of worktree count or filesystem speed.+ const DEFAULT_COLLECT_BUDGET_MS: u64 = 500;+ let budget_ms: u64 = std::env::var("WORKTRUNK_PICKER_BUDGET_MS")+ .ok()+ .and_then(|s| s.parse().ok())+ .unwrap_or(DEFAULT_COLLECT_BUDGET_MS);+ let collect_deadline = Some(Instant::now() + Duration::from_millis(budget_ms));+let Some(list_data) = collect::collect(&repo,collect::ShowConfig::Resolved {@@ -84,6 +95,7 @@ pub fn handle_select(false, // show_progress (no progress bars)false, // render_table (select renders its own UI)true, // skip_expensive_for_stale (faster for repos with many stale branches)+ collect_deadline,)?else {return Ok(());@@ -123,8 +135,17 @@ pub fn handle_select(.map(|item| {let branch_name = item.branch_name().to_string();- // Use layout system to render the line - this handles all column alignment- let rendered_line = layout.render_list_item_line(&item);+ // Use stale rendering (·) for items where data didn't arrive within budget,+ // normal rendering (⋯) otherwise. status_symbols is always set by completed+ // tasks, so None means worker results didn't arrive for this item.+ // Note: prunable worktrees also start with status_symbols: None, but collect()+ // sets status_symbols for them in the post-drain loop. If that changes, this+ // heuristic would false-positive on prunable items.+ let rendered_line = if item.status_symbols.is_none() {+ layout.render_list_item_stale(&item)+ } else {+ layout.render_list_item_line(&item)+ };let display_text_with_ansi = rendered_line.render();let display_text = rendered_line.plain_text();diff --git a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snapindex a3c35e9b4..c6051ab79 100644--- a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap+++ b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap@@ -41,10 +41,10 @@ success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mRemote⇅[0m [1mCI[0m [1mPath[0m [1mCommit[0m [1mAge[0m [1mMessage-@ main [2m⋯[0m [2m|[0m . [2m05a4a45d[0m [2m16h[0m [2mInitial commit-+ feature-a [2m⋯[0m ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file-+ feature-b [2m⋯[0m ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file-+ feature-c [2m⋯[0m ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file+@ main [31m⚑[39m[2m^[22m[2m|[22m [2m|[0m . [2m05a4a45d[0m [2m16h[0m [2mInitial commit++ feature-a ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file++ feature-b ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file++ feature-c ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file[2m○[22m [2mShowing 4 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snapindex e57b6008a..aaa5968f4 100644--- a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warn@@ -42,10 +43,10 @@ exit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mRemote⇅[0m [1mCI[0m [1mPath[0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m[2m⇡[22m [32m⇡2[0m . [2mc3d37f26[0m [2m1d[0m [2mThird commit on main-+ feature-a [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file-+ feature-b [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file-+ feature-c [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file-+ feature [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature [2m0acf205b[0m [2m1d[0m [2mFeature work++ feature-a [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file++ feature-b [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file++ feature-c [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file++ feature [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature [2m0acf205b[0m [2m1d[0m [2mFeature work[2m○[22m [2mShowing 5 worktrees, 4 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snapindex 3c76e0918..f6e9e99a3 100644--- a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap+++ b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warn@@ -43,10 +44,10 @@ exit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mRemote⇅[0m [1mCI[0m [1mPath[0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m[2m⇡[22m [32m⇡2[0m . [2mc3d37f26[0m [2m1d[0m [2mThird commit on main-+ feature-a [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file-+ feature-b [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file-+ feature-c [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m…[0m ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file- stale-branch [2m/[22m[2m↓[22m [2m[31m↓2[0m [2m…[0m [2m05a4a45d[0m [2m16h[0m [2mInitial commit++ feature-a [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file++ feature-b [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file++ feature-c [2m↕[22m [32m↑1[0m [2m[31m↓2[0m [2m⋯[0m ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file+ stale-branch [2m/[22m[2m↓[22m [2m[31m↓2[0m [2m⋯[0m [2m05a4a45d[0m [2m16h[0m [2mInitial commit[2m○[22m [2mShowing 4 worktrees, 1 branches, 3 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snapindex 7ef49463b..8d5239b3c 100644--- a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap+++ b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap@@ -40,10 +40,10 @@ success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mRemote⇅[0m [1mPath[0m [1mCommit[0m [1mAge[0m [1mMessage-@ main [2m⋯[0m [2m|[0m . [2m05a4a45d[0m [2m16h[0m [2mInitial commit-+ feature-a [2m⋯[0m ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file-+ feature-b [2m⋯[0m ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file-+ feature-c [2m⋯[0m ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file+@ main [31m⚑[39m[2m^[22m[2m|[22m [2m|[0m . [2m05a4a45d[0m [2m16h[0m [2mInitial commit++ feature-a ../repo.feature-a [2m1b87d473[0m [2m16h[0m [2mAdd feature-a file++ feature-b ../repo.feature-b [2mf62940fc[0m [2m16h[0m [2mAdd feature-b file++ feature-c ../repo.feature-c [2m345c7c93[0m [2m16h[0m [2mAdd feature-c file[2m○[22m [2mShowing 4 worktrees