Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat: add integration detection for squash-merged branches

Maximilian Roos6325be289b09
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index e8929c38c..a50125d0a 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.md
index 58ce12e92..2f7f0a0c8 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -56,8 +56,8 @@ Include branches that don't have worktrees:
@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
- exp <span class=d>↕</span> <span class=d>/</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
- wip <span class=d>↕</span> <span class=d>/</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
+ <span class=d>exp</span> <span class=d>⊂</span><span class=d>↕</span> <span class=d>/</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
+ <span class=d>wip</span> <span class=d>⊂</span><span class=d>↕</span> <span class=d>/</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
{% end %}
@@ -112,8 +112,8 @@ The Status column has multiple subcolumns. Within each, only the first matching
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
| | `⚔` | Would conflict if merged to main |
-| | `≡` | Matches main (identical contents) |
-| | `_` | No commits ahead, clean working tree |
+| | `·` | Same commit |
+| | `⊂` | Content integrated (`--full` detects additional cases) |
| Main divergence | `^` | Is the main branch |
| | `↑` | Ahead of main |
| | `↓` | Behind main |
@@ -127,7 +127,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) (`≡` matches main or `_` no commits ahead).
+Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`·` same commit or `⊂` content integrated).
## JSON output
@@ -149,7 +149,7 @@ wt list --format=json | jq '.[] | select(.status.main_divergence == "Ahead")'
**Status fields:**
- `working_tree`: `{untracked, modified, staged, renamed, deleted}`
-- `branch_state`: `""` | `"Conflicts"` | `"MergeTreeConflicts"` | `"MatchesMain"` | `"NoCommits"`
+- `branch_state`: `""` | `"Conflicts"` | `"MergeTreeConflicts"` | `"TreesMatch"` | `"NoAddedChanges"` | `"MergeAddsNothing"`
- `git_operation`: `""` | `"Rebase"` | `"Merge"`
- `main_divergence`: `""` | `"Ahead"` | `"Behind"` | `"Diverged"`
- `upstream_divergence`: `""` | `"Ahead"` | `"Behind"` | `"Diverged"`
diff --git a/docs/content/remove.md b/docs/content/remove.md
index 50f9510b8..21934e8da 100644
--- a/docs/content/remove.md
+++ b/docs/content/remove.md
@@ -41,13 +41,14 @@ wt remove -D experimental
Branches delete automatically when their content is already in the target branch (typically main). This works with squash-merge and rebase workflows where commit history differs but file changes match.
-A branch is safe to delete when its content is already reflected in the target. Worktrunk checks three conditions:
+A branch is safe to delete when its content is already reflected in the target. Worktrunk checks four conditions (in order of cost):
-1. **No added changes** — Three-dot diff (`main...branch`) shows no files. The branch has no file changes beyond the merge-base.
-2. **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).
-3. **Merge adds nothing** — Simulated merge (`git merge-tree`) produces the same tree as main. Handles squash-merged branches where main has since advanced.
+1. **Same commit** — Branch HEAD is literally the same commit as target.
+2. **No added changes** — Three-dot diff (`main...branch`) shows no files. The branch has no file changes beyond the merge-base (includes "branch is ancestor" case).
+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 no commits ahead of main, and `≡` indicates tree contents match. 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.rs
index 7737680f3..e9928b851 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1462,8 +1462,8 @@ The Status column has multiple subcolumns. Within each, only the first matching
| | `↻` | Rebase in progress |
| | `⋈` | Merge in progress |
| | `⚔` | Would conflict if merged to main |
-| | `≡` | Matches main (identical contents) |
-| | `_` | No commits ahead, clean working tree |
+| | `·` | Same commit |
+| | `⊂` | Content integrated (`--full` detects additional cases) |
| Main divergence | `^` | Is the main branch |
| | `↑` | Ahead of main |
| | `↓` | Behind main |
@@ -1477,7 +1477,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) (`≡` matches main or `_` no commits ahead).
+Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`·` same commit or `⊂` content integrated).
## JSON output
@@ -1499,7 +1499,7 @@ wt list --format=json | jq '.[] | select(.status.main_divergence == "Ahead")'
**Status fields:**
- `working_tree`: `{untracked, modified, staged, renamed, deleted}`
-- `branch_state`: `""` | `"Conflicts"` | `"MergeTreeConflicts"` | `"MatchesMain"` | `"NoCommits"`
+- `branch_state`: `""` | `"Conflicts"` | `"MergeTreeConflicts"` | `"TreesMatch"` | `"NoAddedChanges"` | `"MergeAddsNothing"`
- `git_operation`: `""` | `"Rebase"` | `"Merge"`
- `main_divergence`: `""` | `"Ahead"` | `"Behind"` | `"Diverged"`
- `upstream_divergence`: `""` | `"Ahead"` | `"Behind"` | `"Diverged"`
@@ -1680,13 +1680,14 @@ wt remove -D experimental
Branches delete automatically when their content is already in the target branch (typically main). This works with squash-merge and rebase workflows where commit history differs but file changes match.
-A branch is safe to delete when its content is already reflected in the target. Worktrunk checks three conditions:
+A branch is safe to delete when its content is already reflected in the target. Worktrunk checks four conditions (in order of cost):
-1. **No added changes** — Three-dot diff (`main...branch`) shows no files. The branch has no file changes beyond the merge-base.
-2. **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).
-3. **Merge adds nothing** — Simulated merge (`git merge-tree`) produces the same tree as main. Handles squash-merged branches where main has since advanced.
+1. **Same commit** — Branch HEAD is literally the same commit as target.
+2. **No added changes** — Three-dot diff (`main...branch`) shows no files. The branch has no file changes beyond the merge-base (includes "branch is ancestor" case).
+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 no commits ahead of main, and `≡` indicates tree contents match. 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/collect.rs b/src/commands/list/collect.rs
index 16997e2a8..e15cc5519 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -71,6 +71,19 @@ pub(super) enum TaskResult {
item_idx: usize,
committed_trees_match: bool,
},
+ /// Whether branch has file changes beyond the merge-base (three-dot diff)
+ HasFileChanges {
+ item_idx: usize,
+ has_file_changes: bool,
+ },
+ /// Whether merging branch into main would add changes (merge simulation)
+ /// Only computed with --full flag
+ WouldMergeAdd {
+ item_idx: usize,
+ would_merge_add: bool,
+ },
+ /// Whether branch HEAD is ancestor of main (same commit or already merged)
+ IsAncestor { item_idx: usize, is_ancestor: bool },
/// Line diff vs main branch
BranchDiff {
item_idx: usize,
@@ -119,6 +132,9 @@ impl TaskResult {
TaskResult::CommitDetails { item_idx, .. }
| TaskResult::AheadBehind { item_idx, .. }
| TaskResult::CommittedTreesMatch { item_idx, .. }
+ | TaskResult::HasFileChanges { item_idx, .. }
+ | TaskResult::WouldMergeAdd { item_idx, .. }
+ | TaskResult::IsAncestor { item_idx, .. }
| TaskResult::BranchDiff { item_idx, .. }
| TaskResult::WorkingTreeDiff { item_idx, .. }
| TaskResult::MergeTreeConflicts { item_idx, .. }
@@ -301,6 +317,24 @@ fn drain_results(
} => {
items[item_idx].committed_trees_match = Some(committed_trees_match);
}
+ TaskResult::HasFileChanges {
+ item_idx,
+ has_file_changes,
+ } => {
+ items[item_idx].has_file_changes = Some(has_file_changes);
+ }
+ TaskResult::WouldMergeAdd {
+ item_idx,
+ would_merge_add,
+ } => {
+ items[item_idx].would_merge_add = Some(would_merge_add);
+ }
+ TaskResult::IsAncestor {
+ item_idx,
+ is_ancestor,
+ } => {
+ items[item_idx].is_ancestor = Some(is_ancestor);
+ }
TaskResult::BranchDiff {
item_idx,
branch_diff,
@@ -545,6 +579,9 @@ pub fn collect(
counts: None,
branch_diff: None,
committed_trees_match: None,
+ has_file_changes: None,
+ would_merge_add: None,
+ is_ancestor: None,
upstream: None,
pr_status: None,
status_symbols: None,
@@ -944,6 +981,9 @@ pub fn build_worktree_item(
counts: None,
branch_diff: None,
committed_trees_match: None,
+ has_file_changes: None,
+ would_merge_add: None,
+ is_ancestor: None,
upstream: None,
pr_status: None,
status_symbols: None,
diff --git a/src/commands/list/collect_progressive_impl.rs b/src/commands/list/collect_progressive_impl.rs
index 679c27fa9..cfca6c288 100644
--- a/src/commands/list/collect_progressive_impl.rs
+++ b/src/commands/list/collect_progressive_impl.rs
@@ -209,6 +209,105 @@ impl Task for CommittedTreesMatchTask {
}
}
+/// Task 3b: File changes check (does branch have file changes beyond merge-base?)
+///
+/// Uses three-dot diff (`main...branch`) to detect if the branch has any file
+/// changes relative to the merge-base with main. Returns false when the diff
+/// is empty, indicating the branch content is already integrated into main.
+///
+/// This catches branches where commits exist (ahead > 0) but those commits
+/// don't add any file changes - e.g., squash-merged branches, merge commits
+/// that pulled in main, or commits whose changes were reverted.
+pub struct HasFileChangesTask;
+
+impl Task for HasFileChangesTask {
+ const KIND: TaskKind = TaskKind::HasFileChanges;
+
+ fn compute(ctx: TaskContext) -> TaskResult {
+ let has_file_changes = if let Some(base) = ctx.default_branch.as_deref() {
+ let repo = Repository::at(&ctx.repo_path);
+ if let Some(branch) = ctx.branch.as_deref() {
+ // Check if three-dot diff is empty
+ repo.has_added_changes(branch, base).unwrap_or(true)
+ } else {
+ // No branch name (detached HEAD) - assume has changes
+ true
+ }
+ } else {
+ // No default branch - assume has changes
+ true
+ };
+
+ TaskResult::HasFileChanges {
+ item_idx: ctx.item_idx,
+ has_file_changes,
+ }
+ }
+}
+
+/// Task 3b: Merge simulation (--full only)
+///
+/// Checks if merging the branch into main would add any changes by simulating
+/// the merge with `git merge-tree --write-tree`. Returns false when the merge
+/// result equals main's tree, indicating the branch is already integrated.
+///
+/// This catches branches where main has advanced past the squash-merge point -
+/// the three-dot diff might show changes, but those changes are already in main
+/// via the squash merge.
+pub struct WouldMergeAddTask;
+
+impl Task for WouldMergeAddTask {
+ const KIND: TaskKind = TaskKind::WouldMergeAdd;
+
+ fn compute(ctx: TaskContext) -> TaskResult {
+ let would_merge_add = if let Some(base) = ctx.default_branch.as_deref() {
+ let repo = Repository::at(&ctx.repo_path);
+ if let Some(branch) = ctx.branch.as_deref() {
+ // Simulate merging branch into main
+ repo.would_merge_add_to_target(branch, base).unwrap_or(true)
+ } else {
+ // No branch name (detached HEAD) - assume would add changes
+ true
+ }
+ } else {
+ // No default branch - assume would add changes
+ true
+ };
+
+ TaskResult::WouldMergeAdd {
+ item_idx: ctx.item_idx,
+ would_merge_add,
+ }
+ }
+}
+
+/// Task 3c: Ancestor check (is branch HEAD an ancestor of main?)
+///
+/// This is the cheapest integration check - just runs `git merge-base --is-ancestor`.
+/// Returns true when the branch HEAD is the same commit as main, or is an ancestor
+/// of main (already merged via fast-forward or rebase).
+pub struct IsAncestorTask;
+
+impl Task for IsAncestorTask {
+ const KIND: TaskKind = TaskKind::IsAncestor;
+
+ fn compute(ctx: TaskContext) -> TaskResult {
+ let is_ancestor = if let Some(base) = ctx.default_branch.as_deref() {
+ let repo = Repository::at(&ctx.repo_path);
+ // Check if branch HEAD is ancestor of main (or same commit)
+ repo.is_ancestor(&ctx.commit_sha, base).unwrap_or(false)
+ } else {
+ // No default branch - assume not ancestor
+ false
+ };
+
+ TaskResult::IsAncestor {
+ item_idx: ctx.item_idx,
+ is_ancestor,
+ }
+ }
+}
+
/// Task 4: Branch diff stats vs default branch
pub struct BranchDiffTask;
@@ -461,6 +560,8 @@ pub fn collect_worktree_progressive(
spawner.spawn::<CommitDetailsTask>(s, &ctx);
spawner.spawn::<AheadBehindTask>(s, &ctx);
spawner.spawn::<CommittedTreesMatchTask>(s, &ctx);
+ spawner.spawn::<HasFileChangesTask>(s, &ctx);
+ spawner.spawn::<IsAncestorTask>(s, &ctx);
spawner.spawn::<WorkingTreeDiffTask>(s, &ctx);
spawner.spawn::<GitOperationTask>(s, &ctx);
spawner.spawn::<UserMarkerTask>(s, &ctx);
@@ -476,6 +577,9 @@ pub fn collect_worktree_progressive(
if !skip.contains(&TaskKind::CiStatus) {
spawner.spawn::<CiStatusTask>(s, &ctx);
}
+ if !skip.contains(&TaskKind::WouldMergeAdd) {
+ spawner.spawn::<WouldMergeAddTask>(s, &ctx);
+ }
});
}
@@ -513,6 +617,8 @@ pub fn collect_branch_progressive(
spawner.spawn::<CommitDetailsTask>(s, &ctx);
spawner.spawn::<AheadBehindTask>(s, &ctx);
spawner.spawn::<CommittedTreesMatchTask>(s, &ctx);
+ spawner.spawn::<HasFileChangesTask>(s, &ctx);
+ spawner.spawn::<IsAncestorTask>(s, &ctx);
spawner.spawn::<UpstreamTask>(s, &ctx);
// Optional tasks (check skip set)
@@ -525,6 +631,9 @@ pub fn collect_branch_progressive(
if !skip.contains(&TaskKind::CiStatus) {
spawner.spawn::<CiStatusTask>(s, &ctx);
}
+ if !skip.contains(&TaskKind::WouldMergeAdd) {
+ spawner.spawn::<WouldMergeAddTask>(s, &ctx);
+ }
});
}
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index e8bdcc27e..96b3e6a4d 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=💬)
//! ```
//!
@@ -838,6 +838,9 @@ mod tests {
diff: LineDiff::from((200, 30)),
}),
committed_trees_match: Some(false),
+ has_file_changes: Some(true),
+ would_merge_add: None,
+ is_ancestor: None,
upstream: Some(UpstreamStatus::from_parts(Some("origin".to_string()), 4, 2)),
pr_status: None,
status_symbols: Some(StatusSymbols::default()),
@@ -928,6 +931,9 @@ mod tests {
diff: LineDiff::default(),
}),
committed_trees_match: Some(false),
+ has_file_changes: Some(true),
+ would_merge_add: None,
+ is_ancestor: None,
upstream: Some(UpstreamStatus::default()),
pr_status: None,
status_symbols: Some(StatusSymbols::default()),
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 7e37bed09..ea0604b3a 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -151,13 +151,17 @@ pub fn handle_list(
let repo = Repository::current();
// Build skip set based on flags
- // Without --full: skip expensive operations (BranchDiff, CiStatus)
+ // Without --full: skip expensive operations (BranchDiff, CiStatus, WouldMergeAdd)
let skip_tasks: std::collections::HashSet<TaskKind> = if show_full {
std::collections::HashSet::new() // Compute everything
} else {
- [TaskKind::BranchDiff, TaskKind::CiStatus]
- .into_iter()
- .collect()
+ [
+ TaskKind::BranchDiff,
+ TaskKind::CiStatus,
+ TaskKind::WouldMergeAdd,
+ ]
+ .into_iter()
+ .collect()
};
// Progressive rendering only for table format with Progressive mode
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index daa94404e..90379ea1d 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -218,9 +218,24 @@ pub struct ListItem {
pub branch_diff: Option<BranchDiffTotals>,
/// Whether HEAD's tree SHA matches main's tree SHA.
/// True when committed content is identical regardless of commit history.
- /// Internal field used to compute BranchOpState::MatchesMain.
+ /// Internal field used to compute BranchOpState::TreesMatch.
#[serde(skip)]
pub committed_trees_match: Option<bool>,
+ /// Whether branch has file changes beyond the merge-base with main.
+ /// False when three-dot diff (`main...branch`) is empty.
+ /// Internal field used for integration detection (no unique content).
+ #[serde(skip)]
+ pub has_file_changes: Option<bool>,
+ /// Whether merging branch into main would add changes (merge simulation).
+ /// False when `git merge-tree --write-tree main branch` produces same tree as main.
+ /// Only computed with `--full` flag. Catches squash-merged branches where main advanced.
+ #[serde(skip)]
+ pub would_merge_add: Option<bool>,
+ /// Whether branch HEAD is an ancestor of main (or same commit).
+ /// True means branch is already part of main's history.
+ /// This is the cheapest integration check (~1ms).
+ #[serde(skip)]
+ pub is_ancestor: Option<bool>,
// TODO: Same concern as counts/branch_diff above - should upstream fields always be present?
#[serde(flatten, skip_serializing_if = "Option::is_none")]
@@ -255,6 +270,9 @@ impl ListItem {
counts: None,
branch_diff: None,
committed_trees_match: None,
+ has_file_changes: None,
+ would_merge_add: None,
+ is_ancestor: None,
upstream: None,
pr_status: None,
status_symbols: None,
@@ -307,13 +325,64 @@ impl ListItem {
}
/// Determine if the item contains no unique work and can likely be removed.
+ ///
+ /// Returns true when any of these conditions indicate the branch content
+ /// is already integrated into main:
+ ///
+ /// 1. **Same commit** - branch HEAD is ancestor of main or same commit.
+ /// The branch is already part of main's history.
+ /// 2. **No file changes** - three-dot diff (`main...branch`) is empty.
+ /// Catches squash-merged branches where commits exist but add no files.
+ /// 3. **Tree matches main** - tree SHA equals main's tree SHA.
+ /// Catches rebased/squash-merged branches with identical content.
+ /// 4. **Merge simulation** (`--full` only) - merging branch into main wouldn't
+ /// change main's tree. Catches squash-merged branches where main has advanced.
+ /// 5. **Working tree matches main** (worktrees only) - uncommitted changes
+ /// don't diverge from main.
pub(crate) fn is_potentially_removable(&self) -> bool {
if self.is_main() {
return false;
}
+ // Helper: check if working tree is clean
+ let is_working_tree_clean = || {
+ self.worktree_data()
+ .map(|data| {
+ data.working_tree_diff
+ .as_ref()
+ .map(|d| d.is_empty())
+ .unwrap_or(true)
+ })
+ .unwrap_or(true) // Branches without worktrees are "clean"
+ };
+
+ // Check 1: Branch is ancestor of main (same commit or already merged)
+ if self.is_ancestor == Some(true) && is_working_tree_clean() {
+ return true;
+ }
+
+ // Check 2: No file changes beyond merge-base (three-dot diff empty)
+ // This is the primary integration check - catches most cases including
+ // squash-merged branches where commits exist but don't add file changes.
+ if self.has_file_changes == Some(false) && is_working_tree_clean() {
+ return true;
+ }
+
+ // Check 3: Tree SHA matches main (handles squash merge/rebase)
+ if self.committed_trees_match == Some(true) && is_working_tree_clean() {
+ return true;
+ }
+
+ // Check 4: Merge simulation (--full only)
+ // Merging branch into main wouldn't add changes - content already integrated.
+ // This catches cases where main has advanced past the squash-merge point.
+ if self.would_merge_add == Some(false) && is_working_tree_clean() {
+ return true;
+ }
+
let counts = self.counts();
+ // Check 5 (worktrees): Working tree matches main
if let Some(data) = self.worktree_data() {
let no_commits_and_clean = counts.ahead == 0
&& data
@@ -328,6 +397,7 @@ impl ListItem {
.unwrap_or(false);
no_commits_and_clean || matches_main
} else {
+ // Branch without worktree: fallback to ahead == 0
counts.ahead == 0
}
}
@@ -457,8 +527,10 @@ impl ListItem {
let base_state = determine_worktree_base_state(
data.is_main,
default_branch,
- counts.ahead,
+ self.is_ancestor,
self.committed_trees_match.unwrap_or(false),
+ self.has_file_changes,
+ self.would_merge_add,
data.working_tree_diff.as_ref(),
&data.working_tree_diff_with_main,
);
@@ -496,13 +568,24 @@ impl ListItem {
// Simplified status computation for branches
// Only compute symbols that apply to branches (no working tree, git operation, or worktree attrs)
- // Branch op state - branches can only show MergeTreeConflicts or NoCommits
- // (MatchesMain only applies to worktrees since branches don't have working trees)
+ // Branch op state - branches can show MergeTreeConflicts or integration states
let branch_op_state = if has_merge_tree_conflicts {
BranchOpState::MergeTreeConflicts
+ } else if self.is_ancestor == Some(true) {
+ // Branch HEAD is ancestor of main - same commit or already merged
+ BranchOpState::SameCommit
+ } else if self.has_file_changes == Some(false) {
+ // No file changes beyond merge-base - content is integrated
+ BranchOpState::NoAddedChanges
+ } else if self.committed_trees_match == Some(true) {
+ // Tree SHA matches main - content is identical
+ BranchOpState::TreesMatch
+ } else if self.would_merge_add == Some(false) {
+ // Merge simulation shows no changes would be added (--full only)
+ BranchOpState::MergeAddsNothing
} else if let Some(ref c) = self.counts {
if c.ahead == 0 {
- BranchOpState::NoCommits
+ BranchOpState::SameCommit
} else {
BranchOpState::None
}
@@ -525,31 +608,38 @@ impl ListItem {
/// Determine branch state for a worktree.
///
-/// # States (mutually exclusive)
+/// Returns a [`BranchOpState`] that corresponds to an [`worktrunk::git::IntegrationReason`] when
+/// the branch content is considered integrated into main.
+///
+/// # States (priority order)
///
-/// **`NoCommits`** (`ahead == 0`): Branch HEAD is an ancestor of main - no unique
-/// commits exist. This is the "nothing to merge" state. Note: `ahead` compares
-/// commit SHAs via `git rev-list`, not content. Cherry-picked commits create new
-/// SHAs, so a branch with cherry-picked-to-main commits still has `ahead > 0`.
+/// 1. **`SameCommit`**: Branch HEAD is ancestor of main (same commit or already merged).
///
-/// **`MatchesMain`** (`ahead > 0`): Branch has unique commits but working tree
-/// content is identical to main. Examples: merge commits that pull in main,
-/// reverts that undo changes, or independent development arriving at same result.
+/// 2. **`NoAddedChanges`**: Commits exist but no file changes beyond merge-base.
+/// The three-dot diff (`main...branch`) is empty.
///
-/// These states are mutually exclusive: `ahead == 0` means HEAD is an ancestor of
-/// main (can fast-forward), while `MatchesMain` requires unique commits that happen
-/// to produce identical content.
+/// 3. **`TreesMatch`**: Tree SHA matches main, or working tree matches main.
+/// Examples: merge commits that pull in main, rebases, squash merges.
+///
+/// 4. **`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)
/// - `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)
/// - `working_tree_diff_with_main`: Diff between working tree and main. May be `None` (not
/// computed) or `Some(None)` (skipped). When unavailable, assumes no match.
+#[allow(clippy::too_many_arguments)]
fn determine_worktree_base_state(
is_main: bool,
default_branch: Option<&str>,
- ahead: usize,
+ is_ancestor: Option<bool>,
committed_trees_match: bool,
+ has_file_changes: Option<bool>,
+ would_merge_add: Option<bool>,
working_tree_diff: Option<&LineDiff>,
working_tree_diff_with_main: &Option<Option<LineDiff>>,
) -> BranchOpState {
@@ -559,26 +649,37 @@ fn determine_worktree_base_state(
let is_clean = working_tree_diff.map(|d| d.is_empty()).unwrap_or(true);
- if ahead == 0 && is_clean {
- return BranchOpState::NoCommits;
+ // Priority 1: Branch is ancestor of main (same commit or already merged)
+ if is_ancestor == Some(true) && is_clean {
+ return BranchOpState::SameCommit;
}
- // If committed trees match AND no uncommitted changes, working tree must match main.
- let working_tree_matches_main = if committed_trees_match && is_clean {
- true
- } else {
- // Check pre-computed diff. None/Some(None) → assume no match
- working_tree_diff_with_main
- .as_ref()
- .and_then(|opt| opt.as_ref())
- .is_some_and(|diff| diff.is_empty())
- };
+ // Priority 2: No file changes beyond merge-base (squash-merged)
+ if has_file_changes == Some(false) && is_clean {
+ return BranchOpState::NoAddedChanges;
+ }
+
+ // Priority 3: Tree SHA matches main (squash merge/rebase with identical content)
+ if committed_trees_match && is_clean {
+ return BranchOpState::TreesMatch;
+ }
+
+ // Priority 4: Working tree matches main
+ let working_tree_matches_main = working_tree_diff_with_main
+ .as_ref()
+ .and_then(|opt| opt.as_ref())
+ .is_some_and(|diff| diff.is_empty());
if working_tree_matches_main {
- BranchOpState::MatchesMain
- } else {
- BranchOpState::None
+ return BranchOpState::TreesMatch;
}
+
+ // Priority 5: Merge simulation shows no changes (--full only)
+ if would_merge_add == Some(false) && is_clean {
+ return BranchOpState::MergeAddsNothing;
+ }
+
+ BranchOpState::None
}
/// Main branch divergence state
@@ -765,8 +866,19 @@ impl serde::Serialize for WorktreeState {
/// 2. Rebase (↻) - active operation
/// 3. Merge (⋈) - active operation
/// 4. MergeTreeConflicts (⚔) - potential problem
-/// 5. MatchesMain (≡) - removable
-/// 6. NoCommits (_) - removable
+/// 5. SameCommit (·) - removable, maps to [`IntegrationReason::SameCommit`]
+/// 6. NoAddedChanges (⊂) - removable, maps to [`IntegrationReason::NoAddedChanges`]
+/// 7. TreesMatch (⊂) - removable, maps to [`IntegrationReason::TreesMatch`]
+/// 8. MergeAddsNothing (⊂) - removable, maps to [`IntegrationReason::MergeAddsNothing`]
+///
+/// Integration states use two symbols:
+/// - `·` for identical commit (SameCommit)
+/// - `⊂` for content integrated via different history (all others)
+///
+/// [`IntegrationReason::SameCommit`]: worktrunk::git::IntegrationReason::SameCommit
+/// [`IntegrationReason::TreesMatch`]: worktrunk::git::IntegrationReason::TreesMatch
+/// [`IntegrationReason::NoAddedChanges`]: worktrunk::git::IntegrationReason::NoAddedChanges
+/// [`IntegrationReason::MergeAddsNothing`]: worktrunk::git::IntegrationReason::MergeAddsNothing
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]
pub enum BranchOpState {
#[strum(serialize = "")]
@@ -781,10 +893,18 @@ pub enum BranchOpState {
Merge,
/// Merge-tree conflicts with main (simulated via git merge-tree)
MergeTreeConflicts,
- /// Working tree identical to main branch
- MatchesMain,
- /// No commits ahead and clean working tree (not matching main)
- NoCommits,
+ /// Branch HEAD is same commit as main or ancestor of main.
+ /// Maps to [`worktrunk::git::IntegrationReason::SameCommit`].
+ SameCommit,
+ /// Tree SHA matches main - identical file contents.
+ /// Maps to [`worktrunk::git::IntegrationReason::TreesMatch`].
+ TreesMatch,
+ /// No file changes beyond merge-base (three-dot diff empty).
+ /// Maps to [`worktrunk::git::IntegrationReason::NoAddedChanges`].
+ NoAddedChanges,
+ /// Merge simulation adds nothing to main.
+ /// Maps to [`worktrunk::git::IntegrationReason::MergeAddsNothing`].
+ MergeAddsNothing,
}
impl std::fmt::Display for BranchOpState {
@@ -795,8 +915,9 @@ impl std::fmt::Display for BranchOpState {
Self::Rebase => write!(f, "↻"),
Self::Merge => write!(f, "⋈"),
Self::MergeTreeConflicts => write!(f, "⚔"),
- Self::MatchesMain => write!(f, "≡"),
- Self::NoCommits => write!(f, "_"),
+ Self::SameCommit => write!(f, "·"),
+ // All other integration states use ⊂ (content is subset of main)
+ Self::TreesMatch | Self::NoAddedChanges | Self::MergeAddsNothing => write!(f, "⊂"),
}
}
}
@@ -807,7 +928,7 @@ impl BranchOpState {
/// Color semantics:
/// - ERROR (red): Conflicts - blocking problems
/// - WARNING (yellow): Rebase, Merge, MergeTreeConflicts - active/stuck states
- /// - HINT (dimmed): MatchesMain, NoCommits - low urgency removability indicators
+ /// - HINT (dimmed): SameCommit, TreesMatch, NoAddedChanges, MergeAddsNothing - low urgency removability indicators
pub fn styled(&self) -> Option<String> {
use color_print::cformat;
match self {
@@ -816,9 +937,20 @@ impl BranchOpState {
Self::Rebase | Self::Merge | Self::MergeTreeConflicts => {
Some(cformat!("<yellow>{self}</>"))
}
- Self::MatchesMain | Self::NoCommits => Some(cformat!("<dim>{self}</>")),
+ Self::SameCommit | Self::TreesMatch | Self::NoAddedChanges | Self::MergeAddsNothing => {
+ Some(cformat!("<dim>{self}</>"))
+ }
}
}
+
+ /// Returns true if this state indicates the branch content is integrated into main.
+ /// These states correspond to [`worktrunk::git::IntegrationReason`] variants.
+ pub fn is_integrated(&self) -> bool {
+ matches!(
+ self,
+ Self::SameCommit | Self::TreesMatch | Self::NoAddedChanges | Self::MergeAddsNothing
+ )
+ }
}
impl serde::Serialize for BranchOpState {
@@ -882,7 +1014,7 @@ impl PositionMask {
1, // STAGED: + (1 char)
1, // MODIFIED: ! (1 char)
1, // UNTRACKED: ? (1 char)
- 1, // BRANCH_OP_STATE: ✖↻⋈⚠≡_ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)
+ 1, // BRANCH_OP_STATE: ✖↻⋈⚔·⊂ (1 char, priority: conflicts > rebase > merge > merge-tree > 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)
@@ -900,7 +1032,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)
@@ -909,13 +1041,13 @@ 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)
-/// - ≡: Matches main (removable)
-/// - _: No commits (removable)
+/// - ⚔: Merge-tree conflicts (potential problem)
+/// - ·: Same commit (removable)
+/// - ⊂: Content integrated (removable)
///
/// **Mutually exclusive (enforced by type system):**
/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
@@ -930,7 +1062,7 @@ impl PositionMask {
#[derive(Debug, Clone, Default)]
pub struct StatusSymbols {
/// Combined branch and operation state (mutually exclusive with priority)
- /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚔) > MatchesMain (≡) > NoCommits (∅)
+ /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚔) > SameCommit (·) > others (⊂)
pub(crate) branch_op_state: BranchOpState,
/// Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)
diff --git a/src/git/mod.rs b/src/git/mod.rs
index 34beabc2e..cbfc7b6ff 100644
--- a/src/git/mod.rs
+++ b/src/git/mod.rs
@@ -41,6 +41,57 @@ pub use error::{
};
pub use repository::{Repository, ResolvedWorktree, set_base_path};
+/// Why branch content is considered integrated into the target branch.
+///
+/// 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 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)]
+pub enum IntegrationReason {
+ /// Branch HEAD is literally the same commit as target.
+ ///
+ /// Symbol in `wt list`: `·`
+ SameCommit,
+
+ /// Three-dot diff (`main...branch`) shows no files.
+ /// The branch has no file changes beyond the merge-base.
+ ///
+ /// Symbol in `wt list`: `⊂`
+ NoAddedChanges,
+
+ /// Branch tree SHA equals target tree SHA.
+ /// Commit history differs but file contents are identical.
+ ///
+ /// Symbol in `wt list`: `⊂`
+ TreesMatch,
+
+ /// Simulated merge (`git merge-tree`) produces the same tree as target.
+ /// The branch has changes, but they're already in target via a different path.
+ ///
+ /// Symbol in `wt list`: `⊂`
+ MergeAddsNothing,
+}
+
+impl IntegrationReason {
+ /// Human-readable description for use in messages (e.g., `wt remove` output).
+ pub fn description(&self) -> &'static str {
+ match self {
+ Self::SameCommit => "already in",
+ Self::NoAddedChanges => "no file changes",
+ Self::TreesMatch => "files match",
+ Self::MergeAddsNothing => "all changes in",
+ }
+ }
+}
+
/// Category of branch for completion display
#[derive(Debug, Clone, PartialEq)]
pub enum BranchCategory {
diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rs
index 2c928b50d..48f1b4b1d 100644
--- a/src/git/repository/mod.rs
+++ b/src/git/repository/mod.rs
@@ -614,6 +614,13 @@ impl Repository {
self.run_command_check(&["merge-base", "--is-ancestor", base, head])
}
+ /// Check if two refs point to the same commit.
+ pub fn same_commit(&self, ref1: &str, ref2: &str) -> anyhow::Result<bool> {
+ let sha1 = self.run_command(&["rev-parse", ref1])?;
+ let sha2 = self.run_command(&["rev-parse", ref2])?;
+ Ok(sha1.trim() == sha2.trim())
+ }
+
/// Check if a branch has file changes beyond the merge-base with target.
///
/// Uses three-dot diff (`target...branch`) which shows files changed from merge-base
diff --git a/src/md_help.rs b/src/md_help.rs
index a5f868a46..e5f83cbce 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: ≡ (matches main), _ (no commits)
+ // - 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.rs
index 006fb73ca..91a904918 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -9,6 +9,7 @@ use crate::commands::process::spawn_detached;
use crate::commands::worktree::{RemoveResult, SwitchResult};
use worktrunk::config::WorktrunkConfig;
use worktrunk::git::GitError;
+use worktrunk::git::IntegrationReason;
use worktrunk::git::Repository;
use worktrunk::path::format_path_for_display;
use worktrunk::shell::Shell;
@@ -51,26 +52,15 @@ fn format_switch_success_message(
}
}
-/// Why a branch is considered integrated into the target.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum IntegrationReason {
- /// Branch has no file changes beyond the merge-base with target
- NoAddedChanges,
- /// Branch's tree SHA matches target's tree SHA (squash merge/rebase)
- ContentsMatch,
- /// Merge simulation shows branch would add nothing to target
- /// (squash merge where target has since advanced)
- MergeAddsNothing,
-}
-
/// Check if a branch's content has been integrated into the target.
///
-/// Returns the reason if the branch is safe to delete:
+/// Returns the reason if the branch is safe to delete (ordered by check cost):
+/// - `SameCommit`: Branch HEAD is literally the same commit as target
/// - `NoAddedChanges`: Branch has no file changes beyond merge-base (empty three-dot diff)
-/// - `ContentsMatch`: The branch's tree SHA matches the target's tree SHA (squash merge/rebase)
+/// - `TreesMatch`: The branch's tree SHA matches the target's tree SHA (squash merge/rebase)
/// - `MergeAddsNothing`: Merge simulation shows branch would add nothing (squash + target advanced)
///
-/// Returns None if neither condition is met, or if an error occurs (e.g., invalid refs).
+/// Returns None if no condition is met, or if an error occurs (e.g., invalid refs).
/// This fail-safe default prevents accidental branch deletion when integration cannot
/// be determined.
fn get_integration_reason(
@@ -78,18 +68,24 @@ fn get_integration_reason(
branch_name: &str,
target: &str,
) -> Option<IntegrationReason> {
- // Check if branch has no file changes beyond merge-base (empty three-dot diff)
+ // Check 1 (cheapest): Is branch HEAD literally the same commit as target?
+ // On error, continue to next check
+ if repo.same_commit(branch_name, target).unwrap_or(false) {
+ return Some(IntegrationReason::SameCommit);
+ }
+
+ // Check 2: 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 if tree content matches (handles squash merge/rebase)
+ // Check 3: Does tree content match (handles squash merge/rebase)?
if repo.trees_match(branch_name, target).unwrap_or(false) {
- return Some(IntegrationReason::ContentsMatch);
+ return Some(IntegrationReason::TreesMatch);
}
- // Check via merge simulation: would merging this branch into target add anything?
+ // Check 4: 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
@@ -182,10 +178,11 @@ 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::NoAddedChanges)) => {
+ Some(Some(IntegrationReason::SameCommit)) => {
format!(" (already in {target})")
}
- Some(Some(IntegrationReason::ContentsMatch)) => format!(" (files match {target})"),
+ Some(Some(IntegrationReason::NoAddedChanges)) => " (no file changes)".to_string(),
+ Some(Some(IntegrationReason::TreesMatch)) => format!(" (files match {target})"),
Some(Some(IntegrationReason::MergeAddsNothing)) => {
format!(" (all changes in {target})")
}
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index feb65ad0e..b99950234 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -439,7 +439,7 @@ fn test_list_json_tree_matches_main_after_merge() {
.unwrap();
// Now feature-merged is ahead of main (has merge commit) but tree content matches main
- // JSON output should show branch_op_state: "MatchesMain" with ahead > 0
+ // JSON output should show branch_op_state: "TreesMatch" with ahead > 0
snapshot_list_json("json_tree_matches_main_after_merge", &repo);
}
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.snap
index 529479382..8083218fb 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.snap
index d8b66af7a..c800e2c0e 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.snap
index 514d096a1..f202ec54d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -112,31 +112,31 @@ CI is only checked for branches that track a remote — local-only branches show
The Status column has multiple subcolumns. Within each, only the first matching symbol is shown (listed in priority order):
- Subcolumn Symbol Meaning
- ───────────────── ────── ────────────────────────────────────
- Working tree (1) + Staged files
- Working tree (2) ! Modified files (unstaged)
- Working tree (3) ? Untracked files
- Branch state ✖ Merge conflicts
- ↻ Rebase in progress
- ⋈ Merge in progress
- ⚔ Would conflict if merged to main
- ≡ Matches main (identical contents)
- _ No commits ahead, clean working tree
- Main divergence ^ Is the main branch
- ↑ Ahead of main
- ↓ Behind main
- ↕ Diverged from main
- Remote divergence | In sync with remote
- ⇡ Ahead of remote
- ⇣ Behind remote
- ⇅ Diverged from remote
- Worktree state / Branch without worktree
- ⚑ Path doesn't match template
- ⌫ Prunable (directory missing)
- ⊠ Locked worktree
-
-Rows are dimmed when the branch content is already in main (≡ matches main or _ no commits ahead).
+ Subcolumn Symbol Meaning
+ ───────────────── ────── ────────────────────────────────────────────────────
+ Working tree (1) + Staged files
+ Working tree (2) ! Modified files (unstaged)
+ Working tree (3) ? Untracked files
+ Branch state ✖ Merge conflicts
+ ↻ Rebase in progress
+ ⋈ Merge in progress
+ ⚔ Would conflict if merged to main
+ · Same commit
+ ⊂ Content integrated (--full detects additional cases)
+ Main divergence ^ Is the main branch
+ ↑ Ahead of main
+ ↓ Behind main
+ ↕ Diverged from main
+ Remote divergence | In sync with remote
+ ⇡ Ahead of remote
+ ⇣ Behind remote
+ ⇅ Diverged from remote
+ Worktree state / Branch without worktree
+ ⚑ Path doesn't match template
+ ⌫ Prunable (directory missing)
+ ⊠ Locked worktree
+
+Rows are dimmed when the branch content is already in main (· same commit or ⊂ content integrated).
JSON output
@@ -156,7 +156,7 @@ Query structured data with --format=json:
Status fields:
- working_tree: {untracked, modified, staged, renamed, deleted}
-- branch_state: "" | "Conflicts" | "MergeTreeConflicts" | "MatchesMain" | "NoCommits"
+- branch_state: "" | "Conflicts" | "MergeTreeConflicts" | "TreesMatch" | "NoAddedChanges" | "MergeAddsNothing"
- git_operation: "" | "Rebase" | "Merge"
- main_divergence: "" | "Ahead" | "Behind" | "Diverged"
- upstream_divergence: "" | "Ahead" | "Behind" | "Diverged"
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
index c5bd9dcdc..40a660e9a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -75,13 +75,14 @@ Force-delete an unmerged branch:
Branches delete automatically when their content is already in the target branch (typically main). This works with squash-merge and rebase workflows where commit history differs but file changes match.
-A branch is safe to delete when its content is already reflected in the target. Worktrunk checks three conditions:
+A branch is safe to delete when its content is already reflected in the target. Worktrunk checks four conditions (in order of cost):
-1. No added changes — Three-dot diff (main...branch) shows no files. The branch has no file changes beyond the merge-base.
-2. 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).
-3. Merge adds nothing — Simulated merge (git merge-tree) produces the same tree as main. Handles squash-merged branches where main has since advanced.
+1. Same commit — Branch HEAD is literally the same commit as target.
+2. No added changes — Three-dot diff (main...branch) shows no files. The branch has no file changes beyond the merge-base (includes "branch is ancestor" case).
+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 no commits ahead of main, and ≡ indicates tree contents match. 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/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index c07b78759..d3181367d 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 1d Initial commit
- branch-only _ / b834638e 1d Initial commit
+ branch-only · / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
index cac815fd1..bb7230304 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ - _ ⚑ ./repo.feature b834638e 1d Initial commit
++ - · ⚑ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
index f918000af..844f1e2f0 100644
--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
@@ -88,20 +88,20 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_op_state": "MatchesMain",
+ "branch_op_state": "NoAddedChanges",
"main_divergence": "Ahead",
"upstream_divergence": "",
"worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "≡",
+ "branch_op_state": "⊂",
"main_divergence": "↑",
"upstream_divergence": "",
"worktree_state": ""
},
"commits_display": "/u001b[32m↑2/u001b[0m",
- "status_line": "feature-merged /u001b[2m≡/u001b[22m/u001b[2m↑/u001b[22m /u001b[32m↑2/u001b[0m",
+ "status_line": "feature-merged /u001b[2m⊂/u001b[22m/u001b[2m↑/u001b[22m /u001b[32m↑2/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-merged",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index f20da94fc..2e2675e14 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
@@ -133,20 +133,20 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_op_state": "NoCommits",
+ "branch_op_state": "SameCommit",
"main_divergence": "Behind",
"upstream_divergence": "",
"worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "_",
+ "branch_op_state": "·",
"main_divergence": "↓",
"upstream_divergence": "",
"worktree_state": ""
},
"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",
- "status_line": "feature-behind /u001b[2m_/u001b[22m/u001b[2m↓/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "status_line": "feature-behind /u001b[2m·/u001b[22m/u001b[2m↓/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-behind",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index c4ad595cf..f5afca8dc 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -88,19 +88,19 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_op_state": "NoCommits",
+ "branch_op_state": "SameCommit",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "_",
+ "branch_op_state": "·",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "feature-detached /u001b[2m_/u001b[22m",
+ "status_line": "feature-detached /u001b[2m·/u001b[22m",
"type": "worktree",
"path": "[REPO].feature-detached",
"bare": false,
@@ -134,19 +134,19 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_op_state": "NoCommits",
+ "branch_op_state": "SameCommit",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": "Locked"
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "_",
+ "branch_op_state": "·",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": "⊠"
},
- "status_line": "locked-feature /u001b[2m_/u001b[22m/u001b[33m⊠/u001b[39m",
+ "status_line": "locked-feature /u001b[2m·/u001b[22m/u001b[33m⊠/u001b[39m",
"type": "worktree",
"path": "[REPO].locked-feature",
"bare": false,
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.snap
index 11658d2c2..55c08e6f6 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
@@ -88,7 +88,7 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_op_state": "NoCommits",
+ "branch_op_state": "SameCommit",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": "",
@@ -96,13 +96,13 @@ exit_code: 0
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "_",
+ "branch_op_state": "·",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": "",
"user_marker": "🔧"
},
- "status_line": "with-status /u001b[2m_/u001b[22m🔧",
+ "status_line": "with-status /u001b[2m·/u001b[22m🔧",
"type": "worktree",
"path": "[REPO].with-status",
"bare": false,
@@ -136,19 +136,19 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_op_state": "NoCommits",
+ "branch_op_state": "SameCommit",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_op_state": "_",
+ "branch_op_state": "·",
"main_divergence": "",
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "without-status /u001b[2m_/u001b[22m",
+ "status_line": "without-status /u001b[2m·/u001b[22m",
"type": "worktree",
"path": "[REPO].without-status",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 046d34348..c2a5f5133 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
@ main ^ ./repo b834638e 1d Initial commit
+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
-+ fix ?_ 💬 ./repo.fix b834638e 1d Initial commit
++ fix ?· 💬 ./repo.fix b834638e 1d Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --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.snap
index ae3e4c78b..68821485a 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ develop ^ ⚑ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
++ feature-b · ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 5ea57fbef..89855437e 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
++ feature-b · ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index 001a5d131..9617dbec5 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ locked-no-reason _ ⊠ ./repo.locked-no-reason b834638e 1d Initial commit
++ locked-no-reason · ⊠ ./repo.locked-no-reason b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index 8961b5de8..66767cc1c 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ locked-feature _ ⊠ ./repo.locked-feature b834638e 1d Initial commit
++ locked-feature · ⊠ ./repo.locked-feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 25f4d3182..4ebcfb52a 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo 1310bfb9 1d Short message
-+ feature-a _↓ ↓1 ./repo.feature-a f078644e 1d This is a very long commit message that should test how the…
++ feature-a ·↓ ↓1 ./repo.feature-a f078644e 1d This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index eae2672d1..d2a36a7a4 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ medium-name _ ./repo.medium-name b834638e 1d Initial commit
-+ short _ ./repo.short b834638e 1d Initial commit
-+ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
-+ with-changes _ ./repo.with-changes b834638e 1d Initial commit
++ medium-name · ./repo.medium-name b834638e 1d Initial commit
++ short · ./repo.short b834638e 1d Initial commit
++ very-long-branch-name-here · ./repo.very-long-branch-name-here b834638e 1d Initial commit
++ with-changes · ./repo.with-changes b834638e 1d Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index c9b32f0ab..57fe6a956 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
++ feature-b · ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index 08c21b723..2891a7ed7 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature _ ./repo.feature b834638e 1d Initial commit
++ feature · ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index 5b74243ca..c272bd240 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-- feature _ ./repo.feature b834638e 1d Initial commit
+- feature · ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index 99e32338f..6fc3f7d90 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
++ feature-b · ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index 358d0542a..d2ed90cdc 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
- orphan-1 _ / b834638e 1d Initial commit
- orphan-2 _ / b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
+ orphan-1 · / b834638e 1d Initial commit
+ orphan-2 · / b834638e 1d Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index bb6880ab6..4492cfd08 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -28,7 +28,7 @@ exit_code: 0
@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
- exp ↕ / ↑2 ↓1 +137 32936618 2d
- wip ↕ / ↑1 ↓1 +33 6844b101 3d
+ exp ⊂↕ / ↑2 ↓1 +137 32936618 2d
+ wip ⊂↕ / ↑1 ↓1 +33 6844b101 3d
⚪ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden
diff --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.snap
index 7f1d3b349..5f579fb8d 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 -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a ?_ ./repo.feature-a b834638e 1d Initial commit
++ feature-a ?· ./repo.feature-a b834638e 1d Initial commit
+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index 82d988e52..bd3f01c6b 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
-+ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
-+ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
-+ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
-+ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
-+ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
-+ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
-+ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
-+ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
-+ feature-9 _ ./repo.feature-9 b834638e 1d Initial commit
++ feature-1 · ./repo.feature-1 b834638e 1d Initial commit
++ feature-10 · ./repo.feature-10 b834638e 1d Initial commit
++ feature-2 · ./repo.feature-2 b834638e 1d Initial commit
++ feature-3 · ./repo.feature-3 b834638e 1d Initial commit
++ feature-4 · ./repo.feature-4 b834638e 1d Initial commit
++ feature-5 · ./repo.feature-5 b834638e 1d Initial commit
++ feature-6 · ./repo.feature-6 b834638e 1d Initial commit
++ feature-7 · ./repo.feature-7 b834638e 1d Initial commit
++ feature-8 · ./repo.feature-8 b834638e 1d Initial commit
++ feature-9 · ./repo.feature-9 b834638e 1d Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 637d492f0..ee0bdf06b 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
-+ feature-c _ ./repo.feature-c b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
++ feature-b · ./repo.feature-b b834638e 1d Initial commit
++ feature-c · ./repo.feature-c b834638e 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index d90693c7e..fc17f9aee 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ locked _ ⊠ ./repo.locked b834638e 1d Initial commit
-+ normal _ ./repo.normal b834638e 1d Initial commit
++ locked · ⊠ ./repo.locked b834638e 1d Initial commit
++ normal · ./repo.normal b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index 242cbbac0..2bb4bdb56 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
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^| ./repo | 6c3da842 1d Initial commit on main
+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 2fff52c2 1d Ahead commit
-+ in-sync _ | ./repo.in-sync | 6c3da842 1d Initial commit on main
++ in-sync · | ./repo.in-sync | 6c3da842 1d Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index 2c2478a25..810501ff0 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
-+ feature-test _↓ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
++ feature-test ·↓ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
index f85957beb..14a939bf4 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
-+ multi _ 👨‍💻 ./repo.multi b834638e 1d Initial commit
++ emoji · 🔄 ./repo.emoji b834638e 1d Initial commit
++ multi · 👨‍💻 ./repo.multi b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index c0f38dd18..bf1c51a6f 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- another-branch _ / b834638e 1d Initial commit
- feature-without-worktree _ / b834638e 1d Initial commit
- fix-bug _ / b834638e 1d Initial commit
++ feature-with-worktree · ./repo.feature-with-worktree b834638e 1d Initial commit
+ another-branch · / b834638e 1d Initial commit
+ feature-without-worktree · / b834638e 1d Initial commit
+ fix-bug · / b834638e 1d Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --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.snap
index 7aab7a879..f45971f89 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-a · ./repo.feature-a b834638e 1d Initial commit
++ feature-b · ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --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.snap
index 1e5531c11..ffe6c5031 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 1d Initial commit
- branch-alpha _ / b834638e 1d Initial commit
- branch-beta _ / b834638e 1d Initial commit
- branch-gamma _ / b834638e 1d Initial commit
+ branch-alpha · / b834638e 1d Initial commit
+ branch-beta · / b834638e 1d Initial commit
+ branch-gamma · / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index 8b3e591b5..d9981dff4 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^| . | b834638e 1d Initial commit
- local-only-1 _ / b834638e 1d Initial commit
- local-only-2 _ / b834638e 1d Initial commit
- origin/remote-only-1 _ / b834638e 1d Initial commit
- origin/remote-only-2 _ / b834638e 1d Initial commit
+ local-only-1 · / b834638e 1d Initial commit
+ local-only-2 · / b834638e 1d Initial commit
+ origin/remote-only-1 · / b834638e 1d Initial commit
+ origin/remote-only-2 · / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 04ff29d92..2eef6c026 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^| ./repo | b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- origin/remote-only _ / b834638e 1d Initial commit
++ feature-with-worktree · ./repo.feature-with-worktree b834638e 1d Initial commit
+ origin/remote-only · / b834638e 1d Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index a82ad0feb..0fa357ded 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^| . | b834638e 1d Initial commit
- origin/remote-feature-1 _ / b834638e 1d Initial commit
- origin/remote-feature-2 _ / b834638e 1d Initial commit
+ origin/remote-feature-1 · / b834638e 1d Initial commit
+ origin/remote-feature-2 · / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index c8595e6f7..38601ce20 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
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^| ./repo | 6c3da842 1d Initial commit on main
+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 8d8f4673 1d Ahead commit 2
-+ behind _ ⇣ ./repo.behind ⇣1 6c3da842 1d Initial commit on main
++ behind · ⇣ ./repo.behind ⇣1 6c3da842 1d Initial commit on main
+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
-+ in-sync _ | ./repo.in-sync | 6c3da842 1d Initial commit on main
-+ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
++ in-sync · | ./repo.in-sync | 6c3da842 1d Initial commit on main
++ no-upstream · ./repo.no-upstream 6c3da842 1d Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
index 879f97661..c2eac3481 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
@ main ^ ./repo b834638e 1d Initial commit
+ feature-api ↑ 🤖 ↑1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints
+ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
-+ wip-docs ?_ ./repo.wip-docs b834638e 1d Initial commit
++ wip-docs ?· ./repo.wip-docs b834638e 1d Initial commit
⚪ Showing 4 worktrees, 2 ahead
diff --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.snap
index 7f335a7d6..a6b5d8a15 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ . b834638e 1d Initial commit
- feature _ / b834638e 1d Initial commit
+ feature · / b834638e 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
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.snap
index e0267cda8..4caec79cf 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ./repo.feature f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature · ./repo.feature f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --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.snap
index 164568228..d0a99cd4c 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
-+ no-changes _ ./repo.no-changes b834638e 1d Initial commit
++ also-no-changes · ./repo.also-no-changes b834638e 1d Initial commit
++ no-changes · ./repo.no-changes b834638e 1d Initial commit
+ with-changes ! +1 -1 ./repo.with-changes b834638e 1d Initial commit
⚪ Showing 4 worktrees, 1 with changes
diff --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.snap
index 41d060fb4..0c29ea052 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ huge ?_ ./repo.huge b834638e 1d Initial commit
++ huge ?· ./repo.huge b834638e 1d Initial commit
+ tiny ! +1 -1 ./repo.tiny b834638e 1d Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --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.snap
index 4d18abf41..c79227708 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ feature-large ?_ ./repo.feature-large b834638e 1d Initial commit
-+ feature-medium ?_ ./repo.feature-medium b834638e 1d Initial commit
-+ feature-small ?_ ./repo.feature-small b834638e 1d Initial commit
++ feature-large ?· ./repo.feature-large b834638e 1d Initial commit
++ feature-medium ?· ./repo.feature-medium b834638e 1d Initial commit
++ feature-small ?· ./repo.feature-small b834638e 1d Initial commit
⚪ Showing 4 worktrees
diff --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.snap
index 24fcfc36a..a92812386 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
@ main ^ ./repo b834638e 1d
-+ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
-+ short _ ./repo.short b834638e 1d
-+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
++ another-extremely-long-name-here · ./repo.another-extremely-long-name-here b834638e 1d
++ short · ./repo.short b834638e 1d
++ very-long-feature-branch-name · ./repo.very-long-feature-branch-name b834638e 1d
⚪ Showing 4 worktrees, 1 column hidden
diff --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.snap
index 50c7abfd0..33cf633e7 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 -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
@ main ^ b834638e 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
-+ medium _ b834638e 1d Initial commit
-+ x _ b834638e 1d Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues · b834638e 1d Initial commit
++ medium · b834638e 1d Initial commit
++ x · b834638e 1d Initial commit
⚪ Showing 4 worktrees, 1 column hidden
diff --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.snap
index e2ee306bc..72b7ae9dc 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ a _ ./repo.a b834638e 1d Initial commit
-+ bb _ ./repo.bb b834638e 1d Initial commit
-+ ccc _ ./repo.ccc b834638e 1d Initial commit
++ a · ./repo.a b834638e 1d Initial commit
++ bb · ./repo.bb b834638e 1d Initial commit
++ ccc · ./repo.ccc b834638e 1d Initial commit
⚪ Showing 4 worktrees
diff --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.snap
index 3a5b7beef..b3f7709a4 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ cafe _ ./repo.cafe b834638e 1d Initial commit
-+ naive _ ./repo.naive b834638e 1d Initial commit
-+ resume _ ./repo.resume b834638e 1d Initial commit
++ cafe · ./repo.cafe b834638e 1d Initial commit
++ naive · ./repo.naive b834638e 1d Initial commit
++ resume · ./repo.resume b834638e 1d Initial commit
⚪ Showing 4 worktrees