Skip to content

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

feat: Add CI status for all branches and accept insta snapshot reordering

Maximilian Roosc9daa3eb4762
diff --git a/src/commands/list/ci_status.rs b/src/commands/list/ci_status.rs
index 243aa71bd..05d63d54c 100644
--- a/src/commands/list/ci_status.rs
+++ b/src/commands/list/ci_status.rs
@@ -27,16 +27,27 @@ pub struct PrStatus {
}
impl PrStatus {
- /// Detect PR status for a branch using gh/glab CLI
- /// Returns None if no PR found or CLI tools unavailable
+ /// Detect CI status for a branch using gh/glab CLI
+ /// First tries to find PR/MR status, then falls back to workflow/pipeline runs
+ /// Returns None if no CI found or CLI tools unavailable
pub fn detect(branch: &str, local_head: &str) -> Option<Self> {
- // Try GitHub first
+ // Try GitHub PR first
if let Some(status) = Self::detect_github(branch, local_head) {
return Some(status);
}
- // Fall back to GitLab
- Self::detect_gitlab(branch, local_head)
+ // Try GitHub workflow runs (for branches without PRs)
+ if let Some(status) = Self::detect_github_workflow(branch, local_head) {
+ return Some(status);
+ }
+
+ // Try GitLab MR
+ if let Some(status) = Self::detect_gitlab(branch, local_head) {
+ return Some(status);
+ }
+
+ // Fall back to GitLab pipeline (for branches without MRs)
+ Self::detect_gitlab_pipeline(branch, local_head)
}
fn detect_github(branch: &str, local_head: &str) -> Option<Self> {
@@ -189,6 +200,101 @@ impl PrStatus {
_ => CiStatus::NoCI,
}
}
+
+ fn detect_github_workflow(branch: &str, _local_head: &str) -> Option<Self> {
+ // Check if gh is available and authenticated
+ if !Command::new("gh")
+ .args(["auth", "status"])
+ .output()
+ .map(|o| o.status.success())
+ .unwrap_or(false)
+ {
+ return None;
+ }
+
+ // Get most recent workflow run for the branch
+ let output = Command::new("gh")
+ .args([
+ "run",
+ "list",
+ "--branch",
+ branch,
+ "--limit",
+ "1",
+ "--json",
+ "status,conclusion",
+ ])
+ .output()
+ .ok()?;
+
+ if !output.status.success() {
+ return None;
+ }
+
+ let runs: Vec<GitHubWorkflowRun> = serde_json::from_slice(&output.stdout).ok()?;
+ let run = runs.first()?;
+
+ // Analyze workflow run status
+ let ci_status = Self::analyze_github_workflow_run(run);
+
+ // Workflow runs don't have staleness concept (no PR to compare against)
+ Some(PrStatus {
+ ci_status,
+ is_stale: false,
+ })
+ }
+
+ fn analyze_github_workflow_run(run: &GitHubWorkflowRun) -> CiStatus {
+ match run.status.as_deref() {
+ Some("in_progress" | "queued" | "pending" | "waiting") => CiStatus::Running,
+ Some("completed") => match run.conclusion.as_deref() {
+ Some("success") => CiStatus::Passed,
+ Some("failure" | "cancelled" | "timed_out" | "action_required") => CiStatus::Failed,
+ Some("skipped" | "neutral") | None => CiStatus::NoCI,
+ _ => CiStatus::NoCI,
+ },
+ _ => CiStatus::NoCI,
+ }
+ }
+
+ fn detect_gitlab_pipeline(branch: &str, _local_head: &str) -> Option<Self> {
+ // Check if glab is available
+ if !Command::new("glab")
+ .arg("--version")
+ .output()
+ .map(|o| o.status.success())
+ .unwrap_or(false)
+ {
+ return None;
+ }
+
+ // Get most recent pipeline for the branch
+ let output = Command::new("glab")
+ .args(["ci", "list", "--per-page", "1"])
+ .env("BRANCH", branch) // glab ci list uses BRANCH env var
+ .output()
+ .ok()?;
+
+ if !output.status.success() {
+ return None;
+ }
+
+ // Parse glab ci list output (format: "• (<status>) <pipeline-info>")
+ let output_str = String::from_utf8(output.stdout).ok()?;
+ let first_line = output_str.lines().next()?;
+
+ // Extract status from format like "• (running) #12345"
+ let status_start = first_line.find('(')?;
+ let status_end = first_line.find(')')?;
+ let status = &first_line[status_start + 1..status_end];
+
+ let ci_status = Self::analyze_gitlab_pipeline(Some(&status.to_string()));
+
+ Some(PrStatus {
+ ci_status,
+ is_stale: false,
+ })
+ }
}
#[derive(Debug, Deserialize)]
@@ -208,6 +314,12 @@ struct GitHubCheck {
conclusion: Option<String>,
}
+#[derive(Debug, Deserialize)]
+struct GitHubWorkflowRun {
+ status: Option<String>,
+ conclusion: Option<String>,
+}
+
#[derive(Debug, Deserialize)]
struct GitLabMrInfo {
state: String,
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 804d57ef7..ccda959b4 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -274,9 +274,9 @@ pub struct ColumnPositions {
pub branch_diff: usize,
pub states: usize,
pub path: usize,
+ pub ci_status: usize,
pub upstream: usize,
pub time: usize,
- pub ci_status: usize,
pub commit: usize,
pub message: usize,
}
@@ -463,10 +463,10 @@ pub fn calculate_responsive_layout(
// 4. branch_diff - line diff in commits (work volume in those commits)
// 5. states - special states like [rebasing], (conflicts) (rare but urgent when present)
// 6. path - location (where is this?)
- // 7. upstream - tracking configuration (sync context)
- // 8. commit - hash (reference info, precedes age for clarity)
+ // 7. ci_status - CI status (contextual when available)
+ // 8. upstream - tracking configuration (sync context)
// 9. time - recency (nice-to-have context)
- // 10. ci_status - CI/PR status (contextual when available)
+ // 10. commit - hash (reference info, rarely needed)
// 11. message - description (nice-to-have, space-hungry)
let mut remaining = terminal_width;
@@ -517,14 +517,14 @@ pub fn calculate_responsive_layout(
has_data: true,
},
ColumnDescriptor {
- column_type: ColumnType::Upstream,
+ column_type: ColumnType::CiStatus,
base_priority: 7,
- has_data: data_flags.upstream,
+ has_data: data_flags.ci_status,
},
ColumnDescriptor {
- column_type: ColumnType::Commit,
+ column_type: ColumnType::Upstream,
base_priority: 8,
- has_data: true,
+ has_data: data_flags.upstream,
},
ColumnDescriptor {
column_type: ColumnType::Time,
@@ -532,9 +532,9 @@ pub fn calculate_responsive_layout(
has_data: true,
},
ColumnDescriptor {
- column_type: ColumnType::CiStatus,
+ column_type: ColumnType::Commit,
base_priority: 10,
- has_data: data_flags.ci_status,
+ has_data: true,
},
ColumnDescriptor {
column_type: ColumnType::Message,
@@ -669,10 +669,10 @@ pub fn calculate_responsive_layout(
branch_diff: advance(widths.branch_diff.total),
states: advance(widths.states),
path: advance(widths.path),
+ ci_status: advance(widths.ci_status),
upstream: advance(widths.upstream.total),
- commit: advance(widths.commit),
time: advance(widths.time),
- ci_status: advance(widths.ci_status),
+ commit: advance(widths.commit),
message: advance(widths.message),
};
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 398f3feb4..576df2e0d 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -298,6 +298,13 @@ pub fn format_header_line(layout: &LayoutConfig) {
style,
);
push_header_at(&mut line, HEADER_PATH, widths.path, positions.path, style);
+ push_header_at(
+ &mut line,
+ HEADER_CI,
+ widths.ci_status,
+ positions.ci_status,
+ style,
+ );
push_header_at(
&mut line,
HEADER_UPSTREAM,
@@ -305,6 +312,7 @@ pub fn format_header_line(layout: &LayoutConfig) {
positions.upstream,
style,
);
+ push_header_at(&mut line, HEADER_AGE, widths.time, positions.time, style);
push_header_at(
&mut line,
HEADER_COMMIT,
@@ -312,14 +320,6 @@ pub fn format_header_line(layout: &LayoutConfig) {
positions.commit,
style,
);
- push_header_at(&mut line, HEADER_AGE, widths.time, positions.time, style);
- push_header_at(
- &mut line,
- HEADER_CI,
- widths.ci_status,
- positions.ci_status,
- style,
- );
push_header_at(
&mut line,
HEADER_MESSAGE,
@@ -485,6 +485,18 @@ pub fn format_list_item_line(
}
}
+ // CI status
+ if widths.ci_status > 0 {
+ line.pad_to(positions.ci_status);
+ if let Some(pr_status) = item.pr_status() {
+ let mut ci_segment = format_ci_status(pr_status);
+ ci_segment.pad_to(widths.ci_status);
+ append_line(&mut line, ci_segment);
+ } else {
+ push_blank(&mut line, widths.ci_status);
+ }
+ }
+
// Upstream tracking
if widths.upstream.total > 0 {
line.pad_to(positions.upstream);
@@ -524,18 +536,6 @@ pub fn format_list_item_line(
line.push_styled(time_str, Style::new().dimmed());
}
- // CI status
- if widths.ci_status > 0 {
- line.pad_to(positions.ci_status);
- if let Some(pr_status) = item.pr_status() {
- let mut ci_segment = format_ci_status(pr_status);
- ci_segment.pad_to(widths.ci_status);
- append_line(&mut line, ci_segment);
- } else {
- push_blank(&mut line, widths.ci_status);
- }
- }
-
// Message
if widths.message > 0 {
line.pad_to(positions.message);
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index fb7e7e743..521973547 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/.tmpAQ4ZZ5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp71BEYU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-(detached) .  b834638e 10 months ago Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+(detached) .  b834638e10 months agoInitial commit
Showing 1 worktree
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 92e8538f0..4108e2a10 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/.tmphW21WR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpApuzAg/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-no-reason (locked) ./locked-no-reason b834638e 10 months ago Initial commit
+Branch Working ± Main ↕ State Path Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+locked-no-reason (locked) ./locked-no-reason b834638e10 months agoInitial 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 453eacfff..ab66252d7 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/.tmpHGdb5g/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpR0Iw1w/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch State Path Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-feature (locked: Testing lock functionality) ./locked-feature b834638e 10 months ago Initial commit
+Branch State Path Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+locked-feature (locked: Testing lock functionality) ./locked-feature b834638e10 months agoInitial 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 970ca10a4..a8c1845af 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/.tmpRWwm2S/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptigmG5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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...
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 1310bfb910 months agoShort message
+feature-a ↓1 ./feature-a f078644e10 months agoThis 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 c19fb7f64..208da35ae 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/.tmplpFTE6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9BAm5P/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Path 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
+Branch Working ± Path Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+medium-name  ./medium-name  b834638e10 months agoInitial commit
+short  ./short  b834638e10 months agoInitial commit
+very-long-branch-name-here ./very-long-branch-name-here b834638e10 months agoInitial commit
+with-changes  ./with-changes  b834638e10 months agoInitial 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 91c790dae..28c435ce7 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/.tmpeeNy30/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjS1yc4/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo b834638e10 months agoInitial commit
+feature-a ./feature-a b834638e10 months agoInitial commit
+feature-b ./feature-b b834638e10 months agoInitial 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 968cd5bcf..cbd09f068 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/.tmpmmmnEf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpo8xVIX/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  .  b834638e 10 months ago Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  .  b834638e10 months agoInitial 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 aad2ba04c..23b511a5b 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/.tmp9yaE9g/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1Nz4dL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo  e4614cb710 months agoFix bug with café ☕ handling
+feature-test ↓1 ./feature-test 0c53695b10 months agoAdd support for 日本語 and émoji 🎉
Showing 2 worktrees, 1 behind
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 e5d74389a..20fd0521f 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/.tmp3QczPR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzgVkgS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ Path 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 Working ± Main ↕ Path Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+feature-with-worktree  ./feature-with-worktree b834638e10 months agoInitial commit
+another-branch  b834638e10 months agoInitial commit
+feature-without-worktree b834638e10 months agoInitial commit
+fix-bug  b834638e10 months agoInitial 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 83dce88f9..82ca1788b 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/.tmpN8KrFB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcHsVyH/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo b834638e10 months agoInitial commit
+feature-a ./feature-a b834638e10 months agoInitial commit
+feature-b ./feature-b b834638e10 months agoInitial 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 efd57a057..5e7ad7c47 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/.tmpEnMgSA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmeyqFu/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  .  b834638e10 months agoInitial commit
+branch-alpha b834638e10 months agoInitial commit
+branch-beta  b834638e10 months agoInitial commit
+branch-gamma b834638e10 months agoInitial commit
Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index 83040b34b..b402d691a 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/.tmpk7A90X/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppG2u4O/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo [SHA]10 months agoFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature ./feature  [SHA]10 months agoFix 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 79858616b..84298cdbc 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/.tmpIMr0iE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw0aAXk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  .  b834638e 10 months ago Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  .  b834638e10 months agoInitial 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 2304da2ec..943ccf6b1 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/.tmpcZqocT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk8aLRc/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+also-no-changes ./also-no-changes b834638e10 months agoInitial commit
+no-changes  ./no-changes  b834638e10 months agoInitial commit
+with-changes +1 -1 ./with-changes b834638e10 months agoInitial 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 9587707e9..22bc84a4d 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/.tmpX257lV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNAvx23/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo b834638e10 months agoInitial commit
+huge  ./huge  b834638e10 months agoInitial commit
+tiny +1 -1 ./tiny b834638e10 months agoInitial 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 c9ac7492d..a7e4f015a 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/.tmpNR8qGX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSMxiie/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+feature-large  ./feature-large  b834638e10 months agoInitial commit
+feature-medium ./feature-medium b834638e10 months agoInitial commit
+feature-small  ./feature-small  b834638e10 months agoInitial 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 64e981629..696890332 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/.tmpqUyNS3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjjArUz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path 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
+Branch Path Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+another-extremely-long-name-here ./another-extremely-long-name-here b834638e10 months agoInitial commit
+short  ./short  b834638e10 months agoInitial commit
+very-long-feature-branch-name  ./very-long-feature-branch-name  b834638e10 months agoInitial 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 459894b22..1244d96c5 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/.tmpfERshv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfuFYGd/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path 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
+Branch Path Age Commit Message
+main  ./test-repo  b834638e10 months agoInitial commit
+long  ./extremely-long-branch-name-that-might-cause-layout-issues b834638e10 months agoInitial commit
+medium ./medium-length-name  b834638e10 months agoInitial commit
+x  ./x  b834638e10 months agoInitial 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 f75dbe594..1424d0040 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/.tmpWIWzLM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpozwkps/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo b834638e10 months agoInitial commit
+a  ./a  b834638e10 months agoInitial commit
+bb  ./bb  b834638e10 months agoInitial commit
+ccc  ./ccc  b834638e10 months agoInitial 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 25359e62f..eeed8a831 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/.tmpYOvNzO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2WPHfF/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ 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
+Branch Working ± Main ↕ Path Age Commit Message
+main  ./test-repo a7bc47ca10 months agoInitial commit with a reasonably long message
+feature-a ./feature-a a7bc47ca10 months agoInitial commit with a reasonably long message
+feature-b ./feature-b a7bc47ca10 months agoInitial 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 7806fc2bb..afd7c1c0f 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/.tmpSpV3TE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptRuaCq/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo a7bc47ca10 months agoInitial commit with a reasonably long message
+feature-a ./feature-a a7bc47ca10 months agoInitial commit with a reasonably long message
+feature-b ./feature-b a7bc47ca10 months agoInitial 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 ecad9bcf9..867120909 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/.tmpDGWdAv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprTBGz4/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Commit Age Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a...
-feature-a ./feature-a a7bc47ca 10 months ago Initial commit with a...
-feature-b ./feature-b a7bc47ca 10 months ago Initial commit with a...
+Branch Path Age Commit Message
+main  ./test-repo a7bc47ca10 months agoInitial commit with a...
+feature-a ./feature-a a7bc47ca10 months agoInitial commit with a...
+feature-b ./feature-b a7bc47ca10 months agoInitial commit with a...
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 31200ef54..a069e2bcf 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/.tmpXhDl57/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ4KUF7/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State 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 Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo b834638e10 months agoInitial commit
+cafe  ./café  b834638e10 months agoInitial commit
+naive  ./naïve  b834638e10 months agoInitial commit
+resume ./résumé  b834638e10 months agoInitial commit
Showing 4 worktrees