Skip to content

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

feat: Introduce explicit symbols for worktree states

Maximilian Roos7b0526e2a9a3
diff --git a/README.md b/README.md
index c08f4c3de..40bbc45fe 100644
--- a/README.md
+++ b/README.md
@@ -108,46 +108,37 @@ wt remove @ # Remove current worktree
See `wt --help` for details.
-<details>
-<summary>Worktree states in <code>wt list</code></summary>
-
-The State column shows worktree status. **Dimmed rows** indicate worktrees with no marginal information beyond main (no unique work).
-
-**Dimming logic:** Lines dim when they provide no marginal information - either no commits ahead OR working tree matches main exactly. This focuses attention on worktrees containing work.
-
-| State | Meaning | Dimmed? |
-|-------|---------|---------|
-| **no commits** | No commits on top of main AND no uncommitted changes (`ahead == 0` and `working_tree_diff == (0, 0)`). | Yes |
-| **matches main** | Working tree contents identical to main branch, regardless of commit history (`working_tree_diff_with_main == (0, 0)`). | Yes |
-| **conflicts** | Merge conflicts detected with main | No |
-| **[MERGING]**, **[REBASING]**, etc. | Git operation in progress | No |
-| **bare** | Bare worktree (no working directory) | No |
-| **locked**, **prunable** | Git worktree management states | No |
-
-Both dimming conditions use OR logic: either is sufficient to dim. "no commits" means clean worktree with no commits ahead. "matches main" means the current working tree state is identical to main, even if commit history differs (e.g., commits were made but later reverted).
-
-</details>
-
<details>
<summary>Status column symbols in <code>wt list</code></summary>
-The Status column shows git repository state using compact symbols. Symbol order indicates priority: conflicts (blocking) → branch divergence → working tree changes.
-
-| Symbol | Meaning | Category |
-|--------|---------|----------|
-| `·` | Branch without worktree | N/A |
-| `=` | Conflicts with main | Blocking |
-| `↑` | Commits ahead of main | Branch divergence |
-| `↓` | Commits behind main | Branch divergence |
-| `⇡` | Commits ahead of remote | Remote divergence |
-| `⇣` | Commits behind remote | Remote divergence |
-| `?` | Untracked files | Working tree |
-| `!` | Modified files (unstaged) | Working tree |
-| `+` | Staged files | Working tree |
-| `»` | Renamed files | Working tree |
-| `✘` | Deleted files | Working tree |
-
-Symbols combine to show complete state (e.g., `↑↓!` means ahead of main, behind main, and has unstaged changes).
+The Status column shows git repository state using compact symbols. Symbol order indicates priority: conflicts (blocking) → worktree state → git operations → branch divergence → working tree changes.
+
+**Symbol order:** `= ≡∅ ↻⋈ ◇⊠⚠ ↑↓ ⇡⇣ ?!+»✘`
+
+| Symbol | Meaning | Category | Dimmed? |
+|--------|---------|----------|---------|
+| `·` | Branch without worktree | N/A | No |
+| `=` | Conflicts with main | Blocking | No |
+| `≡` | Working tree matches main (identical to main branch, regardless of commit history) | Worktree state | Yes |
+| `∅` | No commits (no commits ahead AND no uncommitted changes) | Worktree state | Yes |
+| `↻` | Rebase in progress | Git operation | No |
+| `⋈` | Merge in progress | Git operation | No |
+| `◇` | Bare worktree (no working directory) | Worktree attribute | No |
+| `⊠` | Locked worktree | Worktree attribute | No |
+| `⚠` | Prunable worktree | Worktree attribute | No |
+| `↑` | Commits ahead of main | Branch divergence | No |
+| `↓` | Commits behind main | Branch divergence | No |
+| `⇡` | Commits ahead of remote | Remote divergence | No |
+| `⇣` | Commits behind remote | Remote divergence | No |
+| `?` | Untracked files | Working tree | No |
+| `!` | Modified files (unstaged) | Working tree | No |
+| `+` | Staged files | Working tree | No |
+| `»` | Renamed files | Working tree | No |
+| `✘` | Deleted files | Working tree | No |
+
+Symbols combine to show complete state (e.g., `≡↓!` means matches main, behind main, and has unstaged changes).
+
+**Dimming logic:** **Dimmed rows** indicate worktrees with no marginal information beyond main (no unique work). Lines dim when they have either `≡` (matches main) OR `∅` (no commits). Both conditions use OR logic: either is sufficient to dim. This focuses attention on worktrees containing work.
**Branch-only entries:** Branches without worktrees show `·` in the Status column, indicating git status is not applicable (no working directory to check).
diff --git a/src/commands/list/columns.rs b/src/commands/list/columns.rs
index 94f67faa1..8d2c25b3e 100644
--- a/src/commands/list/columns.rs
+++ b/src/commands/list/columns.rs
@@ -6,7 +6,6 @@ pub enum ColumnKind {
WorkingDiff,
AheadBehind,
BranchDiff,
- States,
Path,
Upstream,
Time,
@@ -95,60 +94,52 @@ pub const COLUMN_SPECS: &[ColumnSpec] = &[
false,
4,
),
- ColumnSpec::new(
- ColumnKind::States,
- super::layout::HEADER_STATE,
- 6,
- false,
- false,
- 5,
- ),
ColumnSpec::new(
ColumnKind::Path,
super::layout::HEADER_PATH,
- 7,
+ 6,
false,
false,
- 6,
+ 5,
),
ColumnSpec::new(
ColumnKind::Upstream,
super::layout::HEADER_UPSTREAM,
- 8,
+ 7,
false,
false,
- 7,
+ 6,
),
ColumnSpec::new(
ColumnKind::CiStatus,
super::layout::HEADER_CI,
- 9,
+ 8,
false,
true,
- 8,
+ 7,
),
ColumnSpec::new(
ColumnKind::Commit,
super::layout::HEADER_COMMIT,
- 10,
+ 9,
false,
false,
- 9,
+ 8,
),
ColumnSpec::new(
ColumnKind::Time,
super::layout::HEADER_AGE,
- 11,
+ 10,
false,
false,
- 10,
+ 9,
),
ColumnSpec::new(
ColumnKind::Message,
super::layout::HEADER_MESSAGE,
- 12,
+ 11,
false,
false,
- 11,
+ 10,
),
];
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 7ae6080c9..4502685c9 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -132,7 +132,6 @@ pub const HEADER_STATUS: &str = "Status";
pub const HEADER_WORKING_DIFF: &str = "Working ±";
pub const HEADER_AHEAD_BEHIND: &str = "Main ↕";
pub const HEADER_BRANCH_DIFF: &str = "Main ±";
-pub const HEADER_STATE: &str = "State";
pub const HEADER_PATH: &str = "Path";
pub const HEADER_UPSTREAM: &str = "Remote ↕";
pub const HEADER_AGE: &str = "Age";
@@ -224,7 +223,6 @@ pub struct ColumnWidths {
pub working_diff: DiffWidths,
pub branch_diff: DiffWidths,
pub upstream: DiffWidths,
- pub states: usize,
}
/// Tracks which columns have actual data (vs just headers)
@@ -235,7 +233,6 @@ pub struct ColumnDataFlags {
pub ahead_behind: bool,
pub branch_diff: bool,
pub upstream: bool,
- pub states: bool,
pub ci_status: bool,
}
@@ -248,7 +245,6 @@ fn column_has_data(kind: ColumnKind, flags: &ColumnDataFlags) -> bool {
ColumnKind::WorkingDiff => flags.working_diff,
ColumnKind::AheadBehind => flags.ahead_behind,
ColumnKind::BranchDiff => flags.branch_diff,
- ColumnKind::States => flags.states,
ColumnKind::Path => true,
ColumnKind::Upstream => flags.upstream,
ColumnKind::Time => true,
@@ -352,7 +348,6 @@ fn ideal_for_column(
match spec.kind {
ColumnKind::Branch => ColumnIdeal::text(widths.branch),
ColumnKind::Status => ColumnIdeal::text(widths.status),
- ColumnKind::States => ColumnIdeal::text(widths.states),
ColumnKind::Path => ColumnIdeal::text(max_path_width),
ColumnKind::Time => ColumnIdeal::text(widths.time),
ColumnKind::CiStatus => ColumnIdeal::text(widths.ci_status),
@@ -374,7 +369,6 @@ pub fn calculate_column_widths(
let mut max_status = 0;
let mut max_time = 0;
let mut max_message = 0;
- let mut max_states = 0;
// Track diff component widths separately
let mut max_wt_added_digits = 0;
@@ -441,12 +435,6 @@ pub fn calculate_column_widths(
max_upstream_behind_digits =
max_upstream_behind_digits.max(upstream_behind.to_string().len());
}
-
- // States (includes conflicts, worktree states, etc.)
- let states = super::render::format_all_states(item);
- if !states.is_empty() {
- max_states = max_states.max(states.width());
- }
}
// Calculate diff widths using helper (format: "+left -right")
@@ -473,9 +461,6 @@ pub fn calculate_column_widths(
let has_status_data = max_status > 0;
let final_status = fit_header(HEADER_STATUS, max_status);
- let has_states_data = max_states > 0;
- let final_states = fit_header(HEADER_STATE, max_states);
-
// CI status column: Always 2 chars wide
// Only show if we attempted to fetch CI data (regardless of whether any items have status)
let has_ci_status = fetch_ci && items.iter().any(|item| item.pr_status().is_some());
@@ -491,7 +476,6 @@ pub fn calculate_column_widths(
working_diff,
branch_diff,
upstream,
- states: final_states,
};
let data_flags = ColumnDataFlags {
@@ -500,7 +484,6 @@ pub fn calculate_column_widths(
ahead_behind: ahead_behind.added_digits > 0 || ahead_behind.deleted_digits > 0,
branch_diff: branch_diff.added_digits > 0 || branch_diff.deleted_digits > 0,
upstream: upstream.added_digits > 0 || upstream.deleted_digits > 0,
- states: has_states_data,
ci_status: has_ci_status,
};
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 6bd16330b..15a40f59f 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -258,13 +258,6 @@ impl ListItem {
ListItem::Branch(info) => info.pr_status.as_ref(),
}
}
-
- pub fn has_conflicts(&self) -> bool {
- match self {
- ListItem::Worktree(info) => info.has_conflicts,
- ListItem::Branch(info) => info.has_conflicts,
- }
- }
}
impl BranchInfo {
@@ -531,6 +524,56 @@ impl WorktreeInfo {
false
};
+ // Build complete status symbols by appending state symbols
+ // Order: = ≡∅ ↻⋈ ◇⊠⚠ ↑↓ ⇡⇣ ?!+»✘
+ let mut symbols = status_info.symbols;
+
+ // Add merge conflicts indicator if this branch has conflicts with base
+ // (different from git status conflicts which are already in symbols)
+ if has_conflicts && !symbols.contains('=') {
+ symbols.insert(0, '=');
+ }
+
+ // State symbols (insert after conflicts but before branch divergence)
+ // Find insertion point (after '=' if present, otherwise at start)
+ let insert_pos = symbols
+ .find(|c| ['↑', '↓', '⇡', '⇣', '?', '!', '+', '»', '✘'].contains(&c))
+ .unwrap_or(symbols.len());
+
+ let mut state_symbols = String::new();
+
+ // ≡ matches main (working tree identical to main)
+ // ∅ no commits (no commits ahead AND clean working tree, AND not matches main)
+ if !is_primary {
+ if working_tree_diff_with_main == Some((0, 0)) {
+ state_symbols.push('≡');
+ } else if counts.ahead == 0 && working_tree_diff == (0, 0) {
+ state_symbols.push('∅');
+ }
+ }
+
+ // ↻ rebase, ⋈ merge (git operations in progress)
+ if let Some(state) = &worktree_state {
+ if state.contains("rebase") {
+ state_symbols.push('↻');
+ } else if state.contains("merge") {
+ state_symbols.push('⋈');
+ }
+ }
+
+ // ◇ bare, ⊠ locked, ⚠ prunable (worktree attributes)
+ if wt.bare {
+ state_symbols.push('◇');
+ }
+ if wt.locked.is_some() {
+ state_symbols.push('⊠');
+ }
+ if wt.prunable.is_some() {
+ state_symbols.push('⚠');
+ }
+
+ symbols.insert_str(insert_pos, &state_symbols);
+
// Read user-defined status from git config
let user_status = read_user_status(&wt_repo);
@@ -546,7 +589,7 @@ impl WorktreeInfo {
worktree_state,
pr_status,
has_conflicts,
- status_symbols: status_info.symbols,
+ status_symbols: symbols,
user_status,
display: DisplayFields::default(),
working_diff_display: None,
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 566a85f2e..05914759f 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -200,44 +200,6 @@ fn format_ci_status(pr_status: &PrStatus) -> StyledLine {
segment
}
-pub fn format_all_states(item: &ListItem) -> String {
- let mut states = Vec::new();
-
- // Add conflicts state (applies to both worktrees and branches)
- if item.has_conflicts() {
- states.push("(conflicts)".to_string());
- }
-
- // Worktree-specific states
- if let Some(info) = item.worktree_info() {
- // State priority: "matches main" takes precedence over "no commits"
- // since it's more specific (working tree identical to main)
- if !info.is_primary && info.working_tree_diff_with_main == Some((0, 0)) {
- states.push("(matches main)".to_string());
- } else if !info.is_primary && item.counts().ahead == 0 && info.working_tree_diff == (0, 0) {
- // Only show "no commits" if working tree doesn't match main
- states.push("(no commits)".to_string());
- }
-
- if let Some(state) = info.worktree_state.as_ref() {
- states.push(format!("[{}]", state));
- }
-
- if info.worktree.bare {
- states.push("(bare)".to_string());
- }
-
- if let Some(state) = optional_reason_state("locked", info.worktree.locked.as_deref()) {
- states.push(state);
- }
- if let Some(state) = optional_reason_state("prunable", info.worktree.prunable.as_deref()) {
- states.push(state);
- }
- }
-
- states.join(" ")
-}
-
pub fn format_header_line(layout: &LayoutConfig) {
let style = Style::new().bold();
let mut line = StyledLine::new();
@@ -256,16 +218,6 @@ pub fn format_header_line(layout: &LayoutConfig) {
println!("{}", line.render());
}
-fn optional_reason_state(label: &str, reason: Option<&str>) -> Option<String> {
- reason.map(|value| {
- if value.is_empty() {
- format!("({label})")
- } else {
- format!("({label}: {value})")
- }
- })
-}
-
/// Check if a branch/worktree is potentially removable
///
/// Dims rows for worktrees/branches that likely don't contain unique work
@@ -431,23 +383,6 @@ pub fn format_list_item_line(
push_blank(&mut line, column.width);
}
}
- (ColumnKind::States, _) => {
- let states = format_all_states(item);
- if !states.is_empty() {
- let states_text = if is_last {
- states
- } else {
- format!("{:width$}", states, width = column.width)
- };
- if let Some(style) = text_style {
- line.push_styled(states_text, style);
- } else {
- line.push_raw(states_text);
- }
- } else if !is_last {
- push_blank(&mut line, column.width);
- }
- }
(ColumnKind::Path, _) => {
if let Some(info) = worktree_info {
let path_str = shorten_path(&info.worktree.path, &layout.common_prefix);
diff --git a/src/main.rs b/src/main.rs
index bdfd53b11..0251ee1d0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -180,7 +180,6 @@ COLUMNS:
Working ±: Uncommitted changes vs HEAD (+added -deleted lines, staged + unstaged)
Main ↕: Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)
Main ± (--full): Line diffs in commits ahead of main (+added -deleted)
- State: Status indicators (see STATE COLUMN below)
Path: Worktree directory location
Remote ↕: Commits ahead↑/behind↓ relative to tracking branch (e.g. origin/branch)
CI (--full): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)
@@ -195,9 +194,16 @@ COLUMNS:
Age: Time since last commit (relative)
Message: Last commit message (truncated)
-STATUS SYMBOLS:
+STATUS SYMBOLS (order: = ≡∅ ↻⋈ ◇⊠⚠ ↑↓ ⇡⇣ ?!+»✘):
· Branch without worktree (no working directory to check)
= Merge conflicts (unmerged paths in working tree)
+ ≡ Working tree matches main (identical contents, regardless of commit history)
+ ∅ No commits (no commits ahead AND no uncommitted changes)
+ ↻ Rebase in progress
+ ⋈ Merge in progress
+ ◇ Bare worktree (no working directory)
+ ⊠ Locked worktree
+ ⚠ Prunable worktree
↑ Ahead of main branch
↓ Behind main branch
⇡ Ahead of remote tracking branch
@@ -208,14 +214,7 @@ STATUS SYMBOLS:
» Renamed files
✘ Deleted files
-STATE COLUMN:
- (matches main): Working tree identical to main
- (no commits): No commits ahead, clean working tree
- (conflicts): Merge conflicts with main
- [MERGING]/[REBASING]: Git operations in progress
- (bare)/(locked)/(prunable): Worktree properties
-
-Rows are dimmed when no unique work (either no commits and clean working tree, or matches main).")]
+Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).")]
List {
/// Output format
#[arg(long, value_enum, default_value = "table")]
@@ -228,7 +227,7 @@ Rows are dimmed when no unique work (either no commits and clean working tree, o
/// Show CI status, conflict detection, and complete diff statistics
///
/// Adds columns: CI (pipeline status), Main ± (line diffs).
- /// Enables conflict detection (shows "(conflicts)" in State column).
+ /// Enables conflict detection (shows "=" symbol in Status column).
/// Requires network requests and git merge-tree operations.
#[arg(long, verbatim_doc_comment)]
full: bool,
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 9a4ac36bb..b44f047e8 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEwmrFR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIRV9A8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State Path Remote ↕ Commit  Age  Message
-(detached) .  b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
+(detached) .  b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 5636cfe64..c5d824d76 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPhSJmc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyYEIdg/test-config.toml
---
success: true
exit_code: 0
@@ -123,7 +123,7 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "↓",
+ "status_symbols": "∅↓",
"commits_display": "[DIM][RED]↓2[RESET]"
}
]
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 0d6c29c51..e2b19e2c8 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoJBBgK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2v1CoH/test-config.toml
---
success: true
exit_code: 0
@@ -92,7 +92,7 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": ""
+ "status_symbols": "≡"
},
{
"type": "worktree",
@@ -128,7 +128,7 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": ""
+ "status_symbols": "≡⊠"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
index aa5853cb7..0c01a4e91 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRF2nse/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaI32iL/test-config.toml
---
success: true
exit_code: 0
@@ -92,7 +92,7 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "",
+ "status_symbols": "≡",
"user_status": "processing..."
},
{
@@ -129,7 +129,7 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": ""
+ "status_symbols": "≡"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 5d7d29f35..403c7d52c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpELt04Z/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVgQzyc/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago  Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago  Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago  Commit at 00:30
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  6c3da842 10 months ago Initial commit on main
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago  Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago  Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago  Commit at 00:30
⚪ Showing 5 worktrees, 4 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 5d34c9c88..65aff65d9 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
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp28krTY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXB4cdG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-develop  ./test-repo b834638e 10 months ago Initial commit
-feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
-feature-b (matches main) ./feature-b b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+develop  ./test-repo b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 b9089be11..9ce7df18a 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwBxx4d/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzRc36D/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-no-reason (matches main) (locked) ./locked-no-reason b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+locked-no-reason ≡⊠ ./locked-no-reason b834638e 10 months ago 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 1b619f4f5..684450c0b 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4AOfTd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpenp93a/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± State  Path  Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-feature (matches main) (locked: Testing lock functionality) ./locked-feature b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+locked-feature ≡⊠ ./locked-feature b834638e 10 months ago 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 de3e02330..bee795fa4 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX4Fy3x/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQwhnPD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo 1310bfb9 10 months ago Short message
-feature-a ↓ ↓1 (no commits) ./feature-a f078644e 10 months ago This is a very long commit message that should...
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo 1310bfb9 10 months ago Short message
+feature-a ∅↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should test how the...
⚪ Showing 2 worktrees, 1 behind
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 4dc5ca315..89f7bb636 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDH39HX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeEOQYZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-medium-name  (matches main) ./medium-name  b834638e 10 months ago Initial commit
-short  (matches main) ./short  b834638e 10 months ago Initial commit
-very-long-branch-name-here (matches main) ./very-long-branch-name-here b834638e 10 months ago Initial commit
-with-changes  (matches main) ./with-changes  b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+medium-name  ≡ ./medium-name  b834638e 10 months ago Initial commit
+short  ≡ ./short  b834638e 10 months ago Initial commit
+very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago Initial commit
+with-changes  ≡ ./with-changes  b834638e 10 months ago 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 23b59eb4b..b82d29b75 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVQqJ8M/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3zLndk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
-feature-b (matches main) ./feature-b b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 680ce2422..d67159d18 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvDUeO8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4Akr3k/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ State Path Remote ↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
+main  .  b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 b63535cde..9bc6b5a70 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpR4aL0C/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqjm84Q/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
-feature-test ↓ ↓1 (no commits) ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
+feature-test ∅↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees, 1 behind
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index 3a9c2413e..b1e7a390c 100644
--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCBPe6p/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUIEupV/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status  Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-emoji  🔄 (matches main) ./emoji  b834638e 10 months ago Initial commit
-multi  blocked: needs review (matches main) ./multi  b834638e 10 months ago Initial commit
+Branch Status  Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+emoji  ≡ 🔄 ./emoji  b834638e 10 months ago Initial commit
+multi  ≡ blocked: needs review ./multi  b834638e 10 months ago 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 3e50ad6a2..83bb9e45c 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -16,17 +16,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeJJvWX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2E6Kjt/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-with-worktree  (matches main) ./feature-with-worktree b834638e 10 months ago Initial commit
-another-branch  · b834638e 10 months ago Initial commit
-feature-without-worktree · b834638e 10 months ago Initial commit
-fix-bug  · b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-with-worktree  ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
+another-branch  · b834638e 10 months ago Initial commit
+feature-without-worktree · b834638e 10 months ago Initial commit
+fix-bug  · b834638e 10 months ago 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 85f8a5fee..07327ae25 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
@@ -16,15 +16,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZC1A6B/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkMDlsF/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
-feature-b (matches main) ./feature-b b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 18bdd65ca..7ae0a773e 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
@@ -16,16 +16,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAhZcpH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzDOuA8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State Path Remote ↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
-branch-alpha · b834638e 10 months ago Initial commit
-branch-beta  · b834638e 10 months ago Initial commit
-branch-gamma · b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
+main  .  b834638e 10 months ago Initial commit
+branch-alpha · b834638e 10 months ago Initial commit
+branch-beta  · b834638e 10 months ago Initial commit
+branch-gamma · b834638e 10 months ago Initial commit
⚪ Showing 1 worktrees, 3 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 0f861b802..7d2d63d82 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBGVcBa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGd8a1h/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Main ± State  Path  Remote ↕ CI Commit  Age  Message
-main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
-behind  ⇣ (matches main) ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
-diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
-in-sync  (matches main) ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-no-upstream (matches main) ./no-upstream 6c3da842 10 months ago Initial commit on main
+Branch  Status Working ± Main ↕ Main ± Path  Remote ↕ CI Commit  Age  Message
+main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
+behind  ≡⇣ ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
+in-sync  ≡ ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+no-upstream ≡ ./no-upstream 6c3da842 10 months ago Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index 44474b16c..540895059 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppsaSps/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpncp2Cy/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status  Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-clean-no-status  (matches main) ./clean-no-status  b834638e 10 months ago Initial commit
-clean-with-status waiting (matches main) ./clean-with-status b834638e 10 months ago Initial commit
-dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
-dirty-with-status ? * (matches main) ./dirty-with-status b834638e 10 months ago Initial commit
+Branch  Status  Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+clean-no-status  ≡ ./clean-no-status  b834638e 10 months ago Initial commit
+clean-with-status ≡ waiting ./clean-with-status b834638e 10 months ago Initial commit
+dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
+dirty-with-status ≡? * ./dirty-with-status b834638e 10 months ago Initial commit
⚪ Showing 5 worktrees, 1 with changes
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 70e642003..de0152703 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
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw3oDXT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3LGEqm/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >...
-feature (matches main) ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >...
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature ≡ ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index 3274c9331..3c99442b1 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYTU9BR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiTqBLx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ State Path Remote ↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
+main  .  b834638e 10 months ago Initial commit
⚪ Showing 1 worktree
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 5d88d43c4..7e0d1f94b 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvUz6kf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBOoPwl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-also-no-changes (matches main) ./also-no-changes b834638e 10 months ago Initial commit
-no-changes  (matches main) ./no-changes  b834638e 10 months ago Initial commit
-with-changes ! +1 -1 ./with-changes b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
+no-changes  ≡ ./no-changes  b834638e 10 months ago Initial commit
+with-changes ! +1 -1 ./with-changes b834638e 10 months ago 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 770a02f95..93e5a714d 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
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpq5h72p/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEeUcz2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-huge  ? (matches main) ./huge  b834638e 10 months ago Initial commit
-tiny ! +1 -1 ./tiny b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+huge  ≡? ./huge  b834638e 10 months ago Initial commit
+tiny ! +1 -1 ./tiny b834638e 10 months ago 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 14e37383f..123d50db1 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0sM0nU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2vJ1Uk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-large  ? (matches main) ./feature-large  b834638e 10 months ago Initial commit
-feature-medium ? (matches main) ./feature-medium b834638e 10 months ago Initial commit
-feature-small  ? (matches main) ./feature-small  b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-large  ≡? ./feature-large  b834638e 10 months ago Initial commit
+feature-medium ≡? ./feature-medium b834638e 10 months ago Initial commit
+feature-small  ≡? ./feature-small  b834638e 10 months ago 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 5a8247362..b75819a55 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2hmobM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Vkyip/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± State  Path  Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-another-extremely-long-name-here (matches main) ./another-extremely-long-name-here b834638e 10 months ago Initial commit
-short  (matches main) ./short  b834638e 10 months ago Initial commit
-very-long-feature-branch-name  (matches main) ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago Initial commit
+short  ≡ ./short  b834638e 10 months ago Initial commit
+very-long-feature-branch-name  ≡ ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
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 3fa9be29a..ebb9a3574 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9dSmqq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppKNFE2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± State  Path  Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-long  (matches main) ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
-medium (matches main) ./medium-length-name  b834638e 10 months ago Initial commit
-x  (matches main) ./x  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+long  ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
+medium ≡ ./medium-length-name  b834638e 10 months ago Initial commit
+x  ≡ ./x  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
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 84e6ab854..29b772faa 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptesprP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplePMre/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-a  (matches main) ./a  b834638e 10 months ago Initial commit
-bb  (matches main) ./bb  b834638e 10 months ago Initial commit
-ccc  (matches main) ./ccc  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+a  ≡ ./a  b834638e 10 months ago Initial commit
+bb  ≡ ./bb  b834638e 10 months ago Initial commit
+ccc  ≡ ./ccc  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
index 648ea7145..dffb1723e 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMVgyCL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxwy8Jj/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status State  Path  Commit  Age  Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a (matches main) ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b (matches main) ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+Branch  Status Working ± Path  Commit  Age  Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
index 71164dc27..0b671d13a 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp68siUp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxmwA5R/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a (matches main) ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b (matches main) ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
index 31004b820..27e58ecf4 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXuF6Xl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmzs03v/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Main ↕ State  Path  Commit  Age
-main  ./test-repo a7bc47ca 10 months ago
-feature-a (matches main) ./feature-a a7bc47ca 10 months ago
-feature-b (matches main) ./feature-b a7bc47ca 10 months ago
+Branch  Status Path  Commit  Age  Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with...
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with...
+feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with...
⚪ Showing 3 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 1cb7264a5..32dc58c96 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
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeY6COe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmi5Xdk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-cafe  (matches main) ./café  b834638e 10 months ago Initial commit
-naive  (matches main) ./naïve  b834638e 10 months ago Initial commit
-resume (matches main) ./résumé  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+cafe  ≡ ./café  b834638e 10 months ago Initial commit
+naive  ≡ ./naïve  b834638e 10 months ago Initial commit
+resume ≡ ./résumé  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees