Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Enhance worktree distinction and metadata redaction
Maximilian Roos92f15b863a3a
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex 319f97060..d6867cd00 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -168,18 +168,18 @@ fn compute_divergences(/// Determine branch state for a worktree.////// Returns:-/// - `BranchState::None` if primary worktree or no base branch+/// - `BranchState::None` if main worktree or no base branch/// - `BranchState::MatchesMain` if working tree matches main exactly (no commits, no diff)/// - `BranchState::NoCommits` if no commits and working tree is clean/// - `BranchState::None` otherwisefn determine_worktree_branch_state(- is_primary: bool,+ is_main: bool,base_branch: Option<&str>,ahead: usize,working_tree_diff: Option<&LineDiff>,working_tree_diff_with_main: &Option<Option<LineDiff>>,) -> BranchState {- if is_primary || base_branch.is_none() {+ if is_main || base_branch.is_none() {return BranchState::None;}@@ -225,7 +225,7 @@ fn compute_item_status_symbols(match &item.kind {ItemKind::Worktree(data) => {// Full status computation for worktrees- // Use base_branch directly (None for primary worktree)+ // Use base_branch directly (None for main worktree)// Worktree attributes - priority: prunable > locked (1 char max)let worktree_attrs = if data.prunable.is_some() {@@ -236,9 +236,9 @@ fn compute_item_status_symbols(String::new()};- // Determine branch state (only for non-primary worktrees with base branch)+ // Determine branch state (only for non-main worktrees with base branch)let branch_state = determine_worktree_branch_state(- data.is_primary,+ data.is_main,base_branch,counts.ahead,data.working_tree_diff.as_ref(),@@ -454,13 +454,19 @@ pub fn collect(}let base_branch = repo.default_branch()?;- let primary = worktrees.worktrees[0].clone();+ // Main worktree is the worktree on the default branch (if exists), else first worktree+ let main_worktree = worktrees+ .worktrees+ .iter()+ .find(|wt| wt.branch.as_deref() == Some(base_branch.as_str()))+ .cloned()+ .unwrap_or_else(|| worktrees.worktrees[0].clone());let current_worktree_path = repo.worktree_root().ok();// Sort worktrees for display orderlet sorted_worktrees = sort_worktrees(&worktrees.worktrees,- &primary,+ &main_worktree,current_worktree_path.as_ref(),);@@ -487,7 +493,7 @@ pub fn collect(display: super::model::DisplayFields::default(),// Type-specific datakind: super::model::ItemKind::Worktree(Box::new(- super::model::WorktreeData::from_worktree(wt, wt.path == primary.path),+ super::model::WorktreeData::from_worktree(wt, wt.path == main_worktree.path),)),}).collect();@@ -647,7 +653,7 @@ pub fn collect(.enumerate().for_each(|(idx, wt)| {// Always pass base_branch for ahead/behind/diff computation- // Status symbols will filter based on is_primary flag+ // Status symbols will filter based on is_main flagsuper::collect_progressive_impl::collect_worktree_progressive(wt,idx,@@ -661,7 +667,7 @@ pub fn collect(// Spawn branch collection in background thread (if requested)if show_branches {let branches_clone = branches_without_worktrees.clone();- let primary_path = primary.path.clone();+ let main_path = main_worktree.path.clone();let tx_branches = tx.clone();let base_branch_clone = base_branch.clone();std::thread::spawn(move || {@@ -673,7 +679,7 @@ pub fn collect(super::collect_progressive_impl::collect_branch_progressive(branch_name,commit_sha,- &primary_path,+ &main_path,item_idx,&base_branch_clone,&options,@@ -696,7 +702,7 @@ pub fn collect(|item_idx, info, has_merge_tree_conflicts, user_status| {// Compute/recompute status symbols as data arrives (both modes)// This is idempotent and updates status as new data (like upstream) arrives- let item_base_branch = if info.is_primary() {+ let item_base_branch = if info.is_main() {None} else {Some(base_branch.as_str())@@ -850,10 +856,10 @@ pub fn collect(Ok(Some(super::model::ListData { items }))}-/// Sort worktrees for display (primary first, then current, then by timestamp descending).+/// Sort worktrees for display (main first, then current, then by timestamp descending).fn sort_worktrees(worktrees: &[Worktree],- primary: &Worktree,+ main_worktree: &Worktree,current_path: Option<&std::path::PathBuf>,) -> Vec<Worktree> {let timestamps: Vec<i64> = worktrees@@ -867,10 +873,10 @@ fn sort_worktrees(let mut indexed: Vec<_> = worktrees.iter().enumerate().collect();indexed.sort_by_key(|(idx, wt)| {- let is_primary = wt.path == primary.path;+ let is_main = wt.path == main_worktree.path;let is_current = current_path.map(|cp| &wt.path == cp).unwrap_or(false);- let priority = if is_primary {+ let priority = if is_main {0} else if is_current {1diff --git a/src/commands/list/columns.rs b/src/commands/list/columns.rsindex 5dc3ff4df..4b72d4afb 100644--- a/src/commands/list/columns.rs+++ b/src/commands/list/columns.rs@@ -1,6 +1,7 @@/// Logical identifier for each column rendered by `wt list`.#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]pub enum ColumnKind {+ Gutter, // Type indicator: `@` (current), `^` (primary), `+` (worktree), space (branch-only)Branch,Status, // Includes both git status symbols and user-defined statusWorkingDiff,@@ -54,13 +55,21 @@ impl ColumnSpec {/// Static registry of all possible columns in display order.pub const COLUMN_SPECS: &[ColumnSpec] = &[+ ColumnSpec::new(+ ColumnKind::Gutter,+ super::layout::HEADER_GUTTER,+ 0,+ false,+ false,+ 0,+ ),ColumnSpec::new(ColumnKind::Branch,super::layout::HEADER_BRANCH,1,false,false,- 0,+ 1,),ColumnSpec::new(ColumnKind::Status,@@ -68,7 +77,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[2,false,false,- 1,+ 2,),ColumnSpec::new(ColumnKind::WorkingDiff,@@ -76,7 +85,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[3,false,false,- 2,+ 3,),ColumnSpec::new(ColumnKind::AheadBehind,@@ -84,7 +93,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[4,false,false,- 3,+ 4,),ColumnSpec::new(ColumnKind::BranchDiff,@@ -92,7 +101,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[5,true,false,- 4,+ 5,),ColumnSpec::new(ColumnKind::Path,@@ -100,7 +109,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[6,false,false,- 5,+ 6,),ColumnSpec::new(ColumnKind::Upstream,@@ -108,7 +117,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[7,false,false,- 6,+ 7,),ColumnSpec::new(ColumnKind::CiStatus,@@ -116,7 +125,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[8,false,true,- 7,+ 8,),ColumnSpec::new(ColumnKind::Commit,@@ -124,7 +133,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[9,false,false,- 8,+ 9,),ColumnSpec::new(ColumnKind::Time,@@ -132,7 +141,7 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[10,false,false,- 9,+ 10,),ColumnSpec::new(ColumnKind::Message,@@ -140,6 +149,6 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[11,false,false,- 10,+ 11,),];diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex b5507f1a2..4f11baf8a 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -181,6 +181,7 @@ const COMMIT_HASH_WIDTH: usize = 8;/// Column header labels - single source of truth for all column headers./// Both layout calculations and rendering use these constants.+pub const HEADER_GUTTER: &str = ""; // No header for gutter (type indicator column)pub const HEADER_BRANCH: &str = "Branch";pub const HEADER_STATUS: &str = "Status";pub const HEADER_WORKING_DIFF: &str = "HEAD±";@@ -323,6 +324,7 @@ impl ColumnKind {pub fn has_data(self, flags: &ColumnDataFlags) -> bool {match self {+ ColumnKind::Gutter => true, // Always present (shows @ ^ + or space)ColumnKind::Branch => true,ColumnKind::Status => flags.status,ColumnKind::WorkingDiff => flags.working_diff,@@ -426,6 +428,7 @@ fn ideal_for_column(commit_width: usize,) -> Option<ColumnIdeal> {match spec.kind {+ ColumnKind::Gutter => ColumnIdeal::text(2), // Fixed width: symbol (1 char) + space (1 char)ColumnKind::Branch => ColumnIdeal::text(widths.branch),ColumnKind::Status => ColumnIdeal::text(widths.status),ColumnKind::Path => ColumnIdeal::text(max_path_width),@@ -628,7 +631,16 @@ fn allocate_columns_with_priority(let start = if columns.is_empty() {0} else {- position + gap+ // No gap after gutter column - its content includes the spacing+ let prev_was_gutter = columns+ .last()+ .map(|c: &ColumnLayout| c.kind == ColumnKind::Gutter)+ .unwrap_or(false);+ if prev_was_gutter {+ position+ } else {+ position + gap+ }};position = start + col.width;@@ -839,7 +851,7 @@ mod tests {working_tree_diff: Some(LineDiff::from((100, 50))),working_tree_diff_with_main: Some(Some(LineDiff::default())),worktree_state: None,- is_primary: false,+ is_main: false,working_tree_symbols: Some(String::new()),is_dirty: Some(false),has_conflicts: Some(false),@@ -856,22 +868,30 @@ mod tests {);let mut columns_iter = layout.columns.iter();- let first = columns_iter.next().expect("branch column should exist");+ let first = columns_iter.next().expect("gutter column should exist");assert_eq!(first.kind,- ColumnKind::Branch,- "Branch column should be first"+ ColumnKind::Gutter,+ "Gutter column should be first");- assert_eq!(first.start, 0, "Branch should begin at position 0");+ assert_eq!(first.start, 0, "Gutter should begin at position 0");let mut previous_end = first.start + first.width;+ let mut prev_kind = first.kind;for column in columns_iter {+ // No gap after gutter column - its content includes the spacing+ let expected_gap = if prev_kind == ColumnKind::Gutter {+ 0+ } else {+ 2+ };assert_eq!(column.start,- previous_end + 2,- "Columns should be separated by a 2-space gap"+ previous_end + expected_gap,+ "Columns should be separated by expected gap (0 after gutter, 2 otherwise)");previous_end = column.start + column.width;+ prev_kind = column.kind;}let path_column = layout@@ -917,7 +937,7 @@ mod tests {working_tree_diff: Some(LineDiff::default()),working_tree_diff_with_main: Some(Some(LineDiff::default())),worktree_state: None,- is_primary: true, // Primary worktree: no ahead/behind shown+ is_main: true, // Primary worktree: no ahead/behind shownworking_tree_symbols: Some(String::new()),is_dirty: Some(false),has_conflicts: Some(false),@@ -932,9 +952,9 @@ mod tests {layout.columns.first()- .map(|col| col.kind == ColumnKind::Branch && col.start == 0)+ .map(|col| col.kind == ColumnKind::Gutter && col.start == 0).unwrap_or(false),- "Branch column should start at position 0"+ "Gutter column should start at position 0");// Columns with data should always be visible (Branch, Path, Time, Commit, Message)diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 82f8404e7..e5ffd4a60 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -75,7 +75,7 @@ pub struct WorktreeData {#[serde(skip_serializing_if = "Option::is_none")]pub working_tree_diff_with_main: Option<Option<LineDiff>>,pub worktree_state: Option<String>,- pub is_primary: bool,+ pub is_main: bool,/// Working tree symbols (?, !, +, », ✘) - used for status computation, not serialized#[serde(skip)]pub(crate) working_tree_symbols: Option<String>,@@ -91,7 +91,7 @@ pub struct WorktreeData {impl WorktreeData {/// Create WorktreeData from a Worktree, with all computed fields set to None.- pub(crate) fn from_worktree(wt: &worktrunk::git::Worktree, is_primary: bool) -> Self {+ pub(crate) fn from_worktree(wt: &worktrunk::git::Worktree, is_main: bool) -> Self {Self {// Identity fields (known immediately from worktree list)path: wt.path.clone(),@@ -99,7 +99,7 @@ impl WorktreeData {detached: wt.detached,locked: wt.locked.clone(),prunable: wt.prunable.clone(),- is_primary,+ is_main,// Computed fields start as None (filled progressively)..Default::default()@@ -176,7 +176,7 @@ pub struct ListItem {pub commit: Option<CommitDetails>,// TODO: Evaluate if skipping these fields in JSON when None is correct behavior.- // Currently, primary worktree omits counts/branch_diff (since it doesn't compare to itself),+ // Currently, main worktree omits counts/branch_diff (since it doesn't compare to itself),// but consumers may expect these fields to always be present (even if zero).// Consider: always include with default values vs current "omit when not computed" approach.#[serde(flatten, skip_serializing_if = "Option::is_none")]@@ -212,8 +212,8 @@ impl ListItem {self.branch.as_deref().unwrap_or("(detached)")}- pub fn is_primary(&self) -> bool {- matches!(&self.kind, ItemKind::Worktree(data) if data.is_primary)+ pub fn is_main(&self) -> bool {+ matches!(&self.kind, ItemKind::Worktree(data) if data.is_main)}pub fn head(&self) -> &str {@@ -253,7 +253,7 @@ impl ListItem {/// Determine if the item contains no unique work and can likely be removed.pub(crate) fn is_potentially_removable(&self) -> bool {- if self.is_primary() {+ if self.is_main() {return false;}diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex f9a81b8bd..eb1c0d775 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -375,7 +375,7 @@ impl LayoutConfig {use unicode_width::UnicodeWidthStr;let branch = item.branch_name();- let is_primary = item.is_primary();+ let is_main = item.is_main();let shortened_path = item.worktree_path().map(|p| shorten_path(p, &self.common_prefix))@@ -388,11 +388,27 @@ impl LayoutConfig {let mut cell = StyledLine::new();match col.kind {+ ColumnKind::Gutter => {+ // Show actual gutter symbol even in skeleton+ let has_worktree = item.worktree_path().is_some();+ let symbol = if has_worktree {+ if is_current {+ "@ "+ } else if is_main {+ "^ "+ } else {+ "+ "+ }+ } else {+ " "+ };+ cell.push_raw(symbol.to_string());+ }ColumnKind::Branch => {// Show actual branch namelet style = if is_current {CURRENT.bold()- } else if is_primary {+ } else if is_main {Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan))).bold()@@ -410,7 +426,7 @@ impl LayoutConfig {// Show actual pathlet style = if is_current {CURRENT.bold()- } else if is_primary {+ } else if is_main {Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan))).bold()@@ -455,6 +471,7 @@ struct ListRowContext<'a> {commit: CommitDetails,head: &'a str,text_style: Option<Style>,+ is_current: bool,}impl<'a> ListRowContext<'a> {@@ -466,6 +483,10 @@ impl<'a> ListRowContext<'a> {let upstream = item.upstream();let head = item.head();+ let is_current = worktree_info+ .and_then(|info| current_worktree_path.map(|p| p == &info.path))+ .unwrap_or(false);+let mut ctx = Self {item,worktree_info,@@ -475,6 +496,7 @@ impl<'a> ListRowContext<'a> {commit,head,text_style: None,+ is_current,};ctx.text_style = ctx.compute_text_style(current_worktree_path);@@ -493,7 +515,7 @@ impl<'a> ListRowContext<'a> {let is_current = current_worktree_path.map(|p| p == &info.path).unwrap_or(false);- match (is_current, info.is_primary) {+ match (is_current, info.is_main) {(true, _) => Some(CURRENT),(_, true) => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),_ => None,@@ -527,6 +549,23 @@ impl ColumnLayout {max_message_len: usize,) -> StyledLine {match self.kind {+ ColumnKind::Gutter => {+ let mut cell = StyledLine::new();+ let symbol = if let Some(info) = ctx.worktree_info {+ // Worktree: priority is current > primary > regular+ if ctx.is_current {+ "@ " // Current worktree+ } else if info.is_main {+ "^ " // Primary worktree+ } else {+ "+ " // Regular worktree+ }+ } else {+ " " // Branch without worktree (two spaces to match width)+ };+ cell.push_raw(symbol.to_string());+ cell+ }ColumnKind::Branch => {let mut cell = StyledLine::new();let text = ctx.item.branch.as_deref().unwrap_or("(detached)");@@ -566,7 +605,7 @@ impl ColumnLayout {self.render_diff_cell(diff.added, diff.deleted)}ColumnKind::AheadBehind => {- if ctx.item.is_primary() {+ if ctx.item.is_main() {return StyledLine::new();}let ahead = ctx.counts.ahead;@@ -577,7 +616,7 @@ impl ColumnLayout {self.render_diff_cell(ahead, behind)}ColumnKind::BranchDiff => {- if ctx.item.is_primary() {+ if ctx.item.is_main() {return StyledLine::new();}self.render_diff_cell(ctx.branch_diff.added, ctx.branch_diff.deleted)diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex e1d0a4336..cc56fe3d3 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -94,7 +94,7 @@ pub fn handle_merge(// Worktree for target is optional: if present we use it for safety checks and as destination.let target_worktree_path = repo.worktree_for_branch(&target_branch)?;- // When current == target or we're in the primary worktree, force --no-remove (can't remove it)+ // When current == target or we're in the main worktree, force --no-remove (can't remove it)let in_primary = !repo.is_in_worktree().unwrap_or(false);let no_remove_effective = no_remove || current_branch == target_branch || in_primary;@@ -191,7 +191,7 @@ pub fn handle_merge(crate::output::progress(format!("{CYAN}Removing worktree & branch...{CYAN:#}"))?;let worktree_root = repo.worktree_root()?;let remove_result = RemoveResult::RemovedWorktree {- primary_path: destination_path.clone(),+ main_path: destination_path.clone(),worktree_path: worktree_root,changed_directory: true,branch_name: current_branch.clone(),@@ -226,11 +226,11 @@ pub fn handle_merge(}/// Format the merge summary message (no emoji - output system adds it)-fn format_merge_summary(primary_path: Option<&std::path::Path>) -> String {+fn format_merge_summary(main_path: Option<&std::path::Path>) -> String {use worktrunk::styling::GREEN;// Show where we ended up- if let Some(path) = primary_path {+ if let Some(path) = main_path {format!("{GREEN}Returned to primary at {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}",format_path_for_display(path)@@ -241,8 +241,8 @@ fn format_merge_summary(primary_path: Option<&std::path::Path>) -> String {}/// Handle output for merge summary using global output context-fn handle_merge_summary_output(primary_path: Option<&std::path::Path>) -> Result<(), GitError> {- let message = format_merge_summary(primary_path);+fn handle_merge_summary_output(main_path: Option<&std::path::Path>) -> Result<(), GitError> {+ let message = format_merge_summary(main_path);// Show success message (formatting added by OutputContext)crate::output::success(message)?;diff --git a/src/commands/process.rs b/src/commands/process.rsindex 09815102a..d52e40392 100644--- a/src/commands/process.rs+++ b/src/commands/process.rs@@ -9,7 +9,7 @@ use worktrunk::git::{GitError, Repository};/// - On Unix: uses double-fork with setsid to create a daemon/// - On Windows: uses CREATE_NEW_PROCESS_GROUP to detach from console///-/// Logs are centralized in the primary worktree's `.git/wt-logs/` directory.+/// Logs are centralized in the main worktree's `.git/wt-logs/` directory.////// # Arguments/// * `repo` - Repository instance for accessing git common directorydiff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rsindex 840c89ae9..b584c71ef 100644--- a/src/commands/repository_ext.rs+++ b/src/commands/repository_ext.rs@@ -99,7 +99,7 @@ impl RepositoryCliExt for Repository {let current_worktree = self.worktree_root()?;let removing_current = current_worktree == worktree_path;- let (primary_path, changed_directory) = if removing_current {+ let (main_path, changed_directory) = if removing_current {let worktrees = self.list_worktrees()?;(worktrees.worktrees[0].path.clone(), true)} else {@@ -107,7 +107,7 @@ impl RepositoryCliExt for Repository {};Ok(RemoveResult::RemovedWorktree {- primary_path,+ main_path,worktree_path,changed_directory,branch_name: branch_name.to_string(),diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 20c6d6701..9914488b5 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -145,7 +145,7 @@ impl SwitchResult {pub enum RemoveResult {/// Removed worktree and returned to primary (if needed)RemovedWorktree {- primary_path: PathBuf,+ main_path: PathBuf,worktree_path: PathBuf,changed_directory: bool,branch_name: String,diff --git a/src/git/mod.rs b/src/git/mod.rsindex 8b9735183..b851c89f1 100644--- a/src/git/mod.rs+++ b/src/git/mod.rs@@ -75,7 +75,7 @@ pub struct Worktree {////// This type ensures:/// - Bare worktrees are filtered out (only worktrees with working trees are included)-/// - The primary worktree is always identifiable (first non-bare worktree at index 0)+/// - The main worktree is always identifiable (first non-bare worktree at index 0)/// - Construction fails if no valid worktrees exist#[derive(Debug, Clone)]pub struct WorktreeList {diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rsindex 995846f47..8a0a0517a 100644--- a/src/git/repository/mod.rs+++ b/src/git/repository/mod.rs@@ -643,7 +643,7 @@ impl Repository {/// Return the working tree diff versus a base branch when their trees match.///- /// When `base_branch` is `None` (primary worktree), this always returns `Some(LineDiff::default())`.+ /// When `base_branch` is `None` (main worktree), this always returns `Some(LineDiff::default())`./// If the base branch tree matches HEAD and the working tree is dirty, the precise diff is/// computed; otherwise we return zero to indicate the trees (and working tree) match./// When the trees differ, we return `None` so callers can skip expensive comparisons.@@ -813,7 +813,7 @@ impl Repository {/// List all worktrees for this repository.////// Returns a WorktreeList that automatically filters out bare repositories- /// and provides access to the primary worktree.+ /// and provides access to the main worktree.pub fn list_worktrees(&self) -> Result<WorktreeList, GitError> {let stdout = self.run_command(&["worktree", "list", "--porcelain"])?;let raw_worktrees = Worktree::parse_porcelain_list(&stdout)?;diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 6a6fd6b59..7ed7010c3 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -61,7 +61,7 @@ fn format_remove_message(branch_deleted: bool,) -> String {let RemoveResult::RemovedWorktree {- primary_path,+ main_path,changed_directory,branch_name,no_delete_branch,@@ -86,12 +86,12 @@ fn format_remove_message(// Re-establish GREEN after each green_bold reset to prevent color leakformat!("{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}{flag_note}",- format_path_for_display(primary_path)+ format_path_for_display(main_path))} else {format!("{GREEN}{action}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}{flag_note}",- format_path_for_display(primary_path)+ format_path_for_display(main_path))}} else if let Some(b) = branch_display {@@ -184,7 +184,7 @@ pub fn handle_remove_output(background: bool,) -> Result<(), GitError> {let RemoveResult::RemovedWorktree {- primary_path,+ main_path,worktree_path,changed_directory,branch_name,@@ -195,7 +195,7 @@ pub fn handle_remove_output(// 1. Emit cd directive if needed - shell will execute this immediatelyif *changed_directory {- super::change_directory(primary_path)?;+ super::change_directory(main_path)?;super::flush()?; // Force flush to ensure shell processes the cd}@@ -213,7 +213,7 @@ pub fn handle_remove_output(} else {// Check if branch is fully merged to targetlet check_target = target_branch.as_deref().unwrap_or("HEAD");- let deletion_repo = worktrunk::git::Repository::at(primary_path);+ let deletion_repo = worktrunk::git::Repository::at(main_path);deletion_repo.is_ancestor(branch_name, check_target).unwrap_or(false)@@ -244,8 +244,8 @@ pub fn handle_remove_output(// Build command with the decision we already madelet remove_command = build_remove_command(worktree_path, branch_name, should_delete_branch);- // Spawn the removal in background - runs from primary_path (where we cd'd to)- spawn_detached(&repo, primary_path, &remove_command, branch_name, "remove")?;+ // Spawn the removal in background - runs from main_path (where we cd'd to)+ spawn_detached(&repo, main_path, &remove_command, branch_name, "remove")?;super::flush()?;Ok(())@@ -265,7 +265,7 @@ pub fn handle_remove_output(// Delete the branch (unless --no-delete-branch was specified)let branch_deleted = if !no_delete_branch {- let deletion_repo = worktrunk::git::Repository::at(primary_path);+ let deletion_repo = worktrunk::git::Repository::at(main_path);// Use git branch -D if force_delete is true, otherwise check if merged firstlet delete_result = if *force_delete {diff --git a/tests/common/list_snapshots.rs b/tests/common/list_snapshots.rsindex 03d17b97e..54ed56693 100644--- a/tests/common/list_snapshots.rs+++ b/tests/common/list_snapshots.rs@@ -8,6 +8,13 @@ fn base_settings(repo: &TestRepo) -> Settings {settings.set_snapshot_path("../snapshots");normalize_worktree_paths(&mut settings, repo);settings.add_filter(r"\\", "/");++ // Redact volatile metadata captured by insta-cmd (same as common::setup_snapshot_settings)+ settings.add_redaction(".env.WORKTRUNK_CONFIG_PATH", "[TEST_CONFIG]");+ settings.add_redaction(".env.HOME", "[TEST_HOME]");+ settings.add_redaction(".env.XDG_CONFIG_HOME", "[TEST_CONFIG_HOME]");+ settings.add_redaction(".env.PATH", "[PATH]");+settings}@@ -19,7 +26,7 @@ pub fn standard_settings(repo: &TestRepo) -> Settings {// Linux: /tmp/.tmpXXX/test-config.tomlsettings.add_filter(r"(/var/folders/[^/]+/[^/]+/T/\.tmp[^/]+|/tmp/\.tmp[^/]+)/test-config\.toml",- "[TEST_TEMP]/test-config.toml",+ "[TEST_CONFIG]",);settings}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex cbbaabc35..26ff5280f 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@@ -9,19 +9,20 @@ info:COLUMNS: "150"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgORGdp/test-config.toml+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRpftLl/test-config.toml---success: trueexit_code: 0----- stdout ---------- stderr ------Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message-feature ↑ ./test-repo.feature 72413a3b 10 months ago Work on feature-main ≡ ./test-repo.main 6c3da842 10 months ago Initial commit on main+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message+@ main ./test-repo.main 6c3da842 10 months ago Initial commit on main++ feature ↑ ↑1 ./test-repo.feature 72413a3b 10 months ago Work on feature⚪ Showing 2 worktrees, 1 aheaddiff --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 e9976af77..c4114d30c 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@@ -10,20 +10,23 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7zaUWv/test-config.toml---success: trueexit_code: 0----- stdout ---------- stderr ------[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+ [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⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 18b45be2b..553555146 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,8 +26,8 @@ exit_code: 0----- stdout ---------- stderr ------[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 [2m∅[0m [2m⎇[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.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mbranch-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snapindex 49a1d9cf1..51b8264d7 100644--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap@@ -18,14 +18,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNVebpx/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35mdevelop[0m [1m[35m.[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[35mdevelop[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex c05835417..b537c93fd 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,7 +25,7 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35m(detached)[0m [1m[35m.[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[35m(detached)[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snapindex f96471045..cee8350a1 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap@@ -19,7 +19,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwJxOR9/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0@@ -74,7 +74,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": true+ "is_main": true},{"head_sha": "f16cd37915d5ee93903252f5cf877c76c54f3d50",@@ -124,7 +124,7 @@ exit_code: 0},"working_tree_diff_with_main": null,"worktree_state": null,- "is_primary": false,+ "is_main": false,"working_diff_display": "/u001b[32m+1/u001b[0m /u001b[31m-1/u001b[0m"},{@@ -174,7 +174,7 @@ exit_code: 0},"working_tree_diff_with_main": null,"worktree_state": null,- "is_primary": false+ "is_main": false}]diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex f5061484d..8bdc984f3 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -19,7 +19,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsNi9Qf/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0@@ -74,7 +74,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": true+ "is_main": true},{"head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",@@ -125,7 +125,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": false+ "is_main": false},{"head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",@@ -180,7 +180,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": false+ "is_main": false}]diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snapindex 7e4f4f453..78d7f05cb 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap@@ -19,7 +19,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKOi1g7/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0@@ -74,7 +74,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": true+ "is_main": true},{"head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",@@ -127,7 +127,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": false+ "is_main": false},{"head_sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",@@ -178,7 +178,7 @@ exit_code: 0"deleted": 0},"worktree_state": null,- "is_primary": false+ "is_main": false}]diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex b8f9adba3..f238edb21 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -14,20 +14,21 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcBGCIm/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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-diverged [36m![0m [2m↑[0m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./diverged [2m8ba5aa92[0m [2m10 months ago[0m [2mDiverged commit[0m-feature-changes [36m?![0m [2m↑[0m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./feature-changes [2mb854b166[0m [2m10 months ago[0m [2mAdd 100 lines[0m-[2mfix[0m [36m?[0m [2m≡[0m 💬 [2m./fix[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++ diverged [36m![0m [2m↑[0m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./diverged [2m8ba5aa92[0m [2m10 months ago[0m [2mDiverged commit[0m++ feature-changes [36m?![0m [2m↑[0m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./feature-changes [2mb854b166[0m [2m10 months ago[0m [2mAdd 100 lines[0m++ [2mfix[0m [36m?[0m [2m≡[0m 💬 [2m./fix[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex cf64a14db..85e542d20 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -14,21 +14,22 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOFUo4b/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2m↑[0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m-feature-newest [2m↑[0m [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m-feature-middle [2m↑[0m [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m-feature-oldest [2m↑[0m [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago[0m [2mCommit at 00:30[0m+ [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 [2m↑[0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m++ feature-newest [2m↑[0m [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m++ feature-middle [2m↑[0m [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m++ feature-oldest [2m↑[0m [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 42a160260..7f6edb921 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,9 +25,9 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[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[35mdevelop[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m≡[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__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex 226dae5c4..fa1ecf4fc 100644--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap@@ -4,7 +4,7 @@ info:program: wtargs:- "-C"- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpURVuoh/test-repo+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppL7rf6/test-repo- listenv:CLICOLOR_FORCE: "1"@@ -16,9 +16,9 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[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-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m≡[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 f21ee2d5d..45723a217 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,8 +25,8 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [33m⊠[0m [2m./locked-no-reason[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++ [2mlocked-no-reason[0m [2m≡[0m [33m⊠[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 1daaba0a3..1c11bf724 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,8 +25,8 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [33m⊠[0m [2m./locked-feature[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++ [2mlocked-feature[0m [2m≡[0m [33m⊠[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 ef3116e6f..c931fdec0 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -14,18 +14,19 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNXUyod/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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∅[0m [2m↓[0m [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should…[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 [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m++ [2mfeature-a[0m [2m∅[0m [2m↓[0m [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should…[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 432396480..727da5bb3 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,11 +25,11 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m-[2mmedium-name[0m [2m≡[0m [2m./medium-name[0m [2mb834638e[0m [2m10 months ago[0m-[2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m-[2mvery-long-branch-name-here[0m [2m≡[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m-[2mwith-changes[0m [2m≡[0m [2m./with-changes[0m [2mb834638e[0m [2m10 months ago[0m+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m+@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m++ [2mmedium-name[0m [2m≡[0m [2m./medium-name[0m [2mb834638e[0m [2m10 months ago[0m++ [2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m++ [2mvery-long-branch-name-here[0m [2m≡[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m++ [2mwith-changes[0m [2m≡[0m [2m./with-changes[0m [2mb834638e[0m [2m10 months ago[0m⚪ [2mShowing 5 worktrees, 1 column hidden[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 3cea19f28..e5de3ac8a 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -19,15 +19,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpm9ZVRy/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2m⇡[0m [1m[35m./test-repo[0m [32m↑1[0m [2m[31m↓0[0m [2m85ed6d3d[0m [2m10 months ago[0m [2mMain advances[0m-feature [36m?!+»✘[0m[33m⚠[0m [2m↕[0m[2m⇅[0m[33m⊠[0m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m↑1[0m [2m[31m↓1[0m [2m4afb2b9e[0m [2m10 months ago[0m [2mLocal commit[0m+ [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 [2m⇡[0m [1m[35m./test-repo[0m [32m↑1[0m [2m[31m↓0[0m [2m85ed6d3d[0m [2m10 months ago[0m [2mMain advances[0m++ feature [36m?!+»✘[0m[33m⚠[0m [2m↕[0m[2m⇅[0m[33m⊠[0m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m↑1[0m [2m[31m↓1[0m [2m4afb2b9e[0m [2m10 months ago[0m [2mLocal commit[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snapindex 203457014..bf0a912ea 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap@@ -19,15 +19,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5efxMi/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m-feature [36m?!+[0m [31m✖[0m[33m↻[0m [33m⊠[0m🤖 [32m+7[0m ./feature [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m+ [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 [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m++ feature [36m?!+[0m [31m✖[0m[33m↻[0m [33m⊠[0m🤖 [32m+7[0m ./feature [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m⚪ [2mShowing 2 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snapindex c512b6220..92b58c020 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap@@ -14,18 +14,19 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2H0PZT/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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-feature [36m?!+»✘[0m [2m↑[0m [32m+2[0m [31m-3[0m [32m↑1[0m ./feature [2m689c2504[0m [2m10 months ago[0m [2mAdd files[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++ feature [36m?!+»✘[0m [2m↑[0m [32m+2[0m [31m-3[0m [32m↑1[0m ./feature [2m689c2504[0m [2m10 months ago[0m [2mAdd files[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 55f3e6a73..67fd45e92 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,9 +25,9 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[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-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m≡[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__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex a801d50ff..71064d049 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,8 +26,8 @@ exit_code: 0----- stdout ---------- stderr ------[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[0m [2m≡[0m [2m./feature[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[0m [2m≡[0m [2m./feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex 54dfff95e..98e0b6e5f 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[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-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m≡[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__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex 520274532..ddfa74ed2 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -11,8 +11,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -24,10 +27,10 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2morphan-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2morphan-2[0m [2m∅[0m [2m⎇[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-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2morphan-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2morphan-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 2 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snapindex 68bd54735..e1b5a3400 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap@@ -14,19 +14,20 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpD5FR6P/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-bugfix-y [2m↑[0m [32m↑1[0m ./bugfix-y [2m412a27c8[0m [2m10 months ago[0m [2mFix bug[0m-feature-x [36m+[0m [2m↑[0m [32m+5[0m [32m↑3[0m ./feature-x [2m7fd821aa[0m [2m10 months ago[0m [2mAdd file 3[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 [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ bugfix-y [2m↑[0m [32m↑1[0m ./bugfix-y [2m412a27c8[0m [2m10 months ago[0m [2mFix bug[0m++ feature-x [36m+[0m [2m↑[0m [32m+5[0m [32m↑3[0m ./feature-x [2m7fd821aa[0m [2m10 months ago[0m [2mAdd file 3[0m⚪ [2mShowing 3 worktrees, 1 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 68db0a8be..23a8d85e8 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,7 +25,7 @@ exit_code: 0----- stdout ---------- stderr ------[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+ [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⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snapindex caa1c9bab..adc40bd09 100644--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap@@ -14,20 +14,21 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZcLs5v/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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-main-symbol [2m↑[0m 💬 [32m↑1[0m ./main-symbol [2m579fcd0b[0m [2m10 months ago[0m [2mSymbol commit[0m-pr-link [2m↑[0m 🤖 [32m↑1[0m ./pr-link [2me17e7d2d[0m [2m10 months ago[0m [2mPR commit[0m-wli-sequence [36m?![0m [2m↑[0m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./wli-sequence [2ma2483ffd[0m [2m10 months ago[0m [2mInitial content[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++ main-symbol [2m↑[0m 💬 [32m↑1[0m ./main-symbol [2m579fcd0b[0m [2m10 months ago[0m [2mSymbol commit[0m++ pr-link [2m↑[0m 🤖 [32m↑1[0m ./pr-link [2me17e7d2d[0m [2m10 months ago[0m [2mPR commit[0m++ wli-sequence [36m?![0m [2m↑[0m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./wli-sequence [2ma2483ffd[0m [2m10 months ago[0m [2mInitial content[0m⚪ [2mShowing 4 worktrees, 1 with changes, 3 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snapindex 4cea47246..aa5a02468 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35m(detached)[0m [1m[35m.[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[35m(detached)[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snapindex 43edb53b3..8e2c18645 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap@@ -16,19 +16,20 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLRKSnc/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [36m?[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-feature-b [2m↑[0m [32m↑1[0m [32m+1[0m [31m-1[0m ./feature-b [2m2d37ca75[0m [2m10 months ago[0m [2mTest commit[0m+ [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 [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-a[0m [36m?[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ feature-b [2m↑[0m [32m↑1[0m [32m+1[0m [31m-1[0m ./feature-b [2m2d37ca75[0m [2m10 months ago[0m [2mTest commit[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex 0994db378..695f6fb36 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,17 +26,17 @@ exit_code: 0----- stdout ---------- stderr ------[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-1[0m [2m≡[0m [2m./feature-1[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-10[0m [2m≡[0m [2m./feature-10[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-2[0m [2m≡[0m [2m./feature-2[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-3[0m [2m≡[0m [2m./feature-3[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-4[0m [2m≡[0m [2m./feature-4[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-5[0m [2m≡[0m [2m./feature-5[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-6[0m [2m≡[0m [2m./feature-6[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-7[0m [2m≡[0m [2m./feature-7[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-8[0m [2m≡[0m [2m./feature-8[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-9[0m [2m≡[0m [2m./feature-9[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-1[0m [2m≡[0m [2m./feature-1[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-10[0m [2m≡[0m [2m./feature-10[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-2[0m [2m≡[0m [2m./feature-2[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-3[0m [2m≡[0m [2m./feature-3[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-4[0m [2m≡[0m [2m./feature-4[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-5[0m [2m≡[0m [2m./feature-5[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-6[0m [2m≡[0m [2m./feature-6[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-7[0m [2m≡[0m [2m./feature-7[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-8[0m [2m≡[0m [2m./feature-8[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-9[0m [2m≡[0m [2m./feature-9[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 11 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex 46153a94f..0f33bf187 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,10 +26,10 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-c[0m [2m≡[0m [2m./feature-c[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-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-c[0m [2m≡[0m [2m./feature-c[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snapindex a25c7d82c..1782a031f 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap@@ -15,21 +15,22 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpraNfYu/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2m↑[0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m-feature-newest [2m↑[0m [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m-feature-middle [2m↑[0m [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m-feature-oldest [2m↑[0m [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago[0m [2mCommit at 00:30[0m+ [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 [2m↑[0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m++ feature-newest [2m↑[0m [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m++ feature-middle [2m↑[0m [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m++ feature-oldest [2m↑[0m [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__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snapindex 615a0086b..f479bfeb5 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------[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+ [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⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex 984a8df75..348b0ab70 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------[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[0m [2m≡[0m [33m⊠[0m [2m./locked[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnormal[0m [2m≡[0m [2m./normal[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++ [2mlocked[0m [2m≡[0m [33m⊠[0m [2m./locked[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mnormal[0m [2m≡[0m [2m./normal[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex ac9a8e1a2..a24655849 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap@@ -16,19 +16,20 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCaj3LZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./ahead [32m↑1[0m [2m[31m↓0[0m [2m2fff52c2[0m [2m10 months ago[0m [2mAhead commit[0m-[2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ [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 [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./ahead [32m↑1[0m [2m[31m↓0[0m [2m2fff52c2[0m [2m10 months ago[0m [2mAhead commit[0m++ [2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 8e0762ff1..2a28d65a9 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -14,18 +14,19 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwy34yD/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ---------- stderr ------[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∅[0m [2m↓[0m [2m[31m↓1[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[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 [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m++ [2mfeature-test[0m [2m∅[0m [2m↓[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 b40e8a1b4..a74c42084 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,9 +25,9 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m 🔄 [2m./emoji[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmulti[0m [2m≡[0m 👨💻 [2m./multi[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++ [2memoji[0m [2m≡[0m 🔄 [2m./emoji[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mmulti[0m [2m≡[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 825e479cc..327142768 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,11 +26,11 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2manother-branch[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-without-worktree[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfix-bug[0m [2m∅[0m [2m⎇[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-with-worktree[0m [2m≡[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2manother-branch[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-without-worktree[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfix-bug[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snapindex fc55f8e3f..780b1dd6b 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@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[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-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m≡[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 06217669c..529debcf5 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@@ -10,8 +10,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -23,10 +26,10 @@ exit_code: 0----- stdout ---------- stderr ------[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-alpha[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-beta[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-gamma[0m [2m∅[0m [2m⎇[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.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mbranch-alpha[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mbranch-beta[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mbranch-gamma[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 5ffb08f54..5bd45d71e 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -16,23 +16,24 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: C- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBwHpRJ/mock-bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkbqh7q:/opt/homebrew/lib/node_modules/@openai/codex/vendor/aarch64-apple-darwin/path:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin"+ PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZeSbTH/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBwHpRJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZeSbTH/test-config.toml---success: trueexit_code: 0----- stdout ---------- stderr ------[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 [2m↑[0m[2m⇡[0m [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≡[0m [2m⇣[0m [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-diverged [2m↑[0m[2m⇅[0m [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≡[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≡[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ [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 [2m↑[0m[2m⇡[0m [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≡[0m [2m⇣[0m [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m++ diverged [2m↑[0m[2m⇅[0m [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≡[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≡[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 fe1d3647d..5d0d16452 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,11 +25,11 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./clean-no-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mclean-with-status[0m [2m≡[0m 💬 [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-dirty-no-status [36m![0m [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mdirty-with-status[0m [36m?[0m [2m≡[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≡[0m [2m./clean-no-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mclean-with-status[0m [2m≡[0m 💬 [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ dirty-no-status [36m![0m [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mdirty-with-status[0m [36m?[0m [2m≡[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__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snapindex a950a65d2..057cec232 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap@@ -27,7 +27,7 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35mmain[0m [1m[35m.[0m [SHA] [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.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snapindex 3bf6faa9b..49a068567 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap@@ -28,8 +28,8 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35mmain[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m-[2mfeature[0m [2m∅[0m [2m⎇[0m [SHA] [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.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature[0m [2m∅[0m [2m⎇[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snapindex a950a65d2..057cec232 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap@@ -27,7 +27,7 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35mmain[0m [1m[35m.[0m [SHA] [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.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snapindex a950a65d2..057cec232 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap@@ -27,7 +27,7 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35mmain[0m [1m[35m.[0m [SHA] [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.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snapindex a950a65d2..057cec232 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap@@ -27,7 +27,7 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-[1m[35mmain[0m [1m[35m.[0m [SHA] [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.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex f5c39c755..5a05429b7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -15,6 +15,7 @@ info:GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/nullGIT_CONFIG_VALUE_0: "false"+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"diff --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 55276d187..cdb9cb00c 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,8 +25,8 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./feature[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[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 [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >…[0m++ [2mfeature[0m [2m≡[0m [2m./feature[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >…[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 d79916582..99b8b85bf 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@@ -9,20 +9,23 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpU2gA5K/test-config.toml---success: trueexit_code: 0----- stdout ---------- stderr ------[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+ [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⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex 5d5086f03..a1900edfa 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@@ -9,8 +9,11 @@ info:COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mno-changes[0m [2m≡[0m [2m./no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-with-changes [36m![0m [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≡[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mno-changes[0m [2m≡[0m [2m./no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ with-changes [36m![0m [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 771a36656..12af58f93 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@@ -9,8 +9,11 @@ info:COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,9 +25,9 @@ exit_code: 0----- stdout ---------- stderr ------[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 [36m?[0m [2m≡[0m [2m./huge[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-tiny [36m![0m [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 [36m?[0m [2m≡[0m [2m./huge[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ tiny [36m![0m [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 41997102e..552bdb8ac 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@@ -9,8 +9,11 @@ info:COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------[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 [36m?[0m [2m≡[0m [2m./feature-large[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-medium[0m [36m?[0m [2m≡[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-small[0m [36m?[0m [2m≡[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 [36m?[0m [2m≡[0m [2m./feature-large[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-medium[0m [36m?[0m [2m≡[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mfeature-small[0m [36m?[0m [2m≡[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 039c0f055..d5bc078eb 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m-[2manother-extremely-long-name-here[0m [2m≡[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m-[2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m-[2mvery-long-feature-branch-name[0m [2m≡[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10 months ago[0m+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m+@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m++ [2manother-extremely-long-name-here[0m [2m≡[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m++ [2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m++ [2mvery-long-feature-branch-name[0m [2m≡[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10 months ago[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snapindex 16a0221f5..a12e8cc63 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m-[2mlong[0m [2m≡[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m-[2mmedium[0m [2m≡[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10 months ago[0m-[2mx[0m [2m≡[0m [2m./x[0m [2mb834638e[0m [2m10 months ago[0m+ [1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m+@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m++ [2mlong[0m [2m≡[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m++ [2mmedium[0m [2m≡[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10 months ago[0m++ [2mx[0m [2m≡[0m [2m./x[0m [2mb834638e[0m [2m10 months ago[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snapindex 997ab0ec9..72c423bac 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbb[0m [2m≡[0m [2m./bb[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mccc[0m [2m≡[0m [2m./ccc[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++ [2ma[0m [2m≡[0m [2m./a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mbb[0m [2m≡[0m [2m./bb[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mccc[0m [2m≡[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 bdabbee93..5aa7a066b 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@@ -9,8 +9,11 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_COUNT: "1"GIT_CONFIG_GLOBAL: /dev/null+ GIT_CONFIG_KEY_0: advice.mergeConflictGIT_CONFIG_SYSTEM: /dev/null+ GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -22,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------[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≡[0m [2m./café[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnaive[0m [2m≡[0m [2m./naïve[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mresume[0m [2m≡[0m [2m./résumé[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++ [2mcafe[0m [2m≡[0m [2m./café[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mnaive[0m [2m≡[0m [2m./naïve[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m++ [2mresume[0m [2m≡[0m [2m./résumé[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0m