Skip to content

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

fix(list): unify task-failure output vocabulary (#3435)

Maximilian Roosb8134563f1d2
diff --git a/src/commands/list/collect/mod.rs b/src/commands/list/collect/mod.rs
index 698c47811..e7d7cae50 100644
--- a/src/commands/list/collect/mod.rs
+++ b/src/commands/list/collect/mod.rs
@@ -413,8 +413,12 @@ fn print_buffered_table(header: &str, rows: &[String], summary: &str) {
for row in rows {
println!("{row}");
}
- println!();
- println!("{summary}");
+ // The summary narrates the table rather than being part of the answer
+ // (`--format=json` omits it), so it goes to stderr and piped stdout ends
+ // cleanly after the last row. The progressive path keeps it on stdout:
+ // there it's a repainted row of the table region.
+ eprintln!();
+ eprintln!("{summary}");
}
/// Options for controlling what data to collect.
@@ -656,12 +660,12 @@ fn format_stall_footer(
first_name: &str,
) -> String {
let dim = Style::new().dimmed();
- let kind_str: &'static str = first_kind.into();
+ let kind_name = first_kind.display_name();
let waiting_clause = if pending_count == 1 {
- cformat!("waiting on <underline>{kind_str}</> for <underline>{first_name}</>")
+ cformat!("waiting on <underline>{kind_name}</> for <underline>{first_name}</>")
} else {
cformat!(
- "waiting on {pending_count} tasks, including <underline>{kind_str}</> for <underline>{first_name}</>"
+ "waiting on {pending_count} tasks, including <underline>{kind_name}</> for <underline>{first_name}</>"
)
};
cformat!(
@@ -718,8 +722,11 @@ fn format_drain_timeout_diag(
.iter()
.take(MAX_SHOWN)
.map(|result| {
- let missing_names: Vec<&str> =
- result.missing_kinds.iter().map(|k| k.into()).collect();
+ let missing_names: Vec<&str> = result
+ .missing_kinds
+ .iter()
+ .map(|k| k.display_name())
+ .collect();
cformat!("<bold>{}</>: {}", result.name, missing_names.join(", "))
})
.collect();
@@ -1983,14 +1990,15 @@ pub fn collect(
.iter()
.map(|error| {
let name = all_items[error.item_idx].branch_name();
- let kind_str: &'static str = error.kind.into();
// Take first line only - git errors can be multi-line with usage hints
let msg = error.message.lines().next().unwrap_or(&error.message);
- cformat!("<bold>{}</>: {} ({})", name, kind_str, msg)
+ cformat!("<bold>{}</>: {} ({})", name, error.kind.display_name(), msg)
})
.collect();
+ let count = sorted_errors.len();
+ let plural = if count == 1 { "" } else { "s" };
warning_parts.push(format!(
- "Some git operations failed:\n{}",
+ "{count} task{plural} failed:\n{}",
format_with_gutter(&error_lines.join("\n"), None)
));
}
@@ -2343,7 +2351,7 @@ mod tests {
format_stall_footer("Showing 3 worktrees", 5, 12, 1, TaskKind::CiStatus, "feat");
insta::assert_snapshot!(
rendered.ansi_strip(),
- @"○ Showing 3 worktrees (5/12 loaded, no recent progress; waiting on ci-status for feat)"
+ @"○ Showing 3 worktrees (5/12 loaded, no recent progress; waiting on CI status for feat)"
);
}
@@ -2353,7 +2361,7 @@ mod tests {
format_stall_footer("Showing 3 worktrees", 5, 12, 3, TaskKind::CiStatus, "feat");
insta::assert_snapshot!(
rendered.ansi_strip(),
- @"○ Showing 3 worktrees (5/12 loaded, no recent progress; waiting on 3 tasks, including ci-status for feat)"
+ @"○ Showing 3 worktrees (5/12 loaded, no recent progress; waiting on 3 tasks, including CI status for feat)"
);
}
@@ -2448,10 +2456,10 @@ mod tests {
let rendered = format_drain_timeout_diag(3, &items);
insta::assert_snapshot!(
rendered.ansi_strip(),
- @r"
+ @"
Listing worktrees timed out after 120s (3 results received); blocked tasks:
- feature-a: ci-status, branch-diff
- feature-b: ahead-behind
+ feature-a: CI status, branch diff
+ feature-b: ahead/behind counts
"
);
}
@@ -2470,13 +2478,13 @@ mod tests {
let rendered = format_drain_timeout_diag(2, &items);
insta::assert_snapshot!(
rendered.ansi_strip(),
- @r"
+ @"
Listing worktrees timed out after 120s (2 results received); blocked tasks:
- feature-0: ahead-behind
- feature-1: ahead-behind
- feature-2: ahead-behind
- feature-3: ahead-behind
- feature-4: ahead-behind
+ feature-0: ahead/behind counts
+ feature-1: ahead/behind counts
+ feature-2: ahead/behind counts
+ feature-3: ahead/behind counts
+ feature-4: ahead/behind counts
… and 3 more
"
);
diff --git a/src/commands/list/collect/types.rs b/src/commands/list/collect/types.rs
index 8b6f3bd77..ecf4fc053 100644
--- a/src/commands/list/collect/types.rs
+++ b/src/commands/list/collect/types.rs
@@ -153,6 +153,30 @@ impl TaskKind {
TaskKind::CiStatus | TaskKind::UrlStatus | TaskKind::SummaryGenerate
)
}
+
+ /// Human-readable task name for user-facing messages (failure warnings,
+ /// stall footers, timeout diagnostics). The strum kebab-case form
+ /// (`IntoStaticStr`) is developer vocabulary for tracing and `-vv`
+ /// diagnostics; this form names what the task computes for the table.
+ pub fn display_name(self) -> &'static str {
+ match self {
+ TaskKind::AheadBehind => "ahead/behind counts",
+ TaskKind::CommittedTreesMatch => "trees-match check",
+ TaskKind::HasFileChanges => "file-changes check",
+ TaskKind::WouldMergeAdd => "merge-simulation check",
+ TaskKind::IsAncestor => "ancestor check",
+ TaskKind::BranchDiff => "branch diff",
+ TaskKind::WorkingTreeDiff => "working-tree diff",
+ TaskKind::MergeTreeConflicts => "merge-conflict check",
+ TaskKind::WorkingTreeConflicts => "working-tree conflict check",
+ TaskKind::GitOperation => "operation-state check",
+ TaskKind::UserMarker => "user-marker lookup",
+ TaskKind::Upstream => "upstream status",
+ TaskKind::CiStatus => "CI status",
+ TaskKind::UrlStatus => "URL check",
+ TaskKind::SummaryGenerate => "summary generation",
+ }
+ }
}
/// Result of draining task results - indicates whether all results were received
@@ -238,4 +262,19 @@ mod tests {
let error = TaskError::new(0, TaskKind::AheadBehind, "timed out", ErrorCause::Timeout);
assert!(error.is_timeout());
}
+
+ /// Duplicate display names would make two different task failures
+ /// indistinguishable in the `wt list` failure warning.
+ #[test]
+ fn test_task_kind_display_names_unique_and_nonempty() {
+ use strum::IntoEnumIterator;
+ let names: Vec<&str> = TaskKind::iter().map(TaskKind::display_name).collect();
+ assert!(names.iter().all(|name| !name.is_empty()));
+ let unique: std::collections::HashSet<_> = names.iter().collect();
+ assert_eq!(
+ unique.len(),
+ names.len(),
+ "duplicate display names: {names:?}"
+ );
+ }
}
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 593edac85..8ffc85e57 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -331,17 +331,18 @@ impl SummaryMetrics {
) -> Vec<String> {
let mut parts = Vec::new();
+ let plural = if self.worktrees == 1 { "" } else { "s" };
+ parts.push(format!("{} worktree{}", self.worktrees, plural));
+
if include_branches {
- parts.push(format!("{} worktrees", self.worktrees));
if self.local_branches > 0 {
- parts.push(format!("{} branches", self.local_branches));
+ let plural = if self.local_branches == 1 { "" } else { "es" };
+ parts.push(format!("{} branch{}", self.local_branches, plural));
}
if self.remote_branches > 0 {
- parts.push(format!("{} remote branches", self.remote_branches));
+ let plural = if self.remote_branches == 1 { "" } else { "es" };
+ parts.push(format!("{} remote branch{}", self.remote_branches, plural));
}
- } else {
- let plural = if self.worktrees == 1 { "" } else { "s" };
- parts.push(format!("{} worktree{}", self.worktrees, plural));
}
if self.dirty_worktrees > 0 {
@@ -380,20 +381,24 @@ pub(crate) fn format_summary_message(
.join(", ");
if error_count > 0 {
- let failure_msg = if error_count == timed_out_count {
- // All failures are timeouts
- let plural = if timed_out_count == 1 { "" } else { "s" };
- format!("{timed_out_count} task{plural} timed out")
- } else if timed_out_count > 0 {
- // Mix of timeouts and other errors
- let plural = if error_count == 1 { "" } else { "s" };
- format!("{error_count} task{plural} failed ({timed_out_count} timed out)")
- } else {
- // No timeouts, just other errors
- let plural = if error_count == 1 { "" } else { "s" };
- format!("{error_count} task{plural} failed")
+ // "failed" and "timed out" are disjoint here, matching the warning
+ // that details the non-timeout failures after the table.
+ let failed_count = error_count - timed_out_count;
+ let failure_msg = match (failed_count, timed_out_count) {
+ (0, t) => {
+ let plural = if t == 1 { "" } else { "s" };
+ format!("{t} task{plural} timed out")
+ }
+ (f, 0) => {
+ let plural = if f == 1 { "" } else { "s" };
+ format!("{f} task{plural} failed")
+ }
+ (f, t) => {
+ let plural = if f == 1 { "" } else { "s" };
+ format!("{f} task{plural} failed, {t} timed out")
+ }
};
- format!("{INFO_SYMBOL} {dim}Showing {summary}. {failure_msg}{dim:#}")
+ format!("{INFO_SYMBOL} {dim}Showing {summary}; {failure_msg}{dim:#}")
} else {
format!("{INFO_SYMBOL} {dim}Showing {summary}{dim:#}")
}
@@ -540,14 +545,14 @@ mod tests {
// No errors
assert_snapshot!(format_summary_message(&[], false, 0, 0, 0), @"○ Showing 0 worktrees");
// All timeouts
- assert_snapshot!(format_summary_message(&[], false, 0, 3, 3), @"○ Showing 0 worktrees. 3 tasks timed out");
+ assert_snapshot!(format_summary_message(&[], false, 0, 3, 3), @"○ Showing 0 worktrees; 3 tasks timed out");
// Mixed errors and timeouts
- assert_snapshot!(format_summary_message(&[], false, 0, 5, 3), @"○ Showing 0 worktrees. 5 tasks failed (3 timed out)");
+ assert_snapshot!(format_summary_message(&[], false, 0, 5, 3), @"○ Showing 0 worktrees; 2 tasks failed, 3 timed out");
// Only failures, no timeouts
- assert_snapshot!(format_summary_message(&[], false, 0, 2, 0), @"○ Showing 0 worktrees. 2 tasks failed");
+ assert_snapshot!(format_summary_message(&[], false, 0, 2, 0), @"○ Showing 0 worktrees; 2 tasks failed");
// Single error
- assert_snapshot!(format_summary_message(&[], false, 0, 1, 0), @"○ Showing 0 worktrees. 1 task failed");
+ assert_snapshot!(format_summary_message(&[], false, 0, 1, 0), @"○ Showing 0 worktrees; 1 task failed");
// Single timeout
- assert_snapshot!(format_summary_message(&[], false, 0, 1, 1), @"○ Showing 0 worktrees. 1 task timed out");
+ assert_snapshot!(format_summary_message(&[], false, 0, 1, 1), @"○ Showing 0 worktrees; 1 task timed out");
}
}
diff --git a/src/commands/list/progressive_table.rs b/src/commands/list/progressive_table.rs
index 0dc618586..f3001ddd1 100644
--- a/src/commands/list/progressive_table.rs
+++ b/src/commands/list/progressive_table.rs
@@ -281,6 +281,13 @@ impl ProgressiveTable {
/// When overflowing (skeleton showed a subset of rows), erases the skeleton
/// and prints the complete table — the output scrolls naturally, avoiding
/// the `MoveUp`-into-scrollback problem.
+ ///
+ /// The footer (summary) is written to stdout here even though the buffered
+ /// path (`print_buffered_table`) narrates it on stderr: progressive mode
+ /// repaints the footer as a row of the table region, and only runs when
+ /// stdout is a TTY (`RenderTarget::detect`), so this stdout never feeds a
+ /// pipe. A future non-TTY progressive mode must move the summary to stderr
+ /// with the buffered path.
pub fn finalize(
&mut self,
final_rows: Vec<String>,
diff --git a/src/git/repository/working_tree.rs b/src/git/repository/working_tree.rs
index 8ecbb901b..14858ca87 100644
--- a/src/git/repository/working_tree.rs
+++ b/src/git/repository/working_tree.rs
@@ -937,7 +937,7 @@ mod tests {
// A worktree whose `<gitdir>/index` file is absent must not error
// when callers ask for a temp index — git itself treats a missing
// index as empty, and the WorkingTreeConflictsTask used to surface
- // this as a misleading `working-tree-conflicts (Failed to copy
+ // this as a misleading `working-tree conflict check (Failed to copy
// index file)` footer.
let test = TestRepo::with_initial_commit();
std::fs::write(test.root_path().join("tracked.txt"), "hello\n").unwrap();
diff --git a/tests/integration_tests/bare_repository.rs b/tests/integration_tests/bare_repository.rs
index cb848ee56..8f8b40754 100644
--- a/tests/integration_tests/bare_repository.rs
+++ b/tests/integration_tests/bare_repository.rs
@@ -1414,8 +1414,8 @@ fn test_clone_bare_repo_list_no_status_errors() {
"Should not get 'must be run in a work tree' error.\nstderr: {stderr}"
);
assert!(
- !stderr.contains("git operations failed"),
- "Should not have git operation failures.\nstderr: {stderr}"
+ !stderr.contains("task failed") && !stderr.contains("tasks failed"),
+ "Should not have task failures.\nstderr: {stderr}"
);
}
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index a28621cdc..274eb11df 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -3620,8 +3620,8 @@ fn test_list_unborn_worktree_no_task_failures(repo: TestRepo) {
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(
- !stderr.contains("working-tree-diff") && !stderr.contains("working-tree-conflicts"),
- "wt list should not surface working-tree-* task failures for unborn worktrees, got stderr:\n{stderr}"
+ !stderr.contains("working-tree diff") && !stderr.contains("working-tree conflict check"),
+ "wt list should not surface working-tree task failures for unborn worktrees, got stderr:\n{stderr}"
);
assert!(
!stderr.contains("ambiguous argument 'HEAD'")
@@ -3861,8 +3861,8 @@ fn test_list_tolerates_missing_index(mut repo: TestRepo) {
"missing index must not surface as a copy error.\nstdout:\n{stdout}\nstderr:\n{stderr}"
);
assert!(
- !combined.contains("working-tree-conflicts ("),
- "missing index must not produce a working-tree-conflicts task error.\nstdout:\n{stdout}\nstderr:\n{stderr}"
+ !combined.contains("working-tree conflict check ("),
+ "missing index must not produce a working-tree conflict task error.\nstdout:\n{stdout}\nstderr:\n{stderr}"
);
assert!(
!feature_index.exists(),
diff --git a/tests/integration_tests/readme_sync.rs b/tests/integration_tests/readme_sync.rs
index 6eba78762..5d8d8de29 100644
--- a/tests/integration_tests/readme_sync.rs
+++ b/tests/integration_tests/readme_sync.rs
@@ -192,7 +192,7 @@ impl MarkerType {
///
/// Handles:
/// - YAML front matter removal
-/// - insta_cmd stdout/stderr section extraction (prefers stderr where user messages go)
+/// - insta_cmd stdout/stderr section extraction (both streams, in terminal order)
/// - Malformed snapshots (returns raw content rather than erroring)
fn parse_snapshot_raw(content: &str) -> String {
// Remove YAML front matter
@@ -207,14 +207,18 @@ fn parse_snapshot_raw(content: &str) -> String {
content.to_string()
};
- // Handle insta_cmd format with stdout/stderr sections
+ // Handle insta_cmd format with stdout/stderr sections. Show both streams
+ // in terminal order (stdout, then stderr) — a command like `wt list` puts
+ // the table on stdout and the summary/warnings on stderr, and the docs
+ // block should read like the terminal.
if content.contains("----- stdout -----") {
- let stderr = extract_section(&content, "----- stderr -----\n", "----- ");
- if !stderr.is_empty() {
- return stderr;
- }
let stdout = extract_section(&content, "----- stdout -----\n", "----- stderr -----");
- return stdout; // May be empty if both sections are empty
+ let stderr = extract_section(&content, "----- stderr -----\n", "----- ");
+ return match (stdout.is_empty(), stderr.is_empty()) {
+ (false, false) => format!("{stdout}\n{stderr}"),
+ (true, _) => stderr, // both-empty also lands here, returning ""
+ (false, true) => stdout,
+ };
}
// Plain content (PTY-based tests without section markers)
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap
index 474b05917..1a2e39c03 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap
@@ -38,6 +38,6 @@ exit_code: 0
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
^ main ^ . b834638e 1d Initial commit
-○ Showing 1 worktree
-
----- stderr -----
+
+○ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap
index 42c316373..9d1176e34 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap
@@ -40,6 +40,6 @@ exit_code: 0
+ feature1 _ ../feature1 b37a293c 1d Main commit
+ feature2 _ ../feature2 b37a293c 1d Main commit
-○ Showing 3 worktrees
-
----- stderr -----
+
+○ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap
index 6ae654d0a..77515b40e 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap
@@ -38,6 +38,6 @@ exit_code: 0
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
@ main ^ . b834638e 1d Initial commit
-○ Showing 1 worktree
-
----- stderr -----
+
+○ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index fac1dc47d..ee7a8b648 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -39,6 +39,6 @@ exit_code: 0
@ main ^ . 6c3da842 1d Initial commit on main
+ feature ↑ ↑1 +1 -1 ../feature 72413a3b 1d Work on feature
-○ Showing 2 worktrees, 1 ahead
-
----- stderr -----
+
+○ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap b/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap
index 161f8c8a4..e4d840356 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap
@@ -39,6 +39,6 @@ exit_code: 0
@ main ^ . a6c13b13 1d Initial
+ feature _ ../feature a6c13b13 1d Initial
-○ Showing 2 worktrees
-
----- stderr -----
+
+○ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap
index a2930d332..e4fd11682 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap
index db32cf27c..425b3035c 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | # ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | # ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap
index 7e07dc76b..7b3e43044 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | # ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | # ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap
index ebc2fe72e..40549546d 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ⚠ ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ⚠ ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap
index dd5f04d0e..a1c4b8291 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | # ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | # ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap
index c4c60fac9..f427909a7 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #7 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #7 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap
index ebc2fe72e..40549546d 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ⚠ ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ⚠ ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap
index 9f7f13606..baf0b0c2a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #7 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #7 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap
index b859048d7..cfa6411ef 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | # ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | # ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap b/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
index 73c673020..cf170bb54 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap
index 9d89e5f52..55107bc90 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | # ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap
index 9227e74a4..9ce193ab6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | ⚠ ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap
index 6af9ecaeb..2c969f157 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | #7 ../repo.feature 9a059eb4 1d feat: gitea fork feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap
index 0eefcb2ce..9fa4d322f 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap
index ffb872a4a..277e5bc58 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap
index 0f73a0085..cfe513b19 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap
index 3a2812164..43a3a2dd6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap
index c39967075..7d640c741 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap
index a7d728d77..19ddd2e92 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap
@@ -8,6 +8,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
| fork/feature-remote /↑ ↑1 +1 # 86db681a 1d feat: fork feature
-○ Showing 4 worktrees, 1 remote branches, 4 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 remote branch, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap
index 882aeb3dc..a51a777b7 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | ⚠ ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑| ↑1 +1 | ⚠ ../repo.feature 9c1e078b 1d feat: gitea feature
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap
index 73c673020..cf170bb54 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap
index 27dac62e9..6451db956 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
index 8680bd8e9..a069442cb 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap
index abf2f3ab5..e9f83db25 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
index b98b79cd2..ca9d666d3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
index 73c673020..cf170bb54 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap
index 34f19d9a3..b769cd261 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
index ad21fd723..7ccb84822 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
index a2930d332..e4fd11682 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
index a2930d332..e4fd11682 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap
index ebc2fe72e..40549546d 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ⚠ ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ⚠ ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap
index a2930d332..e4fd11682 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
index 92eb5c066..8e22569e1 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
index 01961b6f8..170c0c9ed 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
index d07d25943..dedf1a251 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
index 92eb5c066..8e22569e1 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
index 9289ba9ca..1065b4f30 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
index 9289ba9ca..1065b4f30 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap
index 9054377d8..821f203e3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ⚠ ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ⚠ ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap
index a2930d332..e4fd11682 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
index 3518b95c0..f223c402b 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap
index 7e07dc76b..7b3e43044 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | # ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | # ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap
index 92eb5c066..8e22569e1 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | !1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
index 9b5276f2c..382bb66e2 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | !1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑⇡ ↑1 +1 ⇡1 !1 ../repo.feature da7d235a 1d Local commit
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap
index 360efd092..1c98d5177 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,8 +52,8 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
▲ Project config: [ci] is deprecated in favor of [forge]
↳ To see details, run wt config show; to apply updates, run wt config update
+
+○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap
index 8bd98f65f..cc1dbfe54 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
index 464c7e3d5..cff65700a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap
index feed5960f..7a119bd2d 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,9 +53,9 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
▲ Project config: [ci] is deprecated in favor of [forge]
↳ To see details, run wt config show; to apply updates, run wt config update
[W] Invalid CI platform in config: 'invalid_platform'. Expected 'github', 'gitlab', 'gitea', or 'azure-devops'.
+
+○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap b/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
index ad21fd723..7ccb84822 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap b/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
index 581aa94b8..147d70a0a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap b/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
index f4c285f6f..742a47df4 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ↑⇡ ↑1 +1 ⇡1 #1 ../repo.feature da7d235a 1d Local commit
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap b/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
index b98b79cd2..ca9d666d3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
index ad21fd723..7ccb84822 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑| ↑1 +1 | #1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑| ↑1 +1 | #1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap b/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap
index 416f6e8a4..39f656f09 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap
index c2356109f..09ef9dc8c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap
@@ -50,8 +50,8 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ User config: [projects."github.com/example/repo".commit-generation] is deprecated in favor of [projects."github.com/example/repo".commit.generation]
↳ To see details, run wt config show; to apply updates, run wt config update
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap
index f5ccf07d6..86a5b8fe7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap
@@ -50,8 +50,8 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ User config: [commit-generation] is deprecated in favor of [commit.generation]
↳ To see details, run wt config show; to apply updates, run wt config update
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
index d38ee5703..98c12cdee 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
@@ -50,10 +50,10 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ User config: template variable repo_root is deprecated in favor of repo_path
▲ User config: template variable worktree is deprecated in favor of worktree_path
▲ User config: template variable main_worktree is deprecated in favor of repo
↳ To see details, run wt config show; to apply updates, run wt config update
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
index 1646d1efc..8400c515f 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
@@ -51,8 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ User config: template variable repo_root is deprecated in favor of repo_path
▲ User config: template variable worktree is deprecated in favor of worktree_path
@@ -70,3 +68,5 @@ exit_code: 0
  ../{{ main_worktree }}.{{ branch }}
○ worktree-path result
  ../repo.feature-c
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap b/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap
index 1fcdf7a54..a8b069383 100644
--- a/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap
@@ -52,7 +52,7 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ Config file not found: /nonexistent/worktrunk/config.toml
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap b/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
index abb6716b5..5820ff4c3 100644
--- a/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ✗ ↑1 ↓1 +1 -1 ../repo.feature dee7183a 1d Feature changes shared.txt
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap b/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
index 86246b731..5680f66f1 100644
--- a/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ✗ ↑1 ↓1 +1 -1 ../repo.feature dee7183a 1d Feature changes shared.txt
-○ Showing 5 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
index 8c4923597..f854ec8e0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ branch-only /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
index 1666d53f3..41d717f42 100644
--- a/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
@@ -51,8 +51,8 @@ exit_code: 0
+ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees
-
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
↳ To reset, run wt config state default-branch clear
+
+○ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
index 32684e1c7..1072242e3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
index 0311167dc..0af40afa6 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap b/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap
index b6ed30c33..4f20c330c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap
@@ -45,6 +45,6 @@ exit_code: 0
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
@ main · ·^ · . · ·
-○ Showing 1 worktree
-
----- stderr -----
+
+○ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
index c650e8be2..07afe1a58 100644
--- a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -50,8 +51,8 @@ exit_code: 0
+ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees
-
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
↳ To reset, run wt config state default-branch clear
+
+○ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap b/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
index 858b6b196..0607c79ec 100644
--- a/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ assets /∅ 50209039 1d Add asset
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
index 7f6cb8c87..2f54cfc6f 100644
--- a/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ diverged ! ↑ 💬 +40 -60 ↑1 +60 ../repo.diverged 96d1fd92 1d Diverged commit
+ feature-changes !? ↑ 🤖 +50 -100 ↑1 +100 ../repo.feature-changes f5306ded 1d Add 100 lines
-○ Showing 7 worktrees, 3 with changes, 5 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 3 with changes, 5 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
index 1fe2b9453..dca43e188 100644
--- a/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ locked-no-reason ⊞_ ../repo.locked-no-reason 05a4a45d 16h Initial commit
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
index 19fc1967e..757de9023 100644
--- a/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ locked-feature ⊞_ ../repo.locked-feature 05a4a45d 16h Initial commit
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
index 69a9b39d7..254fbe433 100644
--- a/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap b/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
index c2145cd1b..743689e5e 100644
--- a/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
@@ -54,6 +54,6 @@ exit_code: 0
+ very-long-branch-name-here _ ../repo.very-long-branch-name-here 05a4a45d 16h Initial commit
+ with-changes _ ../repo.with-changes 05a4a45d 16h Initial commit
-○ Showing 8 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 8 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
index ecf2291e7..58ab53d32 100644
--- a/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature +!? ↑ +2 -3 ↑1 +4 ../repo.feature da422a12 1d Add files
-○ Showing 5 worktrees, 1 with changes, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
index 37ceb9be6..80295712a 100644
--- a/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap b/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
index 34cf2bf80..623b1f2a5 100644
--- a/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
index db20418c9..a64b7734c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 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 521ded888..b25d745b2 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -54,6 +54,6 @@ exit_code: 0
+ feature-middle ↑ ↑1 +1 ../repo.feature-middle a63f3739 22h Commit at 02:00
+ feature-oldest ↑ ↑1 +1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
-○ Showing 8 worktrees, 7 ahead
-
----- stderr -----
+
+○ Showing 8 worktrees, 7 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
index d7253f9d0..374f5fc29 100644
--- a/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 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 e1e65d027..887cd8be4 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
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
index cbc787993..facc9b7e7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
index 38c69df67..aa0b2b03c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
@@ -54,6 +54,6 @@ exit_code: 0
/ orphan-1 /_ 05a4a45d 16h Initial commit
/ orphan-2 /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 2 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap b/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
index 1b9603b82..4f8fe2189 100644
--- a/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
@@ -51,19 +51,19 @@ exit_code: 0
+ feature-b ↑· ↑1 +1 · ../repo.feature-b f62940fc · ·
+ feature-c ↑· ↑1 +1 · ../repo.feature-c 345c7c93 · ·
-○ Showing 5 worktrees, 3 ahead. 10 tasks failed
-
----- stderr -----
▲ Failed to batch-fetch commit details: fatal: bad object 0000000000000000000000000000000000000001
-▲ Some git operations failed:
-  main: upstream (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
-  feature: ahead-behind (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
-  feature: branch-diff (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
-  feature: working-tree-diff (fatal: bad object HEAD)
-  feature: merge-tree-conflicts (fatal: bad object HEAD)
-  feature: working-tree-conflicts (fatal: bad object HEAD)
-  feature: upstream (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
-  feature-a: upstream (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
-  feature-b: upstream (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
-  feature-c: upstream (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
+
+○ Showing 5 worktrees, 3 ahead; 10 tasks failed
+▲ 10 tasks failed:
+  main: upstream status (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
+  feature: ahead/behind counts (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
+  feature: branch diff (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
+  feature: working-tree diff (fatal: bad object HEAD)
+  feature: merge-conflict check (fatal: bad object HEAD)
+  feature: working-tree conflict check (fatal: bad object HEAD)
+  feature: upstream status (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
+  feature-a: upstream status (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
+  feature-b: upstream status (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
+  feature-c: upstream status (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
↳ To create a diagnostic file, run with -vv
diff --git a/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
index 37ceb9be6..80295712a 100644
--- a/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
index 88680a609..72ed19500 100644
--- a/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap b/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
index 5c0c0c9be..9da5b1e35 100644
--- a/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ pr-link ↑ 🤖 ↑1 +1 ../repo.pr-link 152b5dea 1d PR commit
+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 +200 ../repo.wli-sequence 4353e28e 1d Initial content
-○ Showing 7 worktrees, 1 with changes, 6 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 6 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
index 73ebcb4b3..d481b26e0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
index d28aab23b..c962ec464 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
@@ -8,6 +8,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature-b ↑ ↑2 +2 -1 ../repo.feature-b 391b2a76 1d Test commit
-○ Showing 4 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
index a16c3a2b3..bbd33cf14 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
@@ -61,6 +61,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 14 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 14 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
index cbc787993..facc9b7e7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
index cbc787993..facc9b7e7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
index a63883e7c..b6e6ebc31 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ locked ⊞_ ../repo.locked 05a4a45d 16h Initial commit
+ normal _ ../repo.normal 05a4a45d 16h Initial commit
-○ Showing 6 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 6 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
index ab34edb88..dc0eab27d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
@@ -8,6 +8,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -53,6 +54,6 @@ exit_code: 0
+ ahead ↑⇡ ↑1 +1 ⇡1 ../repo.ahead 76a1bef4 1d Ahead commit
+ in-sync _| | ../repo.in-sync 01cab36c 1d Initial commit on main
-○ Showing 6 worktrees, 4 ahead
-
----- stderr -----
+
+○ Showing 6 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
index 600c3667c..1b3c12042 100644
--- a/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature-test ⊂ ↓1 ../repo.feature-test 4b80044d 1d Add support for 日本語 and émoji 🎉
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap b/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
index 3ee64de74..7bebf72e5 100644
--- a/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ multi _ 👨‍💻 ../repo.multi 05a4a45d 16h Initial commit
-○ Showing 6 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 6 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
index 1b48684b4..78e626156 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
@@ -51,15 +51,15 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc · ·
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 · ·
-○ Showing 5 worktrees, 3 ahead. 6 tasks failed
-
----- stderr -----
▲ Failed to batch-fetch commit details: fatal: bad object 0000000000000000000000000000000000000001
-▲ Some git operations failed:
-  (detached): ahead-behind (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
-  (detached): committed-trees-match (fatal: Needed a single revision)
-  (detached): branch-diff (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
-  (detached): working-tree-diff (fatal: bad object HEAD)
-  (detached): merge-tree-conflicts (fatal: bad object HEAD)
-  (detached): working-tree-conflicts (fatal: bad object HEAD)
+
+○ Showing 5 worktrees, 3 ahead; 6 tasks failed
+▲ 6 tasks failed:
+  (detached): ahead/behind counts (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
+  (detached): trees-match check (fatal: Needed a single revision)
+  (detached): branch diff (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
+  (detached): working-tree diff (fatal: bad object HEAD)
+  (detached): merge-conflict check (fatal: bad object HEAD)
+  (detached): working-tree conflict check (fatal: bad object HEAD)
↳ To create a diagnostic file, run with -vv
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
index e1e65d027..887cd8be4 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
index 1cc70b555..7859f6360 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
@@ -55,6 +55,6 @@ exit_code: 0
/ feature-without-worktree /_ 05a4a45d 16h Initial commit
/ fix-bug /_ 05a4a45d 16h Initial commit
-○ Showing 5 worktrees, 3 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
index 18d054c17..01b9e90d9 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
index 2ac24ff3d..ad3fbe90c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
@@ -54,6 +54,6 @@ exit_code: 0
/ branch-beta /_ 05a4a45d 16h Initial commit
/ branch-gamma /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 3 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 branches, 3 ahead
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 e1541886b..08ea2fc6d 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
@@ -39,6 +39,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
index 30bde4ac7..9f3bbf6dc 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
@@ -50,8 +50,8 @@ exit_code: 0
+ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees
-
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
↳ To reset, run wt config state default-branch clear
+
+○ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
index 969c5eebd..2204092ad 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
@@ -56,6 +56,6 @@ exit_code: 0
| origin/remote-only-1 /_ 05a4a45d 16h Initial commit
| origin/remote-only-2 /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 2 branches, 2 remote branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 branches, 2 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap
index c568f4d75..614bbbba3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap
@@ -8,6 +8,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
| origin/feature-remote /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 remote branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 remote branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
index 731e2ed26..d383ad11d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
| origin/remote-only /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 remote branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 remote branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
index 14ce3741b..f694bf413 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-with-worktree _| | ../repo.feature-with-worktree 05a4a45d 16h Initial commit
| origin/remote-only /_ 05a4a45d 16h Initial commit
-○ Showing 5 worktrees, 1 remote branches, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 remote branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
index c4705dd99..76201f051 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
@@ -53,6 +53,6 @@ exit_code: 0
| origin/remote-feature-1 /_ 05a4a45d 16h Initial commit
| origin/remote-feature-2 /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 2 remote branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
index ebdb20bb7..09164a728 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ review-ui ? ↑ 💬 ↑1 +1 ../repo.review-ui a585d6ed 1d Add dashboard component
+ wip-docs ? – ../repo.wip-docs 33323bc1 1d Initial commit
-○ Showing 4 worktrees, 2 with changes, 2 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 with changes, 2 ahead
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 6298d70b3..6966d7896 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature +!?⊞✗⇅🤖 +3 -2 ↑2 ↓1 +3 -1 ⇡1 ⇣1 ../repo.feature 342be366 1d Local commit
-○ Showing 5 worktrees, 1 with changes, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 4 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 71f67ffbd..cf89e7503 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
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature +!?✘✗ 🤖 +8 ↑1 ↓1 +3 -2 ../repo.feature 27eb0ee8 1d Main conflicting changes
-○ Showing 5 worktrees, 1 with changes, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__quickstart_list.snap b/tests/snapshots/integration__integration_tests__list__quickstart_list.snap
index 633577cf9..17b76eb2e 100644
--- a/tests/snapshots/integration__integration_tests__list__quickstart_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__quickstart_list.snap
@@ -48,6 +48,6 @@ exit_code: 0
@ feature-auth + ↑ +27 -8 ↑1 +31 4bc72dc9 2h Add authenticat…
^ main ^⇡ ⇡1 0e631add 1d Initial commit
-○ Showing 2 worktrees, 1 with changes, 1 ahead, 1 column hidden
-
----- stderr -----
+
+○ Showing 2 worktrees, 1 with changes, 1 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
index f6d1240cd..0662030ae 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ fix-auth ↕| ↑2 ↓1 +25 -11 | b772e68b 5h Add secure token…
+ fix-typos _| | 41ee0834 4d Merge fix-auth:…
-○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index 3a367c984..890ec487e 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -8,6 +8,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "134"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -53,6 +54,6 @@ exit_code: 0
/ exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
/ wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
-○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
index 5cfd639d0..9e4315829 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "134"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -50,6 +51,6 @@ exit_code: 0
+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
+ fix-typos _| | #410 41ee0834
-○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap
index a33d45bc3..2dc1c9b21 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ review-ui ? ↑ 💬 ↑1 +1 a585d6ed 1d Add dashboard co…
+ wip-docs ? – 33323bc1 1d Initial commit
-○ Showing 4 worktrees, 2 with changes, 2 ahead, 1 column hidden
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 with changes, 2 ahead, 1 column hidden
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 15cfd2b7b..083af014f 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
@@ -55,6 +55,6 @@ exit_code: 0
+ feature-middle ↑ ↑1 +1 ../repo.feature-middle a63f3739 22h Commit at 02:00
+ feature-oldest ↑ ↑1 +1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
-○ Showing 8 worktrees, 7 ahead
-
----- stderr -----
+
+○ Showing 8 worktrees, 7 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
index 45ef21148..8ffa60020 100644
--- a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
+++ b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ fix-auth ↕| ↑2 ↓1 +25 -11 | http://localhost:16460 b772e68b
+ fix-typos _| | http://localhost:14301 41ee0834
-○ Showing 4 worktrees, 2 with changes, 2 ahead, 3 columns hidden
-
----- stderr -----
+
+○ Showing 4 worktrees, 2 with changes, 2 ahead, 3 columns hidden
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 b89c2bad0..1d529e74d 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -8,6 +8,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -57,6 +58,6 @@ exit_code: 0
+ in-sync _| | ../repo.in-sync 01cab36c 1d Initial commit on main
+ no-upstream _ ../repo.no-upstream 01cab36c 1d Initial commit on main
-○ Showing 10 worktrees, 5 ahead
-
----- stderr -----
+
+○ Showing 10 worktrees, 5 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
index b3eae3aa8..f151647ce 100644
--- a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
@@ -7,6 +7,7 @@ info:
- "--full"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -51,6 +52,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ! ✗ +1 -1 ↓1 ../repo.feature a756a743 1d Initial commit
-○ Showing 5 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
index 23fc7b7d1..bbbe506fe 100644
--- a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature ! ✗ +1 -1 ↓1 ../repo.feature a756a743 1d Initial commit
-○ Showing 5 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
index 3e69c9125..37bf51122 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ test !? ↑ +1 -1 ↑1 +1 -1 ../repo.test 572ec619 1d Test
-○ Showing 5 worktrees, 1 with changes, 4 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 1 with changes, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index f535831f9..bcac13c56 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ complex + ? ↑ +1 -1 ↑1 +1 -1 ../repo.complex 0fdc439a 1d Complex
+ simple ? ↑ ↑1 +1 -1 ../repo.simple 42a9d012 1d Simple
-○ Showing 6 worktrees, 2 with changes, 5 ahead
-
----- stderr -----
+
+○ Showing 6 worktrees, 2 with changes, 5 ahead
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 4475e05ea..56c7a5757 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
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap
index bdfdccd74..5661b3993 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap
index 5fb8b0504..57412932b 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap
index 6f1c6bd61..f8f24c332 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap
index be03323af..03d5a0d8f 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap
index 55e492848..b9e819951 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap
@@ -53,8 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
▲ Ignoring --config-set overrides: garbage
  TOML parse error at line 1, column 8
@@ -62,3 +60,5 @@ exit_code: 0
  1 | garbage
  | ^
  key with no value, expected `=`
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap
index ebb64349e..0411ea0e1 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap
@@ -51,9 +51,9 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ Ignoring env var overrides: WORKTRUNK__LIST__COLUMNS=branch,age
  invalid type: string "branch,age", expected a sequence
  in `list.columns`
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap
index 49afa4068..5bfa2b09a 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap
@@ -51,9 +51,9 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ Ignoring env var overrides: WORKTRUNK__COMMIT_GENERATION__COMMAND=42
  invalid type: integer `42`, expected a string
  in `commit.generation.command`
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap
index 55637c07e..9a5137bd5 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap
@@ -52,9 +52,9 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
▲ Ignoring env var overrides: WORKTRUNK__LIST__BRANCHES=not-a-bool
  invalid type: string "not-a-bool", expected a boolean
  in `list.branches`
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap
index 00f5b4d2d..5c579d87f 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap
@@ -51,9 +51,9 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ Ignoring env var overrides: WORKTRUNK__LIST__BRANCHES=not-a-bool
  invalid type: string "not-a-bool", expected a boolean
  in `list.branches`
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap
index ed1fa5b5b..d19ecd8ed 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap
index 8a41be75a..0995b01e8 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap
@@ -51,7 +51,7 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ Config validation warning: worktree-path cannot be empty
+
+○ Showing 4 worktrees, 3 ahead
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 343db81b3..70a8e4f39 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -50,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ feature /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
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 033ca3abf..de134a0bf 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -49,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap
index a3a10cdc9..25125084e 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap
@@ -50,8 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ User config @ [TEST_CONFIG] failed to parse, skipping
  TOML parse error at line 2, column 12
@@ -59,3 +57,5 @@ exit_code: 0
  2 | branches = "not-a-bool"
  | ^^^^^^^^^^^^
  invalid type: string "not-a-bool", expected a boolean
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap
index 9100a4b8d..74f22e27d 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap
@@ -50,8 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ User config @ [TEST_CONFIG] failed to parse, skipping
  TOML parse error at line 1, column 33
@@ -59,3 +57,5 @@ exit_code: 0
  1 | skip-shell-integration-prompt = "not-a-bool"
  | ^^^^^^^^^^^^
  invalid type: string "not-a-bool", expected a boolean
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap
index 9dba88561..0dc0db733 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap
@@ -50,8 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
▲ System config @ [TEST_SYSTEM_CONFIG_FILE] failed to parse, skipping
  TOML parse error at line 1, column 33
@@ -59,3 +57,5 @@ exit_code: 0
  1 | skip-shell-integration-prompt = "not-a-bool"
  | ^^^^^^^^^^^^
  invalid type: string "not-a-bool", expected a boolean
+
+○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap
index 0e5d6c31b..61af62a98 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap
@@ -50,8 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
▲ System config @ [TEST_SYSTEM_CONFIG_FILE] failed to parse, skipping
  TOML parse error at line 2, column 12
@@ -59,3 +57,5 @@ exit_code: 0
  2 | branches = "not-a-bool"
  | ^^^^^^^^^^^^
  invalid type: string "not-a-bool", expected a boolean
+
+○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap
index 114b35921..549592cab 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap
@@ -50,7 +50,7 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
▲ Config validation warning: worktree-path cannot be empty
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap b/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap
index 397c5bd61..a9d7758e5 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap b/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap
index d43ea9b9d..740b86a5d 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b spirited-mink f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c secure-sicklebill 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
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 397c5bd61..a9d7758e5 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
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap b/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
index b89c237e6..32a81b1d2 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b http://localhost:14072 f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c http://localhost:14303 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 with changes, 3 ahead
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 1e724659e..8e5130c44 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
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↕ ↑1 ↓1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature _ ../repo.feature 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap b/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap
index 7ed04f76d..c8a3a86ef 100644
--- a/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap
+++ b/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap b/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap
index c67f6f6fc..a8f13227a 100644
--- a/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap
+++ b/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap
@@ -52,6 +52,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
/ fix-backslash-x1b-test /_ 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 branches, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 1 branch, 3 ahead
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 7ed04f76d..c8a3a86ef 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
@@ -50,6 +50,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 4 worktrees, 3 ahead
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 0a53b7835..19ff0d922 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
@@ -53,6 +53,6 @@ exit_code: 0
+ no-changes _ ../repo.no-changes 05a4a45d 16h Initial commit
+ with-changes ! – +1 -1 ../repo.with-changes 05a4a45d 16h Initial commit
-○ Showing 7 worktrees, 1 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead
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 400894fc6..811cf44c2 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
@@ -52,6 +52,6 @@ exit_code: 0
+ huge ? – ../repo.huge 05a4a45d 16h Initial commit
+ tiny ! – +1 -1 ../repo.tiny 05a4a45d 16h Initial commit
-○ Showing 6 worktrees, 2 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 6 worktrees, 2 with changes, 3 ahead
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 9ae5f47f3..682b2d2f8 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
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-medium ? – ../repo.feature-medium 05a4a45d 16h Initial commit
+ feature-small ? – ../repo.feature-small 05a4a45d 16h Initial commit
-○ Showing 7 worktrees, 3 with changes, 3 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 3 with changes, 3 ahead
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 4bcf94b34..ef08303fd 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
@@ -53,6 +53,6 @@ exit_code: 0
+ short _ ../repo.short 05a4a45d 16h Initial commit
+ very-long-feature-branch-name _ ../repo.very-long-feature-branch-name 05a4a45d 16h Initial commit
-○ Showing 7 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 3 ahead
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 2b3c63b1e..b3556c189 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
@@ -53,6 +53,6 @@ exit_code: 0
+ medium _ ../repo.medium 05a4a45d 16h Initial commit
+ x _ ../repo.x 05a4a45d 16h Initial commit
-○ Showing 7 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 3 ahead
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 c4f29820e..9fd6e266b 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
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 7 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 3 ahead
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 fc198bced..37aae944f 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
@@ -53,6 +53,6 @@ exit_code: 0
+ naive _ ../repo.naive 05a4a45d 16h Initial commit
+ resume _ ../repo.resume 05a4a45d 16h Initial commit
-○ Showing 7 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 7 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
index 2929e9e5f..8ebda2594 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion _ 16h
+ short _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 3 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
index aabd236a9..39ca4cac3 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion _ 05a4a45d 16h Initial co…
+ short _ 05a4a45d 16h Initial co…
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 1 column hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
index fc30ecddd..bf44d63fa 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-poo…
+ short
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 9 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 9 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
index db7a13abd..fbb627868 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhausti…
+ short
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 9 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 9 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
index 0ca59c3df..b5ebefb17 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion
+ short
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
index 6471c7032..a5f84f0de 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion _
+ short _
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
index e09c41afe..6d8812984 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion _
+ short _
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
index 85ca539dc..9a697ec43 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
index 6b3848e2b..1d937ecaa 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
index 1317d0572..5c3e3200a 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 3 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
index 24c9b77cf..079690543 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c 16h
+ fix/login-timeout 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
index 33a49c6f1..76cd287a0 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
index adb7c3da8..134be561b 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 345c7c93 16h
+ fix/login-timeout ? – 05a4a45d 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 2 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 2 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
index 38b4f7ee8..921c074f5 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 345c7c93 16h Add feature-c file
+ fix/login-timeout ? – 05a4a45d 16h Initial commit
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 1 column hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
index 1a6e309ca..a479b5fb8 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c 16h
+ fix/login-timeout 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 8 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 8 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
index c3412f35a..82f66ef9c 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 7 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 7 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
index db36b966e..ec4e3ad9d 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 6 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 6 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
index f3817bac1..30cd46496 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 5 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 5 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
index 060f67315..857df504c 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
@@ -53,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 3 columns hidden
-
----- stderr -----
+
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
index 81586f347..f38a73c77 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap b/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap
index fb440ce9d..0a2d4aa1b 100644
--- a/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap
+++ b/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap
@@ -51,6 +51,6 @@ exit_code: 0
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ relative-test _ ../repo.relative-test 05a4a45d 16h Initial commit
-○ Showing 5 worktrees, 3 ahead
-
----- stderr -----
+
+○ Showing 5 worktrees, 3 ahead