Skip to content

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

feat(list): Add CI status column

Maximilian Roos5260c69206c5
diff --git a/src/commands/list/ci_status.rs b/src/commands/list/ci_status.rs
new file mode 100644
index 000000000..243aa71bd
--- /dev/null
+++ b/src/commands/list/ci_status.rs
@@ -0,0 +1,233 @@
+use serde::{Deserialize, Serialize};
+use std::process::Command;
+
+/// CI status from GitHub/GitLab checks
+/// Matches the statusline.sh color scheme:
+/// - Passed: Green (all checks passed)
+/// - Running: Blue (checks in progress)
+/// - Failed: Red (checks failed)
+/// - Conflicts: Yellow (merge conflicts)
+/// - NoCI: Gray (no PR/checks)
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum CiStatus {
+ Passed,
+ Running,
+ Failed,
+ Conflicts,
+ NoCI,
+}
+
+/// PR/MR status including CI state and staleness
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PrStatus {
+ pub ci_status: CiStatus,
+ /// True if local HEAD differs from PR HEAD (unpushed changes)
+ pub is_stale: bool,
+}
+
+impl PrStatus {
+ /// Detect PR status for a branch using gh/glab CLI
+ /// Returns None if no PR found or CLI tools unavailable
+ pub fn detect(branch: &str, local_head: &str) -> Option<Self> {
+ // Try GitHub first
+ if let Some(status) = Self::detect_github(branch, local_head) {
+ return Some(status);
+ }
+
+ // Fall back to GitLab
+ Self::detect_gitlab(branch, local_head)
+ }
+
+ fn detect_github(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 PR info for the branch
+ let output = Command::new("gh")
+ .args([
+ "pr",
+ "view",
+ branch,
+ "--json",
+ "state,headRefOid,mergeStateStatus,statusCheckRollup",
+ ])
+ .output()
+ .ok()?;
+
+ if !output.status.success() {
+ return None;
+ }
+
+ let pr_info: GitHubPrInfo = serde_json::from_slice(&output.stdout).ok()?;
+
+ // Only process open PRs
+ if pr_info.state != "OPEN" {
+ return None;
+ }
+
+ // Determine CI status using priority: conflicts > running > failed > passed > no_ci
+ let ci_status = if pr_info.merge_state_status.as_deref() == Some("DIRTY") {
+ CiStatus::Conflicts
+ } else {
+ Self::analyze_github_checks(&pr_info.status_check_rollup)
+ };
+
+ let is_stale = pr_info
+ .head_ref_oid
+ .as_ref()
+ .map(|pr_head| pr_head != local_head)
+ .unwrap_or(false);
+
+ Some(PrStatus {
+ ci_status,
+ is_stale,
+ })
+ }
+
+ fn analyze_github_checks(checks: &Option<Vec<GitHubCheck>>) -> CiStatus {
+ let Some(checks) = checks else {
+ return CiStatus::NoCI;
+ };
+
+ if checks.is_empty() {
+ return CiStatus::NoCI;
+ }
+
+ let has_pending = checks.iter().any(|c| {
+ matches!(
+ c.status.as_deref(),
+ Some("IN_PROGRESS" | "QUEUED" | "PENDING" | "EXPECTED")
+ )
+ });
+
+ let has_failure = checks.iter().any(|c| {
+ matches!(
+ c.conclusion.as_deref(),
+ Some("FAILURE" | "ERROR" | "CANCELLED")
+ )
+ });
+
+ if has_pending {
+ CiStatus::Running
+ } else if has_failure {
+ CiStatus::Failed
+ } else {
+ CiStatus::Passed
+ }
+ }
+
+ fn detect_gitlab(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 MR info for the branch
+ let output = Command::new("glab")
+ .args(["mr", "view", branch, "--output", "json"])
+ .output()
+ .ok()?;
+
+ if !output.status.success() {
+ return None;
+ }
+
+ let mr_info: GitLabMrInfo = serde_json::from_slice(&output.stdout).ok()?;
+
+ // Only process open MRs
+ if mr_info.state != "opened" {
+ return None;
+ }
+
+ // Determine CI status using priority: conflicts > running > failed > passed > no_ci
+ let ci_status = if mr_info.has_conflicts
+ || mr_info.detailed_merge_status.as_deref() == Some("conflict")
+ {
+ CiStatus::Conflicts
+ } else if mr_info.detailed_merge_status.as_deref() == Some("ci_still_running") {
+ CiStatus::Running
+ } else if mr_info.detailed_merge_status.as_deref() == Some("ci_must_pass") {
+ CiStatus::Failed
+ } else {
+ Self::analyze_gitlab_pipeline(mr_info.pipeline_status())
+ };
+
+ let is_stale = mr_info.sha != local_head;
+
+ Some(PrStatus {
+ ci_status,
+ is_stale,
+ })
+ }
+
+ fn analyze_gitlab_pipeline(pipeline_status: Option<&String>) -> CiStatus {
+ match pipeline_status.map(|s| s.as_str()) {
+ Some(
+ "running"
+ | "pending"
+ | "preparing"
+ | "waiting_for_resource"
+ | "created"
+ | "scheduled",
+ ) => CiStatus::Running,
+ Some("failed" | "canceled") => CiStatus::Failed,
+ Some("success") => CiStatus::Passed,
+ Some("skipped" | "manual") | None => CiStatus::NoCI,
+ _ => CiStatus::NoCI,
+ }
+ }
+}
+
+#[derive(Debug, Deserialize)]
+struct GitHubPrInfo {
+ state: String,
+ #[serde(rename = "headRefOid")]
+ head_ref_oid: Option<String>,
+ #[serde(rename = "mergeStateStatus")]
+ merge_state_status: Option<String>,
+ #[serde(rename = "statusCheckRollup")]
+ status_check_rollup: Option<Vec<GitHubCheck>>,
+}
+
+#[derive(Debug, Deserialize)]
+struct GitHubCheck {
+ status: Option<String>,
+ conclusion: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct GitLabMrInfo {
+ state: String,
+ sha: String,
+ has_conflicts: bool,
+ detailed_merge_status: Option<String>,
+ head_pipeline: Option<GitLabPipeline>,
+ pipeline: Option<GitLabPipeline>,
+}
+
+impl GitLabMrInfo {
+ fn pipeline_status(&self) -> Option<&String> {
+ self.head_pipeline
+ .as_ref()
+ .or(self.pipeline.as_ref())
+ .and_then(|p| p.status.as_ref())
+ }
+}
+
+#[derive(Debug, Deserialize)]
+struct GitLabPipeline {
+ status: Option<String>,
+}
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index e3f657c79..cc24bccdf 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -54,6 +54,7 @@ impl DiffWidths {
pub struct ColumnWidths {
pub branch: usize,
pub time: usize,
+ pub ci_status: usize,
pub message: usize,
pub ahead_behind: DiffWidths,
pub working_diff: DiffWidths,
@@ -129,7 +130,7 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
max_br_deleted_digits = max_br_deleted_digits.max(branch_diff.1.to_string().len());
}
- // Upstream tracking - track digits separately
+ // Upstream tracking - track digits only (not remote name yet)
if let Some((_remote_name, upstream_ahead, upstream_behind)) = upstream.active() {
max_upstream_ahead_digits =
max_upstream_ahead_digits.max(upstream_ahead.to_string().len());
@@ -171,6 +172,8 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
// Calculate upstream column width (format: "↑n ↓n" or "remote ↑n ↓n")
let upstream_total = if max_upstream_ahead_digits > 0 || max_upstream_behind_digits > 0 {
+ // Format: "↑" + digits + " " + "↓" + digits
+ // TODO: Add remote name when show_remote_names is implemented
let data_width = 1 + max_upstream_ahead_digits + 1 + 1 + max_upstream_behind_digits;
data_width.max("Remote".width())
} else {
@@ -183,9 +186,14 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
0
};
+ // CI status column: Always 2 chars wide if any item has CI status
+ let has_ci_status = items.iter().any(|item| item.pr_status().is_some());
+ let ci_status_width = if has_ci_status { 2 } else { 0 };
+
ColumnWidths {
branch: max_branch,
time: max_time,
+ ci_status: ci_status_width,
message: max_message,
ahead_behind: DiffWidths {
total: ahead_behind_total,
@@ -260,6 +268,7 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {
let mut widths = ColumnWidths {
branch: 0,
time: 0,
+ ci_status: 0,
message: 0,
ahead_behind: DiffWidths::zero(),
working_diff: DiffWidths::zero(),
@@ -321,6 +330,9 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {
// Time column (contextual information)
widths.time = try_allocate(&mut remaining, ideal_widths.time, spacing, false);
+ // CI status column (high priority when present, fixed width)
+ widths.ci_status = try_allocate(&mut remaining, ideal_widths.ci_status, spacing, false);
+
// Commit column (reference hash - rarely needed)
widths.commit = try_allocate(&mut remaining, commit_width, spacing, false);
@@ -391,6 +403,7 @@ mod tests {
is_primary: false,
upstream: UpstreamStatus::from_parts(Some("origin".to_string()), 4, 0),
worktree_state: None,
+ pr_status: None,
};
let widths = calculate_column_widths(&[super::ListItem::Worktree(info1)]);
@@ -416,10 +429,10 @@ mod tests {
assert_eq!(widths.branch_diff.added_digits, 3, "200 has 3 digits");
assert_eq!(widths.branch_diff.deleted_digits, 2, "30 has 2 digits");
- // Single remote: "↑4 ↓0" has format "↑4 ↓0" = 1+1+1+1+1 = 5, but header "Remote" is 6
+ // Upstream: "↑4 ↓0" = "↑" (1) + "4" (1) + " " (1) + "↓" (1) + "0" (1) = 5, but header "Remote" = 6
assert_eq!(
widths.upstream.total, 6,
- "Upstream column should fit header 'Remote' (width 6) when single remote"
+ "Upstream column should fit header 'Remote' (width 6)"
);
assert_eq!(widths.upstream.added_digits, 1, "4 has 1 digit");
assert_eq!(widths.upstream.deleted_digits, 1, "0 has 1 digit");
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 4e9ed476d..f553647d4 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -1,3 +1,4 @@
+mod ci_status;
mod layout;
mod model;
mod render;
@@ -10,12 +11,16 @@ use model::{ListData, ListItem, gather_list_data};
use render::{format_header_line, format_list_item_line};
use worktrunk::git::{GitError, Repository};
-pub fn handle_list(format: crate::OutputFormat, show_branches: bool) -> Result<(), GitError> {
+pub fn handle_list(
+ format: crate::OutputFormat,
+ show_branches: bool,
+ fetch_ci: bool,
+) -> Result<(), GitError> {
let repo = Repository::current();
let Some(ListData {
items,
current_worktree_path,
- }) = gather_list_data(&repo, show_branches)?
+ }) = gather_list_data(&repo, show_branches, fetch_ci)?
else {
return Ok(());
};
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 47f7dbb3e..d74e94d58 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -3,6 +3,8 @@ use std::path::PathBuf;
use worktrunk::git::{GitError, Repository};
use worktrunk::styling::{HINT, HINT_EMOJI, WARNING, WARNING_EMOJI, println};
+use super::ci_status::PrStatus;
+
#[derive(serde::Serialize)]
pub struct WorktreeInfo {
pub worktree: worktrunk::git::Worktree,
@@ -17,6 +19,7 @@ pub struct WorktreeInfo {
#[serde(flatten)]
pub upstream: UpstreamStatus,
pub worktree_state: Option<String>,
+ pub pr_status: Option<PrStatus>,
}
#[derive(serde::Serialize)]
@@ -31,6 +34,7 @@ pub struct BranchInfo {
pub branch_diff: BranchDiffTotals,
#[serde(flatten)]
pub upstream: UpstreamStatus,
+ pub pr_status: Option<PrStatus>,
}
#[derive(serde::Serialize, Clone)]
@@ -209,6 +213,13 @@ impl ListItem {
pub fn worktree_path(&self) -> Option<&PathBuf> {
self.worktree_info().map(|info| &info.worktree.path)
}
+
+ pub fn pr_status(&self) -> Option<&PrStatus> {
+ match self {
+ ListItem::Worktree(info) => info.pr_status.as_ref(),
+ ListItem::Branch(info) => info.pr_status.as_ref(),
+ }
+ }
}
impl BranchInfo {
@@ -217,6 +228,7 @@ impl BranchInfo {
branch: &str,
repo: &Repository,
primary_branch: Option<&str>,
+ fetch_ci: bool,
) -> Result<Self, GitError> {
// Get the commit SHA for this branch
let head = repo.run_command(&["rev-parse", branch])?.trim().to_string();
@@ -226,6 +238,12 @@ impl BranchInfo {
let branch_diff = BranchDiffTotals::compute(repo, primary_branch, &head)?;
let upstream = UpstreamStatus::calculate(repo, Some(branch), &head)?;
+ let pr_status = if fetch_ci {
+ PrStatus::detect(branch, &head)
+ } else {
+ None
+ };
+
Ok(BranchInfo {
name: branch.to_string(),
head,
@@ -233,6 +251,7 @@ impl BranchInfo {
counts,
branch_diff,
upstream,
+ pr_status,
})
}
}
@@ -242,6 +261,7 @@ impl WorktreeInfo {
fn from_worktree(
wt: &worktrunk::git::Worktree,
primary: &worktrunk::git::Worktree,
+ fetch_ci: bool,
) -> Result<Self, GitError> {
let wt_repo = Repository::at(&wt.path);
let is_primary = wt.path == primary.path;
@@ -257,6 +277,14 @@ impl WorktreeInfo {
// Get worktree state (merge/rebase/etc)
let worktree_state = wt_repo.worktree_state()?;
+ let pr_status = if fetch_ci {
+ wt.branch
+ .as_deref()
+ .and_then(|branch| PrStatus::detect(branch, &wt.head))
+ } else {
+ None
+ };
+
Ok(WorktreeInfo {
worktree: wt.clone(),
commit,
@@ -266,6 +294,7 @@ impl WorktreeInfo {
is_primary,
upstream,
worktree_state,
+ pr_status,
})
}
}
@@ -274,6 +303,7 @@ impl WorktreeInfo {
pub fn gather_list_data(
repo: &Repository,
show_branches: bool,
+ fetch_ci: bool,
) -> Result<Option<ListData>, GitError> {
let worktrees = repo.list_worktrees()?;
@@ -288,19 +318,40 @@ pub fn gather_list_data(
let current_worktree_path = repo.worktree_root().ok();
// Gather enhanced information for all worktrees in parallel
- let worktree_infos: Vec<WorktreeInfo> = worktrees
+ let worktree_results: Vec<Result<WorktreeInfo, GitError>> = worktrees
.par_iter()
- .map(|wt| WorktreeInfo::from_worktree(wt, &primary))
- .collect::<Result<Vec<_>, _>>()?;
+ .map(|wt| WorktreeInfo::from_worktree(wt, &primary, fetch_ci))
+ .collect();
// Build list of items to display (worktrees + optional branches)
- let mut items: Vec<ListItem> = worktree_infos.into_iter().map(ListItem::Worktree).collect();
+ let mut items: Vec<ListItem> = Vec::new();
+
+ // Process worktree results
+ for result in worktree_results {
+ match result {
+ Ok(info) => items.push(ListItem::Worktree(info)),
+ Err(e) => {
+ // Worktree enrichment failures are critical - propagate error
+ return Err(e);
+ }
+ }
+ }
+ // Process branches in parallel if requested
if show_branches {
let available_branches = repo.available_branches()?;
let primary_branch = primary.branch.as_deref();
- for branch in available_branches {
- match BranchInfo::from_branch(&branch, repo, primary_branch) {
+
+ let branch_results: Vec<(String, Result<BranchInfo, GitError>)> = available_branches
+ .par_iter()
+ .map(|branch| {
+ let result = BranchInfo::from_branch(branch, repo, primary_branch, fetch_ci);
+ (branch.clone(), result)
+ })
+ .collect();
+
+ for (branch, result) in branch_results {
+ match result {
Ok(branch_info) => items.push(ListItem::Branch(branch_info)),
Err(e) => {
let warning_bold = WARNING.bold();
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 14d97166b..183edc540 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -2,6 +2,7 @@ use crate::display::{format_relative_time, shorten_path, truncate_at_word_bounda
use anstyle::{AnsiColor, Color, Style};
use worktrunk::styling::{ADDITION, CURRENT, DELETION, StyledLine};
+use super::ci_status::{CiStatus, PrStatus};
use super::layout::{DiffWidths, LayoutConfig};
use super::model::{ListItem, WorktreeInfo};
@@ -138,6 +139,30 @@ fn push_diff(line: &mut StyledLine, added: usize, deleted: usize, widths: &DiffW
);
}
+/// Format CI status indicator using the statusline.sh color scheme
+fn format_ci_status(pr_status: &PrStatus) -> StyledLine {
+ let mut segment = StyledLine::new();
+
+ // Choose color based on CI status
+ let color = match pr_status.ci_status {
+ CiStatus::Passed => AnsiColor::Green,
+ CiStatus::Running => AnsiColor::Blue,
+ CiStatus::Failed => AnsiColor::Red,
+ CiStatus::Conflicts => AnsiColor::Yellow,
+ CiStatus::NoCI => AnsiColor::BrightBlack,
+ };
+
+ // Apply dimming if stale (local HEAD differs from PR HEAD)
+ let style = if pr_status.is_stale {
+ Style::new().fg_color(Some(Color::Ansi(color))).dimmed()
+ } else {
+ Style::new().fg_color(Some(Color::Ansi(color)))
+ };
+
+ segment.push_styled("●".to_string(), style);
+ segment
+}
+
pub fn format_all_states(info: &WorktreeInfo) -> String {
let mut states = Vec::new();
@@ -172,6 +197,7 @@ pub fn format_header_line(layout: &LayoutConfig) {
push_optional_header(&mut line, "Path", widths.path, dim);
push_optional_header(&mut line, "Remote", widths.upstream.total, dim);
push_optional_header(&mut line, "Age", widths.time, dim);
+ push_optional_header(&mut line, "CI", widths.ci_status, dim);
push_optional_header(&mut line, "Commit", widths.commit, dim);
push_optional_header(&mut line, "Message", widths.message, dim);
@@ -251,42 +277,29 @@ pub fn format_list_item_line(
// Start building the line
let mut line = StyledLine::new();
- let mut first_column = true;
- // Helper to add gap before column if not first
- let mut push_gap_if_needed = |line: &mut StyledLine| {
- if !first_column {
- push_gap(line);
- }
- first_column = false;
- };
-
- // Branch name (dimmed if removable)
- if widths.branch > 0 {
- push_gap_if_needed(&mut line);
-
- let branch_text = format!("{:width$}", item.branch_name(), width = widths.branch);
- if let Some(style) = text_style {
- line.push_styled(branch_text, style);
- } else {
- line.push_raw(branch_text);
- }
+ // Branch name
+ let branch_text = format!("{:width$}", item.branch_name(), width = widths.branch);
+ if let Some(style) = text_style {
+ line.push_styled(branch_text, style);
+ } else {
+ line.push_raw(branch_text);
}
+ push_gap(&mut line);
// Working tree diff (worktrees only)
if widths.working_diff.total > 0 {
- push_gap_if_needed(&mut line);
if let Some(info) = worktree_info {
let (wt_added, wt_deleted) = info.working_tree_diff;
push_diff(&mut line, wt_added, wt_deleted, &widths.working_diff);
} else {
push_blank(&mut line, widths.working_diff.total);
}
+ push_gap(&mut line);
}
// Ahead/behind (commits difference) - green ahead, dim red behind
if widths.ahead_behind.total > 0 {
- push_gap_if_needed(&mut line);
if !item.is_primary() && (counts.ahead > 0 || counts.behind > 0) {
let dim_deletion = DELETION.dimmed();
append_line(
@@ -302,21 +315,11 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.ahead_behind.total);
}
- }
-
- // Branch diff (line diff in commits)
- if widths.branch_diff.total > 0 {
- push_gap_if_needed(&mut line);
- if !item.is_primary() {
- push_diff(&mut line, branch_diff.0, branch_diff.1, &widths.branch_diff);
- } else {
- push_blank(&mut line, widths.branch_diff.total);
- }
+ push_gap(&mut line);
}
// States (worktrees only)
if widths.states > 0 {
- push_gap_if_needed(&mut line);
if let Some(info) = worktree_info {
let states = format_all_states(info);
if !states.is_empty() {
@@ -328,11 +331,11 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.states);
}
+ push_gap(&mut line);
}
// Path (worktrees only)
if widths.path > 0 {
- push_gap_if_needed(&mut line);
if let Some(info) = worktree_info {
let path_str = shorten_path(&info.worktree.path, &layout.common_prefix);
let path_text = format!("{:width$}", path_str, width = widths.path);
@@ -344,11 +347,21 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.path);
}
+ push_gap(&mut line);
+ }
+
+ // Branch diff (line diff in commits)
+ if widths.branch_diff.total > 0 {
+ if !item.is_primary() {
+ push_diff(&mut line, branch_diff.0, branch_diff.1, &widths.branch_diff);
+ } else {
+ push_blank(&mut line, widths.branch_diff.total);
+ }
+ push_gap(&mut line);
}
// Upstream tracking
if widths.upstream.total > 0 {
- push_gap_if_needed(&mut line);
if let Some((_remote_name, upstream_ahead, upstream_behind)) = upstream.active() {
let dim_deletion = DELETION.dimmed();
// TODO: Handle show_remote_names when implemented
@@ -365,28 +378,41 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.upstream.total);
}
+ push_gap(&mut line);
}
// Age (Time)
if widths.time > 0 {
- push_gap_if_needed(&mut line);
let time_str = format!(
"{:width$}",
format_relative_time(commit.timestamp),
width = widths.time
);
line.push_styled(time_str, Style::new().dimmed());
+ push_gap(&mut line);
}
- // Commit (short HEAD) - dimmed reference info
+ // CI status
+ if widths.ci_status > 0 {
+ 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);
+ }
+ push_gap(&mut line);
+ }
+
+ // Commit (short HEAD) - always dimmed (reference info)
if widths.commit > 0 {
- push_gap_if_needed(&mut line);
- line.push_styled(short_head, Style::new().dimmed());
+ let commit_text = format!("{:width$}", short_head, width = widths.commit);
+ line.push_styled(commit_text, Style::new().dimmed());
+ push_gap(&mut line);
}
// Message
if widths.message > 0 {
- push_gap_if_needed(&mut line);
let msg = truncate_at_word_boundary(&commit.commit_message, layout.max_message_len);
let msg_start = line.width();
line.push_styled(msg, Style::new().dimmed());
@@ -400,7 +426,13 @@ pub fn format_list_item_line(
#[cfg(test)]
mod tests {
use super::*;
- // Note: Column alignment is tested via integration tests which capture actual output
+ use crate::commands::list::layout::{ColumnWidths, LayoutConfig};
+ use crate::commands::list::model::{
+ AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,
+ };
+ use crate::display::shorten_path;
+ use std::path::PathBuf;
+ use worktrunk::styling::StyledLine;
#[test]
fn test_format_diff_column_pads_to_total_width() {
diff --git a/src/main.rs b/src/main.rs
index 6499ac6f4..4da02b390 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -133,6 +133,16 @@ enum Commands {
/// Also display branches that don't have worktrees
#[arg(long)]
branches: bool,
+
+ /// Fetch CI status from GitHub/GitLab PRs/MRs
+ ///
+ /// Shows colored indicator for each branch: green (passed), blue (running),
+ /// red (failed), yellow (conflicts), gray (no CI). Dimmed = stale (unpushed commits).
+ ///
+ /// Requires gh (GitHub) or glab (GitLab) CLI installed and authenticated.
+ /// WARNING: Slow! Adds ~0.5-2s per branch (makes network requests).
+ #[arg(long)]
+ ci: bool,
},
/// Switch to a worktree
@@ -393,7 +403,11 @@ fn main() {
Commands::Dev { action } => match action {
DevCommand::RunHook { hook_type, force } => handle_dev_run_hook(hook_type, force),
},
- Commands::List { format, branches } => handle_list(format, branches),
+ Commands::List {
+ format,
+ branches,
+ ci,
+ } => handle_list(format, branches, ci),
Commands::Switch {
branch,
create,
diff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snap
index e418c3349..889e39e60 100644
--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmGRD0M/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfU8Y2k/test-config.toml
---
success: true
exit_code: 0
@@ -384,7 +384,7 @@ _wt() {
return 0
;;
wt__list)
- opts="-v -h --format --branches --verbose --help"
+ opts="-v -h --format --branches --ci --verbose --help"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index b7888287b..103420401 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDEGyoG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEBLWf9/test-config.toml
---
success: true
exit_code: 0
@@ -252,6 +252,7 @@ complete -c wt -n "__fish_wt_using_subcommand dev; and __fish_seen_subcommand_fr
complete -c wt -n "__fish_wt_using_subcommand list" -l format -d 'Output format' -r -f -a "table\t'Human-readable table format'
json\t'JSON format'"
complete -c wt -n "__fish_wt_using_subcommand list" -l branches -d 'Also display branches that don\'t have worktrees'
+complete -c wt -n "__fish_wt_using_subcommand list" -l ci -d 'Fetch CI status from GitHub/GitLab PRs/MRs'
complete -c wt -n "__fish_wt_using_subcommand list" -s v -l verbose -d 'Enable verbose output (show git commands and debug info)'
complete -c wt -n "__fish_wt_using_subcommand list" -s h -l help -d 'Print help (see more with \'--help\')'
complete -c wt -n "__fish_wt_using_subcommand switch" -s b -l base -d 'Base branch to create from (only with --create)' -r
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index fde52f051..e9f142401 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdLMByB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIdFGcP/test-config.toml
---
success: true
exit_code: 0
@@ -260,6 +260,7 @@ _arguments "${_arguments_options[@]}" : \
'--format=[Output format]:FORMAT:((table\:"Human-readable table format"
json\:"JSON format"))' \
'--branches[Also display branches that don'\''t have worktrees]' \
+'--ci[Fetch CI status from GitHub/GitLab PRs/MRs]' \
'-v[Enable verbose output (show git commands and debug info)]' \
'--verbose[Enable verbose output (show git commands and debug info)]' \
'-h[Print help (see more with '\''--help'\'')]' \
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index b6502f461..6a60130b2 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxm1rxH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4CyIKa/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index f816d4ebb..ad746b0a0 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -7,14 +7,16 @@ info:
- "--format=json"
env:
CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEdwtUI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWeDjZA/test-config.toml
---
success: true
exit_code: 0
@@ -47,7 +49,8 @@ exit_code: 0
"upstream_remote": null,
"upstream_ahead": 0,
"upstream_behind": 0,
- "worktree_state": null
+ "worktree_state": null,
+ "pr_status": null
},
{
"type": "worktree",
@@ -76,7 +79,8 @@ exit_code: 0
"upstream_remote": null,
"upstream_ahead": 0,
"upstream_behind": 0,
- "worktree_state": null
+ "worktree_state": null,
+ "pr_status": null
},
{
"type": "worktree",
@@ -105,7 +109,8 @@ exit_code: 0
"upstream_remote": null,
"upstream_ahead": 0,
"upstream_behind": 0,
- "worktree_state": null
+ "worktree_state": null,
+ "pr_status": null
}
]
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 495d13d00..e1464380e 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpontvav/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpedfkCa/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index d46c21f71..ea896f6eb 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMoL89L/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdfl808/test-config.toml
---
success: true
exit_code: 0
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 346e24235..4849f12ca 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxMvUqA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiCGmHn/test-config.toml
---
success: true
exit_code: 0
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 4c093e7b1..2cc1bd9d2 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgVNclb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzzisKX/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 56a31a6f2..8a7791f20 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNE7UMf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1A2VLI/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 9c6655f06..cf31c199f 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDtYgxP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOETUe3/test-config.toml
---
success: true
exit_code: 0
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 b40df4ad0..50f027906 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYmyRj4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTaHO7w/test-config.toml
---
success: true
exit_code: 0
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 6e5ead1da..17ac5112a 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5NquCm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVgnsxy/test-config.toml
---
success: true
exit_code: 0
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 e12878650..98172f9ff 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,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphgqe0o/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2Gi5cD/test-config.toml
---
success: true
exit_code: 0
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 e7b284798..a9953d400 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,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprcprXE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5EQXqq/test-config.toml
---
success: true
exit_code: 0
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 787664a0e..604ff27e2 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx4ybQ0/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDdkk3X/test-config.toml
---
success: true
exit_code: 0
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 cfb3ce263..02a542fac 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCZauq0/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpurwu2v/test-config.toml
---
success: true
exit_code: 0
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 bfe29b6e5..3395e8530 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZwQp1h/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpq5lFJ9/test-config.toml
---
success: true
exit_code: 0
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 a26b2f72d..d747e9a0a 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplPwzbl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBljPlL/test-config.toml
---
success: true
exit_code: 0
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 89778f162..7573f5999 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3VKRuB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFffoxO/test-config.toml
---
success: true
exit_code: 0
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 834b03315..bb810b75f 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCNG9XX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfiPm70/test-config.toml
---
success: true
exit_code: 0
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 3d20f1d88..c7f0de494 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmhWNlP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjEea6C/test-config.toml
---
success: true
exit_code: 0
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 34d8431d3..ce21ed2ed 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTk73R3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM3sBwf/test-config.toml
---
success: true
exit_code: 0
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 cee5b99ea..1a89b1c99 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppd6OUk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGFMsPs/test-config.toml
---
success: true
exit_code: 0
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 f58810973..7e0ad5248 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprFvZRh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOgD8aZ/test-config.toml
---
success: true
exit_code: 0