Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Distinguish same commit from ancestor in integration detection
Maximilian Roosa0879623fc71
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.mdindex a50125d0a..e8929c38c 100644--- a/docs/content/claude-code.md+++ b/docs/content/claude-code.md@@ -20,7 +20,7 @@ The plugin adds status indicators to `wt list`:@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>+ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>9606cd0f</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>+ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>afd3b353</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>-+ <span class=d>wip-docs</span> <span class=c>?</span><span class=d>·</span> <span class=d>./repo.wip-docs</span> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>++ <span class=d>wip-docs</span> <span class=c>?</span><span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>⚪ <span class=d>Showing 4 worktrees, 2 ahead</span>{% end %}diff --git a/docs/content/list.md b/docs/content/list.mdindex 4fbc5ef42..be944bc14 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -114,7 +114,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⤴` | Rebase in progress || | `⤵` | Merge in progress || | `✗` | Would conflict if merged to main |-| | `·` | Same commit |+| | `_` | Same commit as main || | `⊂` | [Content integrated](@/remove.md#branch-cleanup) (`--full` detects additional cases) || Main divergence | `^` | Is the main branch || | `↕` | Diverged from main |@@ -129,7 +129,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⊟` | Prunable (directory missing) || | `⊞` | Locked worktree |-Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`·` same commit or `⊂` content integrated).+Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`_` same commit or `⊂` content integrated).## JSON output@@ -162,7 +162,7 @@ wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branc| `commit` | `{sha, short_sha, message, timestamp}` || `working_tree` | `{staged, modified, untracked, renamed, deleted, diff, diff_vs_main}` || `branch_state` | `"conflicts"` `"rebase"` `"merge"` `"would_conflict"` `"same_commit"` `"integrated"` |-| `integration_reason` | `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `branch_state == "integrated"`) |+| `integration_reason` | `"ancestor"` `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `branch_state == "integrated"`) || `main` | `{ahead, behind, diff}` (absent when `is_main`) || `remote` | `{name, branch, ahead, behind}` (absent when no tracking branch) || `worktree` | `{state, reason, detached, bare}` |diff --git a/docs/content/remove.md b/docs/content/remove.mdindex ff4e34b5b..f563a5c33 100644--- a/docs/content/remove.md+++ b/docs/content/remove.md@@ -48,7 +48,7 @@ A branch is safe to delete when its content is already reflected in the target.3. **Tree contents match** — Branch tree SHA equals main tree SHA. Commit history differs but file contents are identical (e.g., after a revert or merge commit pulling in main).4. **Merge adds nothing** — Simulated merge (`git merge-tree`) produces the same tree as main. Handles squash-merged branches where main has since advanced.-In `wt list`, `·` indicates same commit, and `⊂` indicates content is integrated. Branches showing either are dimmed as safe to delete.+In `wt list`, `_` indicates same commit, and `⊂` indicates content is integrated. Branches showing either are dimmed as safe to delete.Use `-D` to force-delete branches with unmerged changes. Use `--no-delete-branch` to keep the branch regardless of status.diff --git a/src/cli.rs b/src/cli.rsindex bde14b723..c1136cd64 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1406,7 +1406,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⤴` | Rebase in progress || | `⤵` | Merge in progress || | `✗` | Would conflict if merged to main |-| | `·` | Same commit |+| | `_` | Same commit as main || | `⊂` | [Content integrated](@/remove.md#branch-cleanup) (`--full` detects additional cases) || Main divergence | `^` | Is the main branch || | `↕` | Diverged from main |@@ -1421,7 +1421,7 @@ The Status column has multiple subcolumns. Within each, only the first matching| | `⊟` | Prunable (directory missing) || | `⊞` | Locked worktree |-Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`·` same commit or `⊂` content integrated).+Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`_` same commit or `⊂` content integrated).## JSON output@@ -1454,7 +1454,7 @@ wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branc| `commit` | `{sha, short_sha, message, timestamp}` || `working_tree` | `{staged, modified, untracked, renamed, deleted, diff, diff_vs_main}` || `branch_state` | `"conflicts"` `"rebase"` `"merge"` `"would_conflict"` `"same_commit"` `"integrated"` |-| `integration_reason` | `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `branch_state == "integrated"`) |+| `integration_reason` | `"ancestor"` `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `branch_state == "integrated"`) || `main` | `{ahead, behind, diff}` (absent when `is_main`) || `remote` | `{name, branch, ahead, behind}` (absent when no tracking branch) || `worktree` | `{state, reason, detached, bare}` |@@ -1643,7 +1643,7 @@ A branch is safe to delete when its content is already reflected in the target.3. **Tree contents match** — Branch tree SHA equals main tree SHA. Commit history differs but file contents are identical (e.g., after a revert or merge commit pulling in main).4. **Merge adds nothing** — Simulated merge (`git merge-tree`) produces the same tree as main. Handles squash-merged branches where main has since advanced.-In `wt list`, `·` indicates same commit, and `⊂` indicates content is integrated. Branches showing either are dimmed as safe to delete.+In `wt list`, `_` indicates same commit, and `⊂` indicates content is integrated. Branches showing either are dimmed as safe to delete.Use `-D` to force-delete branches with unmerged changes. Use `--no-delete-branch` to keep the branch regardless of status.diff --git a/src/commands/list/json_output.rs b/src/commands/list/json_output.rsindex 7afc518f3..839e27d25 100644--- a/src/commands/list/json_output.rs+++ b/src/commands/list/json_output.rs@@ -47,7 +47,7 @@ pub struct JsonItem {pub branch_state: Option<&'static str>,/// Why branch is integrated (only present when branch_state == "integrated")- /// Values: trees_match, no_added_changes, merge_adds_nothing+ /// Values: ancestor, trees_match, no_added_changes, merge_adds_nothing#[serde(skip_serializing_if = "Option::is_none")]pub integration_reason: Option<&'static str>,diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex 96b3e6a4d..e6f5435c6 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -17,8 +17,8 @@//!//! Example with branch_state, working_tree, and user_marker used://! ```text-//! Row 1: "· 🤖" (branch=·, working=space, user=🤖)-//! Row 2: "·?! " (branch=·, working=?!, user=space)+//! Row 1: "_ 🤖" (branch=_, working=space, user=🤖)+//! Row 2: "_?! " (branch=_, working=?!, user=space)//! Row 3: " 💬" (branch=space, working=space, user=💬)//! ```//!diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 5da9778e1..b546ad453 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -1,5 +1,5 @@use std::path::PathBuf;-use worktrunk::git::LineDiff;+use worktrunk::git::{IntegrationReason, LineDiff};use super::ci_status::PrStatus;use super::columns::ColumnKind;@@ -528,6 +528,7 @@ impl ListItem {data.is_main,default_branch,self.is_ancestor,+ self.counts.as_ref().map(|c| c.behind),self.committed_trees_match.unwrap_or(false),self.has_file_changes,self.would_merge_add,@@ -572,8 +573,14 @@ impl ListItem {let branch_state = if has_merge_tree_conflicts {BranchState::WouldConflict} else if self.is_ancestor == Some(true) {- // Branch HEAD is ancestor of main - same commit or already merged- BranchState::SameCommit+ // Branch HEAD is ancestor of main+ if self.counts.as_ref().is_some_and(|c| c.behind == 0) {+ // Same commit as main+ BranchState::SameCommit+ } else {+ // Main has moved past this branch+ BranchState::Integrated(IntegrationReason::Ancestor)+ }} else if self.has_file_changes == Some(false) {// No file changes beyond merge-base - content is integratedBranchState::Integrated(IntegrationReason::NoAddedChanges)@@ -584,7 +591,8 @@ impl ListItem {// Merge simulation shows no changes would be added (--full only)BranchState::Integrated(IntegrationReason::MergeAddsNothing)} else if let Some(ref c) = self.counts {- if c.ahead == 0 {+ if c.ahead == 0 && c.behind == 0 {+ // Same commit as main (fallback when is_ancestor not computed)BranchState::SameCommit} else {BranchState::None@@ -613,20 +621,23 @@ impl ListItem {////// # States (priority order)///-/// 1. **`SameCommit`**: Branch HEAD is ancestor of main (same commit or already merged).+/// 1. **`SameCommit`**: Branch HEAD is exactly the same commit as main.///-/// 2. **`Integrated(NoAddedChanges)`**: Commits exist but no file changes beyond merge-base.+/// 2. **`Integrated(Ancestor)`**: Branch HEAD is ancestor of main (main has moved past).+///+/// 3. **`Integrated(NoAddedChanges)`**: Commits exist but no file changes beyond merge-base./// The three-dot diff (`main...branch`) is empty.///-/// 3. **`Integrated(TreesMatch)`**: Tree SHA matches main, or working tree matches main.+/// 4. **`Integrated(TreesMatch)`**: Tree SHA matches main, or working tree matches main./// Examples: merge commits that pull in main, rebases, squash merges.///-/// 4. **`Integrated(MergeAddsNothing)`**: Merge simulation adds nothing to main.+/// 5. **`Integrated(MergeAddsNothing)`**: Merge simulation adds nothing to main./// Catches squash-merged branches where main has advanced.////// # Parameters////// - `is_ancestor`: Whether branch HEAD is ancestor of main (None = not computed)+/// - `behind_main`: Number of commits branch is behind main (None = not computed)/// - `committed_trees_match`: Whether committed tree SHAs match (HEAD^{tree} == main^{tree})/// - `has_file_changes`: Whether three-dot diff has file changes (None = not computed)/// - `would_merge_add`: Whether merge simulation shows changes (None = not computed, `--full` only)@@ -637,6 +648,7 @@ fn determine_worktree_base_state(is_main: bool,default_branch: Option<&str>,is_ancestor: Option<bool>,+ behind_main: Option<usize>,committed_trees_match: bool,has_file_changes: Option<bool>,would_merge_add: Option<bool>,@@ -649,22 +661,27 @@ fn determine_worktree_base_state(let is_clean = working_tree_diff.map(|d| d.is_empty()).unwrap_or(true);- // Priority 1: Branch is ancestor of main (same commit or already merged)- if is_ancestor == Some(true) && is_clean {+ // Priority 1: Branch is exactly the same commit as main (ancestor with 0 behind)+ if is_ancestor == Some(true) && behind_main == Some(0) && is_clean {return BranchState::SameCommit;}- // Priority 2: No file changes beyond merge-base (squash-merged)+ // Priority 2: Branch is ancestor of main but main has moved past (already merged)+ if is_ancestor == Some(true) && is_clean {+ return BranchState::Integrated(IntegrationReason::Ancestor);+ }++ // Priority 3: No file changes beyond merge-base (squash-merged)if has_file_changes == Some(false) && is_clean {return BranchState::Integrated(IntegrationReason::NoAddedChanges);}- // Priority 3: Tree SHA matches main (squash merge/rebase with identical content)+ // Priority 4: Tree SHA matches main (squash merge/rebase with identical content)if committed_trees_match && is_clean {return BranchState::Integrated(IntegrationReason::TreesMatch);}- // Priority 4: Working tree matches main+ // Priority 5: Working tree matches mainlet working_tree_matches_main = working_tree_diff_with_main.as_ref().and_then(|opt| opt.as_ref())@@ -674,7 +691,7 @@ fn determine_worktree_base_state(return BranchState::Integrated(IntegrationReason::TreesMatch);}- // Priority 5: Merge simulation shows no changes (--full only)+ // Priority 6: Merge simulation shows no changes (--full only)if would_merge_add == Some(false) && is_clean {return BranchState::Integrated(IntegrationReason::MergeAddsNothing);}@@ -866,11 +883,11 @@ impl serde::Serialize for WorktreeState {/// 2. Rebase (⤴) - active operation/// 3. Merge (⤵) - active operation/// 4. WouldConflict (✗) - potential problem (merge-tree simulation)-/// 5. SameCommit (·) - removable, branch is ancestor of main+/// 5. SameCommit (_) - removable, branch is exactly the same commit as main/// 6. Integrated (⊂) - removable, content is in main via different history////// The `Integrated` variant carries an [`IntegrationReason`] explaining how the-/// content was integrated (trees match, no added changes, or merge adds nothing).+/// content was integrated (ancestor, trees match, no added changes, or merge adds nothing).#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]pub enum BranchState {/// Normal working branch@@ -884,38 +901,12 @@ pub enum BranchState {Merge,/// Merge-tree conflicts with main (simulated via git merge-tree)WouldConflict,- /// Branch HEAD is same commit as main or ancestor of main+ /// Branch HEAD is exactly the same commit as mainSameCommit,/// Content is integrated into main via different historyIntegrated(IntegrationReason),}-/// Reason why branch content is considered integrated into main-///-/// These explain HOW the content was integrated, separate from the fact-/// that it IS integrated.-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]-#[serde(rename_all = "snake_case")]-pub enum IntegrationReason {- /// Tree SHA matches main - identical file contents- TreesMatch,- /// No file changes beyond merge-base (three-dot diff empty)- NoAddedChanges,- /// Merge simulation adds nothing to main- MergeAddsNothing,-}--impl IntegrationReason {- /// Returns the JSON string representation for integration_reason field.- pub fn as_json_str(self) -> &'static str {- match self {- Self::TreesMatch => "trees_match",- Self::NoAddedChanges => "no_added_changes",- Self::MergeAddsNothing => "merge_adds_nothing",- }- }-}-impl std::fmt::Display for BranchState {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {@@ -924,7 +915,7 @@ impl std::fmt::Display for BranchState {Self::Rebase => write!(f, "⤴"),Self::Merge => write!(f, "⤵"),Self::WouldConflict => write!(f, "✗"),- Self::SameCommit => write!(f, "·"),+ Self::SameCommit => write!(f, "_"),// All integration reasons use ⊂ (content is subset of main)Self::Integrated(_) => write!(f, "⊂"),}@@ -1031,7 +1022,7 @@ impl PositionMask {1, // STAGED: + (1 char)1, // MODIFIED: ! (1 char)1, // UNTRACKED: ? (1 char)- 1, // BRANCH_STATE: ✘⤴⤵✗·⊂ (1 char, priority: conflicts > rebase > merge > would_conflict > same_commit > integrated)+ 1, // BRANCH_STATE: ✘⤴⤵✗_⊂ (1 char, priority: conflicts > rebase > merge > would_conflict > same_commit > integrated)1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)1, // WORKTREE_STATE: / for branches, ⚑⊟⊞ for worktrees (priority: path_mismatch > prunable > locked)@@ -1049,7 +1040,7 @@ impl PositionMask {////// Symbols are categorized to enable vertical alignment in table output:/// - Working tree: +, !, ? (staged, modified, untracked - priority order)-/// - Branch/op state: ✘, ⤴, ⤵, ✗, ·, ⊂ (combined position with priority)+/// - Branch/op state: ✘, ⤴, ⤵, ✗, _, ⊂ (combined position with priority)/// - Main divergence: ^, ↕, ↑, ↓/// - Upstream divergence: ⇅, ⇡, ⇣/// - Worktree state: / for branches, ⚑⊟⊞ for worktrees (priority-only)@@ -1058,12 +1049,12 @@ impl PositionMask {/// ## Mutual Exclusivity////// **Combined with priority (branch state + git operation):**-/// Priority: ✘ > ⤴ > ⤵ > ✗ > · > ⊂+/// Priority: ✘ > ⤴ > ⤵ > ✗ > _ > ⊂/// - ✘: Actual conflicts (must resolve)/// - ⤴: Rebase in progress/// - ⤵: Merge in progress/// - ✗: Merge-tree conflicts (potential problem)-/// - ·: Same commit (removable)+/// - _: Same commit as main (removable)/// - ⊂: Content integrated (removable)////// **Mutually exclusive (enforced by type system):**@@ -1079,7 +1070,7 @@ impl PositionMask {#[derive(Debug, Clone, Default)]pub struct StatusSymbols {/// Branch state (mutually exclusive with priority)- /// Priority: Conflicts (✘) > Rebase (⤴) > Merge (⤵) > WouldConflict (✗) > SameCommit (·) > Integrated (⊂)+ /// Priority: Conflicts (✘) > Rebase (⤴) > Merge (⤵) > WouldConflict (✗) > SameCommit (_) > Integrated (⊂)pub(crate) branch_state: BranchState,/// Worktree state: / for branches, ⚑⊟⊞ for worktrees (priority: path_mismatch > prunable > locked)@@ -1464,6 +1455,8 @@ mod tests {#[test]fn test_integration_reason_as_json_str() {+ assert_eq!(IntegrationReason::SameCommit.as_json_str(), "same_commit");+ assert_eq!(IntegrationReason::Ancestor.as_json_str(), "ancestor");assert_eq!(IntegrationReason::TreesMatch.as_json_str(), "trees_match");assert_eq!(IntegrationReason::NoAddedChanges.as_json_str(),@@ -1483,6 +1476,10 @@ mod tests {assert_eq!(BranchState::SameCommit.integration_reason(), None);// Integrated states return the reason+ assert_eq!(+ BranchState::Integrated(IntegrationReason::Ancestor).integration_reason(),+ Some(IntegrationReason::Ancestor)+ );assert_eq!(BranchState::Integrated(IntegrationReason::TreesMatch).integration_reason(),Some(IntegrationReason::TreesMatch)diff --git a/src/git/mod.rs b/src/git/mod.rsindex cbfc7b6ff..b5eb811b2 100644--- a/src/git/mod.rs+++ b/src/git/mod.rs@@ -46,21 +46,28 @@ pub use repository::{Repository, ResolvedWorktree, set_base_path};/// Used by both `wt list` (for status symbols) and `wt remove` (for messages)./// Each variant corresponds to a specific integration check. In `wt list`,/// two symbols represent these checks:-/// - `·` for [`SameCommit`](Self::SameCommit) (identical commit)+/// - `_` for [`SameCommit`](Self::SameCommit) (identical commit)/// - `⊂` for all others (content integrated via different history)////// The checks are ordered by cost (cheapest first):/// 1. [`SameCommit`](Self::SameCommit) - commit SHA comparison (~1ms)-/// 2. [`NoAddedChanges`](Self::NoAddedChanges) - three-dot diff (~50-100ms)-/// 3. [`TreesMatch`](Self::TreesMatch) - tree SHA comparison (~100-300ms)-/// 4. [`MergeAddsNothing`](Self::MergeAddsNothing) - merge simulation (~500ms-2s)-#[derive(Debug, Clone, Copy, PartialEq, Eq)]+/// 2. [`Ancestor`](Self::Ancestor) - ancestor check (~1ms)+/// 3. [`NoAddedChanges`](Self::NoAddedChanges) - three-dot diff (~50-100ms)+/// 4. [`TreesMatch`](Self::TreesMatch) - tree SHA comparison (~100-300ms)+/// 5. [`MergeAddsNothing`](Self::MergeAddsNothing) - merge simulation (~500ms-2s)+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]+#[serde(rename_all = "snake_case")]pub enum IntegrationReason {/// Branch HEAD is literally the same commit as target.///- /// Symbol in `wt list`: `·`+ /// Symbol in `wt list`: `_`SameCommit,+ /// Branch HEAD is an ancestor of target (target has moved past this branch).+ ///+ /// Symbol in `wt list`: `⊂`+ Ancestor,+/// Three-dot diff (`main...branch`) shows no files./// The branch has no file changes beyond the merge-base.///@@ -85,11 +92,23 @@ impl IntegrationReason {pub fn description(&self) -> &'static str {match self {Self::SameCommit => "already in",+ Self::Ancestor => "already in",Self::NoAddedChanges => "no file changes",Self::TreesMatch => "files match",Self::MergeAddsNothing => "all changes in",}}++ /// Returns the JSON string representation.+ pub fn as_json_str(self) -> &'static str {+ match self {+ Self::SameCommit => "same_commit",+ Self::Ancestor => "ancestor",+ Self::NoAddedChanges => "no_added_changes",+ Self::TreesMatch => "trees_match",+ Self::MergeAddsNothing => "merge_adds_nothing",+ }+ }}/// Category of branch for completion displaydiff --git a/src/md_help.rs b/src/md_help.rsindex 72487c9de..5609de744 100644--- a/src/md_help.rs+++ b/src/md_help.rs@@ -345,7 +345,7 @@ fn colorize_status_symbols(text: &str) -> String {.replace("● no-ci", &format!("{disabled}●{disabled:#} no-ci"));// Symbols that should remain dimmed are already dimmed from backtick rendering:- // - Branch state: · (same commit), ⊂ (content integrated)+ // - Branch state: _ (same commit), ⊂ (content integrated)// - Main divergence: ^, ↑, ↓, ↕// - Upstream divergence: |, ⇡, ⇣, ⇅// - Worktree state: / (branch without worktree)diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 91a904918..898a9c60a 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -74,18 +74,24 @@ fn get_integration_reason(return Some(IntegrationReason::SameCommit);}- // Check 2: Does branch have no file changes beyond merge-base (empty three-dot diff)?+ // Check 2 (cheap): Is branch an ancestor of target (target has moved past)?+ // On error, continue to next check+ if repo.is_ancestor(branch_name, target).unwrap_or(false) {+ return Some(IntegrationReason::Ancestor);+ }++ // Check 3: Does branch have no file changes beyond merge-base (empty three-dot diff)?// On error, conservatively assume branch HAS changes (won't delete)if !repo.has_added_changes(branch_name, target).unwrap_or(true) {return Some(IntegrationReason::NoAddedChanges);}- // Check 3: Does tree content match (handles squash merge/rebase)?+ // Check 4: Does tree content match (handles squash merge/rebase)?if repo.trees_match(branch_name, target).unwrap_or(false) {return Some(IntegrationReason::TreesMatch);}- // Check 4: Would merging this branch into target add anything?+ // Check 5: Would merging this branch into target add anything?// This handles squash-merged branches where target has since advanced.// If merge would NOT add anything, the branch's content is already in target.if !repo@@ -178,7 +184,7 @@ fn get_flag_note(} else if let Some(target) = target_branch {// Show integration reason when branch is deleted (both wt merge and wt remove)match deletion_result {- Some(Some(IntegrationReason::SameCommit)) => {+ Some(Some(IntegrationReason::SameCommit | IntegrationReason::Ancestor)) => {format!(" (already in {target})")}Some(Some(IntegrationReason::NoAddedChanges)) => " (no file changes)".to_string(),diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snapindex 8083218fb..529479382 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap@@ -5,8 +5,8 @@ expression: normalized> [QUERY] │[PREVIEW_HEADER]Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog> @ main ^ ./repo ..│- + feature-one · ./repo.fea..│⚪ main has no uncommitted changes- + feature-two · ./repo.fea..│+ + feature-one _ ./repo.fea..│⚪ main has no uncommitted changes+ + feature-two _ ./repo.fea..││││diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snapindex c800e2c0e..d8b66af7a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap@@ -5,8 +5,8 @@ expression: normalized> [QUERY] │[PREVIEW_HEADER]Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog> @ main ^ ./repo │- + active-worktree · ./repo..│⚪ main has no uncommitted changes- orphan-branch · / │+ + active-worktree _ ./repo..│⚪ main has no uncommitted changes+ orphan-branch _ / ││││diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 50280e3de..bc5aa9983 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -123,7 +123,7 @@ The Status column has multiple subcolumns. Within each, only the first matching[33m⤴[0m Rebase in progress[33m⤵[0m Merge in progress[33m✗[0m Would conflict if merged to main- [2m·[0m Same commit+ [2m_[0m Same commit as main[2m⊂[0m Content integrated ([2m--full[0m detects additional cases)Main divergence [2m^[0m Is the main branch[2m↕[0m Diverged from main@@ -138,7 +138,7 @@ The Status column has multiple subcolumns. Within each, only the first matching[33m⊟[0m Prunable (directory missing)[33m⊞[0m Locked worktree-Rows are dimmed when the branch content is already in main ([2m·[0m same commit or [2m⊂[0m content integrated).+Rows are dimmed when the branch content is already in main ([2m_[0m same commit or [2m⊂[0m content integrated).[32mJSON output[0m@@ -161,24 +161,24 @@ Query structured data with [2m--format=json[0m:[1mFields:[0m- Field Description- ────────────────── ─────────────────────────────────────────────────────────────────────────────────────────- [2mbranch[0m Branch name (null for detached HEAD)- [2mpath[0m Worktree path (absent for branches without worktrees)- [2mkind[0m [2m"worktree"[0m or [2m"branch"[0m- [2mcommit[0m [2m{sha, short_sha, message, timestamp}[0m- [2mworking_tree[0m [2m{staged, modified, untracked, renamed, deleted, diff, diff_vs_main}[0m- [2mbranch_state[0m [2m"conflicts"[0m [2m"rebase"[0m [2m"merge"[0m [2m"would_conflict"[0m [2m"same_commit"[0m [2m"integrated"[0m- [2mintegration_reason[0m [2m"trees_match"[0m [2m"no_added_changes"[0m [2m"merge_adds_nothing"[0m (when [2mbranch_state == "integrated"[0m)- [2mmain[0m [2m{ahead, behind, diff}[0m (absent when [2mis_main[0m)- [2mremote[0m [2m{name, branch, ahead, behind}[0m (absent when no tracking branch)- [2mworktree[0m [2m{state, reason, detached, bare}[0m- [2mis_main[0m Main worktree- [2mis_current[0m Current worktree- [2mis_previous[0m Previous worktree from wt switch- [2mpr[0m [2m{ci, source, stale, url}[0m — CI status from PR or branch (absent when no CI)- [2mstatusline[0m Pre-formatted status with ANSI colors- [2msymbols[0m Raw status symbols without colors (e.g., [2m"!?↓"[0m)+ Field Description+ ────────────────── ────────────────────────────────────────────────────────────────────────────────────────────────────+ [2mbranch[0m Branch name (null for detached HEAD)+ [2mpath[0m Worktree path (absent for branches without worktrees)+ [2mkind[0m [2m"worktree"[0m or [2m"branch"[0m+ [2mcommit[0m [2m{sha, short_sha, message, timestamp}[0m+ [2mworking_tree[0m [2m{staged, modified, untracked, renamed, deleted, diff, diff_vs_main}[0m+ [2mbranch_state[0m [2m"conflicts"[0m [2m"rebase"[0m [2m"merge"[0m [2m"would_conflict"[0m [2m"same_commit"[0m [2m"integrated"[0m+ [2mintegration_reason[0m [2m"ancestor"[0m [2m"trees_match"[0m [2m"no_added_changes"[0m [2m"merge_adds_nothing"[0m (when [2mbranch_state == "integrated"[0m)+ [2mmain[0m [2m{ahead, behind, diff}[0m (absent when [2mis_main[0m)+ [2mremote[0m [2m{name, branch, ahead, behind}[0m (absent when no tracking branch)+ [2mworktree[0m [2m{state, reason, detached, bare}[0m+ [2mis_main[0m Main worktree+ [2mis_current[0m Current worktree+ [2mis_previous[0m Previous worktree from wt switch+ [2mpr[0m [2m{ci, source, stale, url}[0m — CI status from PR or branch (absent when no CI)+ [2mstatusline[0m Pre-formatted status with ANSI colors+ [2msymbols[0m Raw status symbols without colors (e.g., [2m"!?↓"[0m)[32mSee also[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snapindex 40a660e9a..2b468d4a8 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap@@ -82,7 +82,7 @@ A branch is safe to delete when its content is already reflected in the target.3. [1mTree contents match[0m — Branch tree SHA equals main tree SHA. Commit history differs but file contents are identical (e.g., after a revert or merge commit pulling in main).4. [1mMerge adds nothing[0m — Simulated merge ([2mgit merge-tree[0m) produces the same tree as main. Handles squash-merged branches where main has since advanced.-In [2mwt list[0m, [2m·[0m indicates same commit, and [2m⊂[0m indicates content is integrated. Branches showing either are dimmed as safe to delete.+In [2mwt list[0m, [2m_[0m indicates same commit, and [2m⊂[0m indicates content is integrated. Branches showing either are dimmed as safe to delete.Use [2m-D[0m to force-delete branches with unmerged changes. Use [2m--no-delete-branch[0m to keep the branch regardless of status.diff --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 d3181367d..c07b78759 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@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-only[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-only[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snapindex bb7230304..cac815fd1 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2m-[0m [2m·[22m [31m⚑[39m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2m-[0m [2m_[22m [31m⚑[39m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[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 c9dbb9aa1..1579b2a0d 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@@ -110,7 +110,8 @@ exit_code: 0"deleted": 0}},- "branch_state": "same_commit",+ "branch_state": "integrated",+ "integration_reason": "ancestor","main": {"ahead": 0,"behind": 2@@ -120,8 +121,8 @@ exit_code: 0"bare": false},"is_main": false,- "statusline": "feature-behind /u001b[2m·/u001b[22m/u001b[2m↓/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",- "symbols": "·↓"+ "statusline": "feature-behind /u001b[2m⊂/u001b[22m/u001b[2m↓/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",+ "symbols": "⊂↓"}]diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex 2e759d821..4d6d718f5 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -91,8 +91,8 @@ exit_code: 0"bare": false},"is_main": false,- "statusline": "feature-detached /u001b[2m·/u001b[22m",- "symbols": "·"+ "statusline": "feature-detached /u001b[2m_/u001b[22m",+ "symbols": "_"},{"branch": "locked-feature",@@ -131,8 +131,8 @@ exit_code: 0"bare": false},"is_main": false,- "statusline": "locked-feature /u001b[2m·/u001b[22m/u001b[33m⊞/u001b[39m",- "symbols": "·⊞"+ "statusline": "locked-feature /u001b[2m_/u001b[22m/u001b[33m⊞/u001b[39m",+ "symbols": "_⊞"}]diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snapindex eb407c50c..79d5e68fe 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap@@ -91,8 +91,8 @@ exit_code: 0"bare": false},"is_main": false,- "statusline": "with-status /u001b[2m·/u001b[22m🔧",- "symbols": "·🔧"+ "statusline": "with-status /u001b[2m_/u001b[22m🔧",+ "symbols": "_🔧"},{"branch": "without-status",@@ -129,8 +129,8 @@ exit_code: 0"bare": false},"is_main": false,- "statusline": "without-status /u001b[2m·/u001b[22m",- "symbols": "·"+ "statusline": "without-status /u001b[2m_/u001b[22m",+ "symbols": "_"}]diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex c2a5f5133..046d34348 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -26,6 +26,6 @@ exit_code: 0@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ diverged [36m![39m [2m↑[22m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./repo.diverged [2m8ba5aa92[0m [2m1d[0m [2mDiverged commit[0m+ feature-changes [36m![39m[36m?[39m [2m↑[22m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./repo.feature-changes [2mb854b166[0m [2m1d[0m [2mAdd 100 lines[0m-+ [2mfix[0m [36m?[39m[2m·[22m 💬 [2m./repo.fix[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfix[0m [36m?[39m[2m_[22m 💬 [2m./repo.fix[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 with changes, 2 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 68821485a..ae3e4c78b 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@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mdevelop[0m [2m^[22m [31m⚑[39m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m·[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[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 89855437e..5ea57fbef 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@@ -20,7 +20,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m·[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[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 1fc884124..73d7471c6 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mlocked-no-reason[0m [2m·[22m [33m⊞[39m [2m./repo.locked-no-reason[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mlocked-no-reason[0m [2m_[22m [33m⊞[39m [2m./repo.locked-no-reason[0m [2mb834638e[0m [2m1d[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 5701b76e0..faec1955c 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mlocked-feature[0m [2m·[22m [33m⊞[39m [2m./repo.locked-feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mlocked-feature[0m [2m_[22m [33m⊞[39m [2m./repo.locked-feature[0m [2mb834638e[0m [2m1d[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 4ebcfb52a..4c0872490 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2m1310bfb9[0m [2m1d[0m [2mShort message[0m-+ [2mfeature-a[0m [2m·[22m[2m↓[22m [2m[31m↓1[0m [2m./repo.feature-a[0m [2mf078644e[0m [2m1d[0m [2mThis is a very long commit message that should test how the…[0m++ [2mfeature-a[0m [2m⊂[22m[2m↓[22m [2m[31m↓1[0m [2m./repo.feature-a[0m [2mf078644e[0m [2m1d[0m [2mThis is a very long commit message that should test how the…[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex d2a36a7a4..eae2672d1 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -24,9 +24,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mmedium-name[0m [2m·[22m [2m./repo.medium-name[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mshort[0m [2m·[22m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mvery-long-branch-name-here[0m [2m·[22m [2m./repo.very-long-branch-name-here[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mwith-changes[0m [2m·[22m [2m./repo.with-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mmedium-name[0m [2m_[22m [2m./repo.medium-name[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mshort[0m [2m_[22m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mvery-long-branch-name-here[0m [2m_[22m [2m./repo.very-long-branch-name-here[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mwith-changes[0m [2m_[22m [2m./repo.with-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 5 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 57fe6a956..c9b32f0ab 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m·[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[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 2891a7ed7..08c21b723 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature[0m [2m·[22m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snapindex c272bd240..5b74243ca 100644--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-- [2mfeature[0m [2m·[22m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+- [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mb834638e[0m [2m1d[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 6fc3f7d90..99e32338f 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m·[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[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 d2ed90cdc..358d0542a 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -26,8 +26,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morphan-1[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morphan-2[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morphan-1[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morphan-2[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 2 branches[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 5f579fb8d..7f1d3b349 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@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [36m?[39m[2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [36m?[39m[2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ feature-b [2m↑[22m [32m↑1[0m [32m+1[0m [31m-1[0m ./repo.feature-b [2m2d37ca75[0m [2m1d[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 bd3f01c6b..82d988e52 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@@ -25,15 +25,15 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-1[0m [2m·[22m [2m./repo.feature-1[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-10[0m [2m·[22m [2m./repo.feature-10[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-2[0m [2m·[22m [2m./repo.feature-2[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-3[0m [2m·[22m [2m./repo.feature-3[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-4[0m [2m·[22m [2m./repo.feature-4[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-5[0m [2m·[22m [2m./repo.feature-5[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-6[0m [2m·[22m [2m./repo.feature-6[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-7[0m [2m·[22m [2m./repo.feature-7[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-8[0m [2m·[22m [2m./repo.feature-8[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-9[0m [2m·[22m [2m./repo.feature-9[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-1[0m [2m_[22m [2m./repo.feature-1[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-10[0m [2m_[22m [2m./repo.feature-10[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-2[0m [2m_[22m [2m./repo.feature-2[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-3[0m [2m_[22m [2m./repo.feature-3[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-4[0m [2m_[22m [2m./repo.feature-4[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-5[0m [2m_[22m [2m./repo.feature-5[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-6[0m [2m_[22m [2m./repo.feature-6[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-7[0m [2m_[22m [2m./repo.feature-7[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-8[0m [2m_[22m [2m./repo.feature-8[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-9[0m [2m_[22m [2m./repo.feature-9[0m [2mb834638e[0m [2m1d[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 ee0bdf06b..637d492f0 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@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m·[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-c[0m [2m·[22m [2m./repo.feature-c[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-c[0m [2m_[22m [2m./repo.feature-c[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[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 01e1ec259..296722ad9 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@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mlocked[0m [2m·[22m [33m⊞[39m [2m./repo.locked[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mnormal[0m [2m·[22m [2m./repo.normal[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mlocked[0m [2m_[22m [33m⊞[39m [2m./repo.locked[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mnormal[0m [2m_[22m [2m./repo.normal[0m [2mb834638e[0m [2m1d[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 2bb4bdb56..242cbbac0 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@@ -27,6 +27,6 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ ahead [2m↑[22m[2m⇡[22m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2m2fff52c2[0m [2m1d[0m [2mAhead commit[0m-+ [2min-sync[0m [2m·[22m [2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2min-sync[0m [2m_[22m [2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m6c3da842[0m [2m1d[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 810501ff0..6743ba81a 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2me4614cb7[0m [2m1d[0m [2mFix bug with café ☕ handling[0m-+ [2mfeature-test[0m [2m·[22m[2m↓[22m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m0c53695b[0m [2m1d[0m [2mAdd support for 日本語 and émoji 🎉[0m++ [2mfeature-test[0m [2m⊂[22m[2m↓[22m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m0c53695b[0m [2m1d[0m [2mAdd support for 日本語 and émoji 🎉[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snapindex 14a939bf4..f85957beb 100644--- a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap+++ b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2memoji[0m [2m·[22m 🔄 [2m./repo.emoji[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mmulti[0m [2m·[22m 👨💻 [2m./repo.multi[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2memoji[0m [2m_[22m 🔄 [2m./repo.emoji[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mmulti[0m [2m_[22m 👨💻 [2m./repo.multi[0m [2mb834638e[0m [2m1d[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 bf1c51a6f..c0f38dd18 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -25,9 +25,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-with-worktree[0m [2m·[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2manother-branch[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mfeature-without-worktree[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mfix-bug[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2manother-branch[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature-without-worktree[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfix-bug[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[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 f45971f89..7aab7a879 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@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m·[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m·[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[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 ffe6c5031..1e5531c11 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@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-alpha[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-beta[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-gamma[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-alpha[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-beta[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-gamma[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex d9981dff4..8b3e591b5 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap@@ -26,9 +26,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mlocal-only-1[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mlocal-only-2[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-only-1[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-only-2[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mlocal-only-1[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mlocal-only-2[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-only-1[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-only-2[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 2 branches, 2 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex 2eef6c026..04ff29d92 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-with-worktree[0m [2m·[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-only[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-only[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 1 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex 0fa357ded..a82ad0feb 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-feature-1[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-feature-2[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-feature-1[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-feature-2[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 2 remote 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 38601ce20..c8595e6f7 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -28,9 +28,9 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ ahead [2m↑[22m[2m⇡[22m [32m↑2[0m [32m+2[0m ./repo.ahead [32m⇡2[0m [2m8d8f4673[0m [2m1d[0m [2mAhead commit 2[0m-+ [2mbehind[0m [2m·[22m [2m⇣[22m [2m./repo.behind[0m [2m[31m⇣1[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2mbehind[0m [2m_[22m [2m⇣[22m [2m./repo.behind[0m [2m[31m⇣1[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ diverged [2m↑[22m[2m⇅[22m [32m↑1[0m [32m+1[0m ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [2mca7cb696[0m [2m1d[0m [2mDiverged local commit[0m-+ [2min-sync[0m [2m·[22m [2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ [2mno-upstream[0m [2m·[22m [2m./repo.no-upstream[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2min-sync[0m [2m_[22m [2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2mno-upstream[0m [2m_[22m [2m./repo.no-upstream[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m⚪ [2mShowing 6 worktrees, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snapindex c2eac3481..879f97661 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap@@ -26,6 +26,6 @@ exit_code: 0@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ feature-api [2m↑[22m 🤖 [32m↑1[0m ./repo.feature-api [2m9606cd0f[0m [2m1d[0m [2mAdd REST API endpoints[0m+ review-ui [36m?[39m [2m↑[22m 💬 [32m↑1[0m ./repo.review-ui [2mafd3b353[0m [2m1d[0m [2mAdd dashboard component[0m-+ [2mwip-docs[0m [36m?[39m[2m·[22m [2m./repo.wip-docs[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mwip-docs[0m [36m?[39m[2m_[22m [2m./repo.wip-docs[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 ahead[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 a6b5d8a15..7f335a7d6 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@@ -27,6 +27,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mfeature[0m [2m·[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature[0m [2m_[22m [2m/[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snapindex 4caec79cf..e0267cda8 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@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m-+ [2mfeature[0m [2m·[22m [2m./repo.feature[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m++ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex d0a99cd4c..164568228 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@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2malso-no-changes[0m [2m·[22m [2m./repo.also-no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mno-changes[0m [2m·[22m [2m./repo.no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2malso-no-changes[0m [2m_[22m [2m./repo.also-no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mno-changes[0m [2m_[22m [2m./repo.no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ with-changes [36m![39m [32m+1[0m [31m-1[0m ./repo.with-changes [2mb834638e[0m [2m1d[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 0c29ea052..41d060fb4 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@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mhuge[0m [36m?[39m[2m·[22m [2m./repo.huge[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mhuge[0m [36m?[39m[2m_[22m [2m./repo.huge[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ tiny [36m![39m [32m+1[0m [31m-1[0m ./repo.tiny [2mb834638e[0m [2m1d[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 c79227708..4d18abf41 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@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-large[0m [36m?[39m[2m·[22m [2m./repo.feature-large[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-medium[0m [36m?[39m[2m·[22m [2m./repo.feature-medium[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-small[0m [36m?[39m[2m·[22m [2m./repo.feature-small[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-large[0m [36m?[39m[2m_[22m [2m./repo.feature-large[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-medium[0m [36m?[39m[2m_[22m [2m./repo.feature-medium[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-small[0m [36m?[39m[2m_[22m [2m./repo.feature-small[0m [2mb834638e[0m [2m1d[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 a92812386..24fcfc36a 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@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m-+ [2manother-extremely-long-name-here[0m [2m·[22m [2m./repo.another-extremely-long-name-here[0m [2mb834638e[0m [2m1d[0m-+ [2mshort[0m [2m·[22m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m-+ [2mvery-long-feature-branch-name[0m [2m·[22m [2m./repo.very-long-feature-branch-name[0m [2mb834638e[0m [2m1d[0m++ [2manother-extremely-long-name-here[0m [2m_[22m [2m./repo.another-extremely-long-name-here[0m [2mb834638e[0m [2m1d[0m++ [2mshort[0m [2m_[22m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m++ [2mvery-long-feature-branch-name[0m [2m_[22m [2m./repo.very-long-feature-branch-name[0m [2mb834638e[0m [2m1d[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 33cf633e7..50c7abfd0 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@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m·[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mmedium[0m [2m·[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mx[0m [2m·[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m_[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mmedium[0m [2m_[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mx[0m [2m_[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[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 72b7ae9dc..e2ee306bc 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@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2ma[0m [2m·[22m [2m./repo.a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mbb[0m [2m·[22m [2m./repo.bb[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mccc[0m [2m·[22m [2m./repo.ccc[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2ma[0m [2m_[22m [2m./repo.a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mbb[0m [2m_[22m [2m./repo.bb[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mccc[0m [2m_[22m [2m./repo.ccc[0m [2mb834638e[0m [2m1d[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 b3f7709a4..3a5b7beef 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@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mcafe[0m [2m·[22m [2m./repo.cafe[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mnaive[0m [2m·[22m [2m./repo.naive[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mresume[0m [2m·[22m [2m./repo.resume[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mcafe[0m [2m_[22m [2m./repo.cafe[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mnaive[0m [2m_[22m [2m./repo.naive[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mresume[0m [2m_[22m [2m./repo.resume[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0m