Skip to content

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

feat: Improve demo GIF and list command time format

Maximilian Roosb4ceab41cc64
diff --git a/dev/wt-demo-build.sh b/dev/wt-demo-build.sh
index 9998edf00..9f8f0b9b2 100755
--- a/dev/wt-demo-build.sh
+++ b/dev/wt-demo-build.sh
@@ -27,6 +27,17 @@ require_bin() {
fi
}
+# Commit with a date offset (e.g., "7 days ago", "2 hours ago")
+commit_dated() {
+ local repo="$1"
+ local message="$2"
+ local date_offset="$3"
+ local date_str
+ date_str=$(date -v-"$date_offset" "+%Y-%m-%dT%H:%M:%S")
+ GIT_AUTHOR_DATE="$date_str" GIT_COMMITTER_DATE="$date_str" \
+ SKIP_DEMO_HOOK=1 git -C "$repo" commit -qm "$message"
+}
+
write_starship_config() {
mkdir -p "$(dirname "$STARSHIP_CONFIG_PATH")"
cat >"$STARSHIP_CONFIG_PATH" <<'CFG'
@@ -102,7 +113,7 @@ prepare_repo() {
git -C "$DEMO_REPO" config user.email "[email protected]"
printf "# Worktrunk demo\n\nThis repo is generated automatically.\n" >"$DEMO_REPO/README.md"
git -C "$DEMO_REPO" add README.md
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "Initial demo commit"
+ commit_dated "$DEMO_REPO" "Initial demo commit" "7d"
git -C "$DEMO_REPO" branch -m main
git -C "$DEMO_REPO" remote add origin "$BARE_REMOTE"
git -C "$DEMO_REPO" push -u origin main -q
@@ -143,11 +154,11 @@ mod tests {
RUST
echo "/target" >"$DEMO_REPO/.gitignore"
git -C "$DEMO_REPO" add .gitignore Cargo.toml rust-toolchain.toml src/
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "Add Rust project with tests"
+ commit_dated "$DEMO_REPO" "Add Rust project with tests" "6d"
# Pre-build to create Cargo.lock and cache dependencies
(cd "$DEMO_REPO" && cargo build --release -q 2>/dev/null)
git -C "$DEMO_REPO" add Cargo.lock
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "Add Cargo.lock"
+ commit_dated "$DEMO_REPO" "Add Cargo.lock" "6d"
git -C "$DEMO_REPO" push -q
# Add worktrunk project hooks
@@ -157,7 +168,7 @@ RUST
test = "cargo nextest run --no-fail-fast"
TOML
git -C "$DEMO_REPO" add .config/wt.toml
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "Add project hooks"
+ commit_dated "$DEMO_REPO" "Add project hooks" "5d"
git -C "$DEMO_REPO" push -q
# Create mock gh CLI for CI status
@@ -180,13 +191,13 @@ if [[ "$1" == "pr" && "$2" == "list" ]]; then
done
case "$branch" in
- feature/alpha)
+ alpha)
echo '[{"state":"OPEN","headRefOid":"abc123","mergeStateStatus":"CLEAN","statusCheckRollup":[{"status":"COMPLETED","conclusion":"SUCCESS"}],"url":"https://github.com/acme/demo/pull/1"}]'
;;
- feature/beta)
+ beta)
echo '[{"state":"OPEN","headRefOid":"def456","mergeStateStatus":"CLEAN","statusCheckRollup":[{"status":"IN_PROGRESS","conclusion":null}],"url":"https://github.com/acme/demo/pull/2"}]'
;;
- feature/hooks)
+ hooks)
echo '[{"state":"OPEN","headRefOid":"ghi789","mergeStateStatus":"CLEAN","statusCheckRollup":[{"status":"COMPLETED","conclusion":"FAILURE"}],"url":"https://github.com/acme/demo/pull/3"}]'
;;
*)
@@ -243,17 +254,17 @@ TOML
echo "# Development" >>"$DEMO_REPO/README.md"
echo "See CONTRIBUTING.md for guidelines." >>"$DEMO_REPO/README.md"
git -C "$DEMO_REPO" add README.md
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "docs: add development section"
+ commit_dated "$DEMO_REPO" "docs: add development section" "1d"
git -C "$DEMO_REPO" push -q
create_branch_hooks
}
create_branch_alpha() {
- local branch="feature/alpha"
- local path="$DEMO_WORK_BASE/acme.${branch//\//-}"
+ local branch="alpha"
+ local path="$DEMO_WORK_BASE/acme.$branch"
git -C "$DEMO_REPO" checkout -q -b "$branch" main
- # Modify README: expand significantly (+12, -1)
+ # Modify README: small expansion (+12, -1)
cat >"$DEMO_REPO/README.md" <<'MD'
# Worktrunk demo
@@ -271,26 +282,26 @@ A demo repository for showcasing worktrunk features.
Run `wt list` to see all worktrees.
MD
git -C "$DEMO_REPO" add README.md
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "docs: expand README"
+ commit_dated "$DEMO_REPO" "docs: expand README" "3d"
# Add more commits to vary main↕
echo "# Contributing" >>"$DEMO_REPO/README.md"
echo "PRs welcome!" >>"$DEMO_REPO/README.md"
git -C "$DEMO_REPO" add README.md
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "docs: add contributing section"
+ commit_dated "$DEMO_REPO" "docs: add contributing section" "3d"
echo "" >>"$DEMO_REPO/README.md"
echo "# License" >>"$DEMO_REPO/README.md"
echo "MIT" >>"$DEMO_REPO/README.md"
git -C "$DEMO_REPO" add README.md
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "docs: add license"
+ commit_dated "$DEMO_REPO" "docs: add license" "3d"
git -C "$DEMO_REPO" push -u origin "$branch" -q
git -C "$DEMO_REPO" checkout -q main
git -C "$DEMO_REPO" worktree add -q "$path" "$branch"
# Add unpushed commit (shows ⇡ in Status)
echo "# FAQ" >>"$path/README.md"
git -C "$path" add README.md
- git -C "$path" commit -qm "docs: add FAQ section"
+ commit_dated "$path" "docs: add FAQ section" "3d"
# Significant working tree changes
- # Modified file (!)
+ # Modified file (!) - add lots of content for +100 diff
cat >"$path/README.md" <<'MD'
# Worktrunk demo
@@ -307,14 +318,114 @@ A powerful demo for worktrunk.
- `wt list` - Show worktrees
- `wt switch` - Switch worktree
- `wt merge` - Merge and cleanup
+
+## API Reference
+
+### Core Functions
+
+#### `list_worktrees()`
+
+Returns all worktrees in the repository.
+
+```rust
+pub fn list_worktrees(repo: &Repository) -> Result<Vec<Worktree>> {
+ let worktrees = repo.worktrees()?;
+ worktrees.iter().map(|name| {
+ let wt = repo.find_worktree(name)?;
+ Ok(Worktree::from_git(wt))
+ }).collect()
+}
+```
+
+#### `switch_worktree()`
+
+Switches to the specified worktree.
+
+```rust
+pub fn switch_worktree(name: &str) -> Result<()> {
+ let path = find_worktree_path(name)?;
+ std::env::set_current_dir(path)?;
+ Ok(())
+}
+```
+
+#### `create_worktree()`
+
+Creates a new worktree for the given branch.
+
+```rust
+pub fn create_worktree(branch: &str, base: &str) -> Result<PathBuf> {
+ let repo = Repository::open_from_env()?;
+ let path = generate_worktree_path(&repo, branch)?;
+ repo.worktree(branch, &path, Some(&base))?;
+ Ok(path)
+}
+```
+
+#### `merge_worktree()`
+
+Merges the current branch into main and cleans up.
+
+```rust
+pub fn merge_worktree(opts: MergeOptions) -> Result<()> {
+ let branch = current_branch()?;
+ rebase_onto_main(&branch)?;
+ fast_forward_main(&branch)?;
+ if !opts.keep_worktree {
+ remove_worktree(&branch)?;
+ }
+ Ok(())
+}
+```
+
+### Helper Functions
+
+#### `find_worktree_path()`
+
+Resolves a worktree name to its filesystem path.
+
+#### `generate_worktree_path()`
+
+Generates a path for a new worktree based on naming conventions.
+
+#### `current_branch()`
+
+Returns the name of the currently checked out branch.
+
+#### `rebase_onto_main()`
+
+Rebases the given branch onto the main branch.
+
+#### `fast_forward_main()`
+
+Fast-forwards main to include the rebased commits.
+
+#### `remove_worktree()`
+
+Removes a worktree and optionally deletes its branch.
+
+## Error Handling
+
+All functions return `Result<T>` with detailed error types:
+
+- `WorktreeNotFound` - The specified worktree doesn't exist
+- `BranchInUse` - The branch is checked out in another worktree
+- `MergeConflict` - Conflicts detected during rebase
+- `DirtyWorkingTree` - Uncommitted changes present
+
+## Performance Notes
+
+- Listing uses parallel git operations for speed
+- Diff calculations are cached per-session
+- Remote fetches happen in background threads
MD
# Untracked file (?)
echo "// scratch" >"$path/scratch.rs"
}
create_branch_beta() {
- local branch="feature/beta"
- local path="$DEMO_WORK_BASE/acme.${branch//\//-}"
+ local branch="beta"
+ local path="$DEMO_WORK_BASE/acme.$branch"
git -C "$DEMO_REPO" checkout -q -b "$branch" main
# No commits - same as main (↑0)
git -C "$DEMO_REPO" push -u origin "$branch" -q
@@ -327,8 +438,8 @@ create_branch_beta() {
}
create_branch_hooks() {
- local branch="feature/hooks"
- local path="$DEMO_WORK_BASE/acme.${branch//\//-}"
+ local branch="hooks"
+ local path="$DEMO_WORK_BASE/acme.$branch"
git -C "$DEMO_REPO" checkout -q -b "$branch" main
# Refactor lib.rs: add multiply/subtract, remove both old tests (+12, -8)
cat >"$DEMO_REPO/src/lib.rs" <<'RUST'
@@ -357,7 +468,7 @@ mod tests {
}
RUST
git -C "$DEMO_REPO" add src/lib.rs
- SKIP_DEMO_HOOK=1 git -C "$DEMO_REPO" commit -qm "feat: add math operations, consolidate tests"
+ commit_dated "$DEMO_REPO" "feat: add math operations, consolidate tests" "2H"
# No push - this branch has no upstream
git -C "$DEMO_REPO" checkout -q main
git -C "$DEMO_REPO" worktree add -q "$path" "$branch"
@@ -390,6 +501,7 @@ record_text() {
env DEMO_REPO="$DEMO_REPO" RAW_PATH="$DEMO_RAW" COMMANDS="$commands" bash -lc '
set -o pipefail
export LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+ export COLUMNS=160
export RUSTUP_HOME="'"$real_home"'/.rustup"
export CARGO_HOME="'"$real_home"'/.cargo"
export HOME="'"$DEMO_HOME"'"
diff --git a/dev/wt-demo/demo.tape b/dev/wt-demo/demo.tape
index b14dc7ce5..5e97c94a3 100644
--- a/dev/wt-demo/demo.tape
+++ b/dev/wt-demo/demo.tape
@@ -6,9 +6,9 @@ Require git
Set Shell "zsh"
Set FontSize 19
Set FontFamily "Geist Mono, Berkeley Mono, Fira Code, JetBrains Mono, Menlo, Apple Color Emoji"
-Set Width 1280
+Set Width 1600
Set Height 720
-Set Theme { "name": "GitHub Light Custom", "black": "#8c959f", "red": "#d73a49", "green": "#22863a", "yellow": "#d29922", "blue": "#0969da", "magenta": "#8250df", "cyan": "#1b7c83", "white": "#8c959f", "brightBlack": "#8c959f", "brightRed": "#cb2431", "brightGreen": "#2ea043", "brightYellow": "#f2cc60", "brightBlue": "#218bff", "brightMagenta": "#a475f9", "brightCyan": "#39c5cf", "brightWhite": "#8c959f", "background": "#ffffff", "foreground": "#1f2328", "cursor": "#0969da", "selection": "#ddf4ff" }
+Set Theme { "name": "GitHub Light Custom", "black": "#8c959f", "red": "#d73a49", "green": "#22863a", "yellow": "#d29922", "blue": "#0969da", "magenta": "#8250df", "cyan": "#1b7c83", "white": "#8c959f", "brightBlack": "#8c959f", "brightRed": "#cb2431", "brightGreen": "#2ea043", "brightYellow": "#f2cc60", "brightBlue": "#218bff", "brightMagenta": "#a475f9", "brightCyan": "#39c5cf", "brightWhite": "#8c959f", "background": "#f6f8fa", "foreground": "#1f2328", "cursor": "#0969da", "selection": "#ddf4ff" }
Set Padding 18
Set LineHeight 1.12
Set TypingSpeed 28ms
@@ -40,7 +40,7 @@ Type "wt list"
Enter
Sleep 1.6s
-Type "wt switch --create feature/reports"
+Type "wt switch --create notes"
Enter
Sleep 1.6s
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 4860453db..0a7bf77a1 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -448,7 +448,7 @@ fn build_estimated_widths(max_branch: usize, show_full: bool, fetch_ci: bool) ->
let ahead_behind_fixed = fit_header(HEADER_AHEAD_BEHIND, 7); // "↑99 ↓99"
let branch_diff_fixed = fit_header(HEADER_BRANCH_DIFF, 9); // "+999 -999"
let upstream_fixed = fit_header(HEADER_UPSTREAM, 7); // "↑99 ↓99"
- let age_estimate = 15; // "3 months ago"
+ let age_estimate = 4; // "11mo" (short format)
let ci_estimate = fit_header(HEADER_CI, 1); // Single indicator symbol
// Assume columns will have data (better to show and hide than to not show)
@@ -675,7 +675,7 @@ fn allocate_columns_with_priority(
/// - Ahead/behind: 7 chars ("↑99 ↓99")
/// - Branch diff: 9 chars ("+999 -999")
/// - Upstream: 7 chars ("↑99 ↓99")
-/// - Age: 15 chars ("3 months ago")
+/// - Age: 4 chars ("11mo" short format)
/// - CI: 1 char (indicator symbol)
/// - Message: flexible (20-100 chars)
pub fn calculate_layout_from_basics(
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 3cf30540b..c49af851d 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -1,4 +1,4 @@
-use crate::display::{format_relative_time, shorten_path, truncate_at_word_boundary};
+use crate::display::{format_relative_time_short, shorten_path, truncate_at_word_boundary};
use anstyle::{AnsiColor, Color, Style};
use std::path::Path;
use unicode_width::UnicodeWidthStr;
@@ -630,7 +630,7 @@ impl ColumnLayout {
if ctx.worktree_data.is_some() && ctx.item.commit.is_none() {
cell.push_styled("⋯", Style::new().dimmed());
} else {
- let time_str = format_relative_time(ctx.commit.timestamp);
+ let time_str = format_relative_time_short(ctx.commit.timestamp);
cell.push_styled(time_str, Style::new().dimmed());
}
diff --git a/src/display.rs b/src/display.rs
index e47ca3a4b..a845ab3e3 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -10,11 +10,6 @@ use std::path::{Path, PathBuf};
use std::time::{SystemTime, UNIX_EPOCH};
use worktrunk::path::format_path_for_display;
-/// Format timestamp as verbose relative time (e.g., "2 hours ago")
-pub fn format_relative_time(timestamp: i64) -> String {
- format_relative_time_impl(timestamp, get_now(), false)
-}
-
/// Format timestamp as abbreviated relative time (e.g., "2h")
pub fn format_relative_time_short(timestamp: i64) -> String {
format_relative_time_impl(timestamp, get_now(), true)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index 5648c624f..f471f722b 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -14,15 +14,15 @@ info:
LC_ALL: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPGzGyI/test-config.toml
+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIMf2uD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo.main 6c3da842 10 months ago Initial commit on main
-+ feature ↑ ↑1 ./test-repo.feature 72413a3b 10 months ago Work on feature
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo.main 6c3da842 10mo Initial commit on main
++ feature ↑ ↑1 ./test-repo.feature 72413a3b 10mo Work on feature
⚪ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index 6fdc68fb2..cd8cdf718 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -10,20 +10,20 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJlRh4/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZvsLTf/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJlRh4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZvsLTf/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
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 7ad42a1f8..12c690bd8 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
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10 months ago Initial commit
- branch-only ∅ ⎇ b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
+ branch-only ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index 2ccf783a5..c164a637f 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ . b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 3be0333e0..d84919265 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
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 88ef9fb1e..928bf5efe 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10 months ago Diverged commit
-+ feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10 months ago Add 100 lines
-+ fix ? ≡ 💬 ./fix b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10mo Diverged commit
++ feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10mo Add 100 lines
++ fix ? ≡ 💬 ./fix b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
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 3b2bda961..90059fc3b 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -22,11 +22,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo 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 c62fc9852..6b6473ec8 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
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ≡ ./feature-b b834638e 10mo 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 91c51f728..240aaaad4 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -4,7 +4,7 @@ info:
program: wt
args:
- "-C"
- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ6jRiw/test-repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmlu8gY/test-repo
- list
env:
CLICOLOR_FORCE: "1"
@@ -16,9 +16,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ≡ ./feature-b b834638e 10mo 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 ea2f18df0..33d468f6b 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked-no-reason ≡ ⊠ ./locked-no-reason b834638e 10mo 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 f82e234b4..950e809a3 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked-feature ≡ ⊠ ./locked-feature b834638e 10mo 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 91bfed030..65403ef31 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo 1310bfb9 10mo Short message
++ feature-a ∅ ↓ ↓1 ./feature-a f078644e 10mo This is a very long commit message that should test how…
⚪ 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 b796100d3..b671c3058 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -22,11 +22,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10 months ago
-+ medium-name ≡ ./medium-name b834638e 10 months ago
-+ short ≡ ./short b834638e 10 months ago
-+ very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago
-+ with-changes ≡ ./with-changes b834638e 10 months ago
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ medium-name ≡ ./medium-name b834638e 10mo Initial commit
++ short ≡ ./short b834638e 10mo Initial commit
++ very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10mo Initial commit
++ with-changes ≡ ./with-changes b834638e 10mo Initial commit
-⚪ Showing 5 worktrees, 1 column hidden
+⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 40e0677ef..06422e169 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10 months ago Main advances
-+ feature ?!+»✘⚠ ↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10 months ago Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10mo Main advances
++ feature ?!+»✘⚠ ↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10mo Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index e018247de..6f5c6d106 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b7c14ce1 10 months ago Main conflicting changes
-+ feature ?!+ ✖↻ ⊠🤖 +7 ./feature b7c14ce1 10 months ago Main conflicting changes
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo b7c14ce1 10mo Main conflicting changes
++ feature ?!+ ✖↻ ⊠🤖 +7 ./feature b7c14ce1 10mo Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index e9210218c..5100d4d6c 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10 months ago Add files
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10mo Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 8da52866d..fec92b933 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ≡ ./feature-b b834638e 10mo 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 67494a7cf..f4052e9bd 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ feature ≡ ./feature b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature ≡ ./feature b834638e 10mo 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 81bbaf267..b3923d88a 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ≡ ./feature-b b834638e 10mo 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 213d766bf..b2079ae85 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
- orphan-1 ∅ ⎇ b834638e 10 months ago Initial commit
- orphan-2 ∅ ⎇ b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
+ orphan-1 ∅ ⎇ b834638e 10mo Initial commit
+ orphan-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index 885126d83..7cd803f27 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10 months ago Initial commit
-+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10 months ago Fix bug
-+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10 months ago Add file 3
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
++ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
++ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index a00fccd49..8c7efbb28 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 113e83cde..0c3482ea1 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10 months ago Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10 months ago PR commit
-+ wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10 months ago Initial content
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10mo Symbol commit
++ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10mo PR commit
++ wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10mo Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 5cecd4ee0..2c12c3107 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
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 69f35398d..9f8ced41f 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ feature-a ? ≡ ./feature-a b834638e 10 months ago Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10 months ago Test commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ? ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10mo 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 04fa595a1..1c49f44ce 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
@@ -23,17 +23,17 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ feature-1 ≡ ./feature-1 b834638e 10 months ago Initial commit
-+ feature-10 ≡ ./feature-10 b834638e 10 months ago Initial commit
-+ feature-2 ≡ ./feature-2 b834638e 10 months ago Initial commit
-+ feature-3 ≡ ./feature-3 b834638e 10 months ago Initial commit
-+ feature-4 ≡ ./feature-4 b834638e 10 months ago Initial commit
-+ feature-5 ≡ ./feature-5 b834638e 10 months ago Initial commit
-+ feature-6 ≡ ./feature-6 b834638e 10 months ago Initial commit
-+ feature-7 ≡ ./feature-7 b834638e 10 months ago Initial commit
-+ feature-8 ≡ ./feature-8 b834638e 10 months ago Initial commit
-+ feature-9 ≡ ./feature-9 b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-1 ≡ ./feature-1 b834638e 10mo Initial commit
++ feature-10 ≡ ./feature-10 b834638e 10mo Initial commit
++ feature-2 ≡ ./feature-2 b834638e 10mo Initial commit
++ feature-3 ≡ ./feature-3 b834638e 10mo Initial commit
++ feature-4 ≡ ./feature-4 b834638e 10mo Initial commit
++ feature-5 ≡ ./feature-5 b834638e 10mo Initial commit
++ feature-6 ≡ ./feature-6 b834638e 10mo Initial commit
++ feature-7 ≡ ./feature-7 b834638e 10mo Initial commit
++ feature-8 ≡ ./feature-8 b834638e 10mo Initial commit
++ feature-9 ≡ ./feature-9 b834638e 10mo 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 74d6ea2fc..166a995bd 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
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
-+ feature-c ≡ ./feature-c b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ≡ ./feature-b b834638e 10mo Initial commit
++ feature-c ≡ ./feature-c b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index f14c22654..9cb6f8505 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index 35b92cb6c..bca190f78 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
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 837d5cdc7..bfab0ec5d 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ locked ≡ ⊠ ./locked b834638e 10 months ago Initial commit
-+ normal ≡ ./normal b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked ≡ ⊠ ./locked b834638e 10mo Initial commit
++ normal ≡ ./normal b834638e 10mo 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 3ff9eea08..f9cc2a1b0 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10 months ago Ahead commit
-+ in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10mo Ahead commit
++ in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10mo 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 6725130f0..396854114 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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 🎉
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo e4614cb7 10mo Fix bug with café ☕ handling
++ feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
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 cc91815bd..8114fdcf2 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
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10 months ago Initial commit
-+ emoji ≡ 🔄 ./emoji b834638e 10 months ago Initial commit
-+ multi ≡ 👨‍💻 ./multi b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ emoji ≡ 🔄 ./emoji b834638e 10mo Initial commit
++ multi ≡ 👨‍💻 ./multi b834638e 10mo 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 2e95cfbdb..b3d5015fb 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-with-worktree ≡ ./feature-with-worktree b834638e 10mo Initial commit
+ another-branch ∅ ⎇ b834638e 10mo Initial commit
+ feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
+ fix-bug ∅ ⎇ b834638e 10mo 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 9547e179e..7ff8784a3 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ≡ ./feature-a b834638e 10mo Initial commit
++ feature-b ≡ ./feature-b b834638e 10mo 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 02f341a3e..0a451953b 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
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
+ branch-alpha ∅ ⎇ b834638e 10mo Initial commit
+ branch-beta ∅ ⎇ b834638e 10mo Initial commit
+ branch-gamma ∅ ⎇ b834638e 10mo 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 68f5c34b7..f41e5469c 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10 months ago Initial commit
- local-only-1 ∅ ⎇ b834638e 10 months ago Initial commit
- local-only-2 ∅ ⎇ b834638e 10 months ago Initial commit
- origin/remote-only-1 ∅ ⎇ b834638e 10 months ago Initial commit
- origin/remote-only-2 ∅ ⎇ b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+ local-only-1 ∅ ⎇ b834638e 10mo Initial commit
+ local-only-2 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-2 ∅ ⎇ b834638e 10mo 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 71a517cc9..37eb7ecd0 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10 months ago Initial commit
-+ feature-with-worktree ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
- origin/remote-only ∅ ⎇ b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
++ feature-with-worktree ≡ ./feature-with-worktree b834638e 10mo Initial commit
+ origin/remote-only ∅ ⎇ b834638e 10mo 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 539cfc8c1..230a35a90 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10 months ago Initial commit
- origin/remote-feature-1 ∅ ⎇ b834638e 10 months ago Initial commit
- origin/remote-feature-2 ∅ ⎇ b834638e 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+ origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-feature-2 ∅ ⎇ b834638e 10mo 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 e0802de55..61da2d801 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -11,26 +11,26 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0AUoHf/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0AUoHf/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0AUoHf/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10mo Ahead commit 2
++ behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10mo Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10mo Diverged local commit
++ in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
++ no-upstream ≡ ./no-upstream 6c3da842 10mo 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 70edac3b8..06204e14d 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -22,11 +22,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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 ≡ 💬 ./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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ clean-no-status ≡ ./clean-no-status b834638e 10mo Initial commit
++ clean-with-status ≡ 💬 ./clean-with-status b834638e 10mo Initial commit
++ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
++ dirty-with-status ? ≡ 🤖 ./dirty-with-status b834638e 10mo Initial commit
⚪ Showing 5 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
index 9fa3ce2a4..cc19afcd5 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
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 8e5e70df7..dc520db5d 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10 months ago Initial commit
- feature ∅ ⎇ [SHA] 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
+ feature ∅ ⎇ [SHA] 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index 9fa3ce2a4..cc19afcd5 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index 9fa3ce2a4..cc19afcd5 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index 9fa3ce2a4..cc19afcd5 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
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 68e328308..87eaceeea 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
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >…
-+ feature ≡ ./feature [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature ≡ ./feature [SHA] 10mo 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 45f1e6cd8..5d7b478b1 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
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10 months ago Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo 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 2283a5cf6..6bc5ba1b8 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ also-no-changes ≡ ./also-no-changes b834638e 10mo Initial commit
++ no-changes ≡ ./no-changes b834638e 10mo Initial commit
++ with-changes ! +1 -1 ./with-changes b834638e 10mo 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 4c038fd38..b95a0a206 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
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ huge ? ≡ ./huge b834638e 10mo Initial commit
++ tiny ! +1 -1 ./tiny b834638e 10mo 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 25a3be712..3bce7a524 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-large ? ≡ ./feature-large b834638e 10mo Initial commit
++ feature-medium ? ≡ ./feature-medium b834638e 10mo Initial commit
++ feature-small ? ≡ ./feature-small b834638e 10mo 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 6d7a77a5c..4d5d056a4 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10 months ago
-+ another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago
-+ short ≡ ./short b834638e 10 months ago
-+ very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10 months ago
+@ main ^ ./test-repo b834638e 10mo
++ another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10mo
++ short ≡ ./short b834638e 10mo
++ very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10mo
⚪ 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 8c39f245c..60302382a 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10 months ago
-+ long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago
-+ medium ≡ ./medium-length-name b834638e 10 months ago
-+ x ≡ ./x b834638e 10 months ago
+@ main ^ ./test-repo b834638e 10mo
++ long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10mo
++ medium ≡ ./medium-length-name b834638e 10mo
++ x ≡ ./x b834638e 10mo
⚪ 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 83999771c..0ba2d5e5a 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ a ≡ ./a b834638e 10mo Initial commit
++ bb ≡ ./bb b834638e 10mo Initial commit
++ ccc ≡ ./ccc b834638e 10mo 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 9a54f7ab3..5267911e0 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± 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
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ cafe ≡ ./café b834638e 10mo Initial commit
++ naive ≡ ./naïve b834638e 10mo Initial commit
++ resume ≡ ./résumé b834638e 10mo Initial commit
⚪ Showing 4 worktrees