Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
perf: parallelize list command and add trace instrumentation (#574)
Maximilian Roos052f96a3ffc2
diff --git a/.claude-plugin/skills/worktrunk/reference/list.md b/.claude-plugin/skills/worktrunk/reference/list.mdindex d6784e161..7edc8f2b7 100644--- a/.claude-plugin/skills/worktrunk/reference/list.md+++ b/.claude-plugin/skills/worktrunk/reference/list.md@@ -183,7 +183,6 @@ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'| `renamed` | boolean | Has renamed files || `deleted` | boolean | Has deleted files || `diff` | object | Lines changed vs HEAD: `{added, deleted}` |-| `diff_vs_main` | object | Lines changed vs the default branch: `{added, deleted}` |### main objectdiff --git a/benches/CLAUDE.md b/benches/CLAUDE.mdindex a413c7653..301d20929 100644--- a/benches/CLAUDE.md+++ b/benches/CLAUDE.md@@ -53,22 +53,75 @@ cargo bench --bench list -- --skip cold # Warm cache only## Performance Investigation with analyze-trace-Use `analyze-trace` to understand where time goes in git operations:+Use `analyze-trace` to generate Chrome Trace Format for visualization:```bash-# Capture trace and analyze-RUST_LOG=debug wt list --branches 2>&1 | grep '\[wt-trace\]' > /tmp/trace.log-cargo run --release --bin analyze-trace -- /tmp/trace.log+# Generate trace.json for Perfetto/Chrome+RUST_LOG=debug wt list --branches 2>&1 | grep '\[wt-trace\]' | \+ cargo run --release -q --bin analyze-trace > trace.json-# Or pipe directly-RUST_LOG=debug wt list --branches 2>&1 | grep '\[wt-trace\]' | cargo run --bin analyze-trace+# Open in https://ui.perfetto.dev or chrome://tracing```-The output shows:-- **Command breakdown**: total time per git command type-- **Duration histogram**: distribution of command times-- **Timeout impact**: how much time could be saved with timeouts-- **Top 10 slowest**: specific commands taking the most time+### Querying with trace_processor++Install [trace_processor](https://perfetto.dev/docs/analysis/trace-processor) for SQL analysis:++```bash+curl -LO https://get.perfetto.dev/trace_processor && chmod +x trace_processor+```++Useful queries:++```bash+# Top 10 slowest commands+echo "SELECT name, ts/1e6 as start_ms, dur/1e6 as dur_ms FROM slice WHERE dur > 0 ORDER BY dur DESC LIMIT 10;" | trace_processor trace.json++# Milestone events (skeleton render, worker spawn, completion)+echo "SELECT name, ts/1e6 as ms FROM slice WHERE dur = 0 ORDER BY ts;" | trace_processor trace.json++# Task type breakdown+cat > /tmp/q.sql << 'EOF'+SELECT+ CASE WHEN name LIKE '%status%' THEN 'status'+ WHEN name LIKE '%rev-parse%tree%' THEN 'trees_match'+ WHEN name LIKE '%merge-tree%' THEN 'merge_tree'+ WHEN name LIKE '%is-ancestor%' THEN 'is_ancestor'+ WHEN name LIKE '%diff --name%' THEN 'file_changes'+ ELSE 'other' END as task_type,+ COUNT(*) as count,+ ROUND(SUM(dur)/1e6, 2) as total_ms+FROM slice WHERE dur > 0+GROUP BY task_type ORDER BY total_ms DESC;+EOF+trace_processor trace.json -q /tmp/q.sql++# Check parallel execution overlap between task types+cat > /tmp/q.sql << 'EOF'+WITH status_times AS (+ SELECT MIN(ts) as start_us, MAX(ts + dur) as end_us+ FROM slice WHERE name LIKE '%status%'+),+trees_times AS (+ SELECT MIN(ts) as start_us, MAX(ts + dur) as end_us+ FROM slice WHERE name LIKE '%rev-parse%tree%'+)+SELECT+ s.start_us/1e6 as status_start_ms, s.end_us/1e6 as status_end_ms,+ t.start_us/1e6 as trees_start_ms, t.end_us/1e6 as trees_end_ms,+ CASE WHEN s.end_us > t.start_us AND t.end_us > s.start_us THEN 'OVERLAP' ELSE 'SEQUENTIAL' END as parallel+FROM status_times s, trees_times t;+EOF+trace_processor trace.json -q /tmp/q.sql+```++### Generating traces from benchmark repos++```bash+# Trace on rust-lang/rust (must run benchmark first to clone)+RUST_LOG=debug cargo run --release -q -- -C target/bench-repos/rust list --branches 2>&1 | \+ grep '\[wt-trace\]' | cargo run --release -q --bin analyze-trace > rust-trace.json+```## Key Performance Insightsdiff --git a/docs/content/list.md b/docs/content/list.mdindex 327bfb5a9..8f99c6807 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -216,7 +216,6 @@ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'| `renamed` | boolean | Has renamed files || `deleted` | boolean | Has deleted files || `diff` | object | Lines changed vs HEAD: `{added, deleted}` |-| `diff_vs_main` | object | Lines changed vs the default branch: `{added, deleted}` |### main objectdiff --git a/src/cli/mod.rs b/src/cli/mod.rsindex 62ce4ed07..35e7726ba 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -542,7 +542,6 @@ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'| `renamed` | boolean | Has renamed files || `deleted` | boolean | Has deleted files || `diff` | object | Lines changed vs HEAD: `{added, deleted}` |-| `diff_vs_main` | object | Lines changed vs the default branch: `{added, deleted}` |### main objectdiff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex 4be3cb7f9..a14533b5f 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -201,7 +201,6 @@ pub(super) enum TaskResult {WorkingTreeDiff {item_idx: usize,working_tree_diff: LineDiff,- working_tree_diff_with_main: Option<LineDiff>,/// Working tree change flagsworking_tree_status: WorkingTreeStatus,has_conflicts: bool,@@ -413,7 +412,6 @@ fn apply_default(items: &mut [ListItem], status_contexts: &mut [StatusContext],TaskKind::WorkingTreeDiff => {if let ItemKind::Worktree(data) = &mut items[idx].kind {data.working_tree_diff = Some(LineDiff::default());- data.working_tree_diff_with_main = Some(None);} else {debug_assert!(false, "WorkingTreeDiff task spawned for non-worktree item");}@@ -595,14 +593,12 @@ fn drain_results(}TaskResult::WorkingTreeDiff {working_tree_diff,- working_tree_diff_with_main,working_tree_status,has_conflicts,..} => {if let ItemKind::Worktree(data) = &mut item.kind {data.working_tree_diff = Some(working_tree_diff);- data.working_tree_diff_with_main = Some(working_tree_diff_with_main);} else {debug_assert!(false, "WorkingTreeDiff result for non-worktree item");}@@ -986,7 +982,6 @@ pub fn collect(//// These operations run in parallel using rayon::scope with single-level parallelism.// See module docs for the timing diagram.- worktrunk::shell_exec::trace_instant("Post-skeleton started");// Collect worktree paths for fsmonitor starts (macOS only, fast, no git commands).// Git's builtin fsmonitor has race conditions under parallel load - pre-startingdiff --git a/src/commands/list/collect_progressive_impl.rs b/src/commands/list/collect_progressive_impl.rsindex 12f25d739..15f448501 100644--- a/src/commands/list/collect_progressive_impl.rs+++ b/src/commands/list/collect_progressive_impl.rs@@ -620,39 +620,24 @@ impl Task for BranchDiffTask {/// Task 5 (worktree only): Working tree diff + status flags///-/// Parallelizes `git status` with `rev-parse --verify` + `diff-tree --quiet` since they're-/// independent. The `diff-tree` compares committed trees (HEAD vs main), not the working tree,-/// so it can run while status is scanning the working tree.+/// Runs `git status --porcelain` to get working tree status and computes diff stats.pub struct WorkingTreeDiffTask;impl Task for WorkingTreeDiffTask {const KIND: TaskKind = TaskKind::WorkingTreeDiff;fn compute(ctx: TaskContext) -> Result<TaskResult, TaskError> {- use worktrunk::git::TreesMatchResult;-// This task is only spawned for worktree items, so worktree path is always present.let wt = ctx.branch_ref.working_tree(&ctx.repo).expect("WorkingTreeDiffTask requires a worktree");- // Use default_branch (local default branch) for informational display- let default_branch = ctx.default_branch();-- // Parallelize: status (reads working tree) || trees_match (compares committed trees)- // These are independent - diff-tree compares HEAD vs main trees, not the working tree.- let (status_result, trees_match_result) = rayon::join(- || {- // Use --no-optional-locks to avoid index lock contention with WorkingTreeConflictsTask's- // `git stash create` which needs the index lock.- wt.run_command(&["--no-optional-locks", "status", "--porcelain"])- },- || wt.trees_match_base(default_branch.as_deref()),- );-- let status_output = status_result.map_err(|e| ctx.error(Self::KIND, e))?;- let trees_match = trees_match_result.map_err(|e| ctx.error(Self::KIND, e))?;+ // Use --no-optional-locks to avoid index lock contention with WorkingTreeConflictsTask's+ // `git stash create` which needs the index lock.+ let status_output = wt+ .run_command(&["--no-optional-locks", "status", "--porcelain"])+ .map_err(|e| ctx.error(Self::KIND, e))?;let (working_tree_status, is_dirty, has_conflicts) =parse_working_tree_status(&status_output);@@ -664,26 +649,9 @@ impl Task for WorkingTreeDiffTask {LineDiff::default()};- // Compute working tree diff vs main based on trees_match result- let working_tree_diff_with_main = match trees_match {- TreesMatchResult::NoBaseBranch => Some(LineDiff::default()),- TreesMatchResult::BranchNotFound | TreesMatchResult::TreesDiffer => None,- TreesMatchResult::TreesMatch { branch } => {- if is_dirty {- Some(- wt.working_tree_diff_vs_ref(branch)- .map_err(|e| ctx.error(Self::KIND, e))?,- )- } else {- Some(LineDiff::default())- }- }- };-Ok(TaskResult::WorkingTreeDiff {item_idx: ctx.item_idx,working_tree_diff,- working_tree_diff_with_main,working_tree_status,has_conflicts,})diff --git a/src/commands/list/json_output.rs b/src/commands/list/json_output.rsindex baede26e3..9f573ea74 100644--- a/src/commands/list/json_output.rs+++ b/src/commands/list/json_output.rs@@ -136,10 +136,6 @@ pub struct JsonWorkingTree {/// Lines added/deleted in working tree vs HEAD#[serde(skip_serializing_if = "Option::is_none")]pub diff: Option<JsonDiff>,-- /// Lines added/deleted in working tree vs default branch- #[serde(skip_serializing_if = "Option::is_none")]- pub diff_vs_main: Option<JsonDiff>,}/// Line diff statistics@@ -254,12 +250,6 @@ impl JsonItem {let working_tree = worktree_data.and_then(|data| {item.status_symbols.as_ref().map(|symbols| {let wt = &symbols.working_tree;- // working_tree_diff_with_main is Option<Option<LineDiff>>:- // None = not computed, Some(None) = skipped, Some(Some(diff)) = computed- let diff_vs_main = data- .working_tree_diff_with_main- .flatten()- .map(JsonDiff::from);JsonWorkingTree {staged: wt.staged,modified: wt.modified,@@ -267,7 +257,6 @@ impl JsonItem {renamed: wt.renamed,deleted: wt.deleted,diff: data.working_tree_diff.map(JsonDiff::from),- diff_vs_main,}})});@@ -631,7 +620,6 @@ mod tests {locked: None,prunable: None,working_tree_diff: None,- working_tree_diff_with_main: None,git_operation: GitOperationState::None,branch_worktree_mismatch: false,working_diff_display: None,@@ -833,7 +821,6 @@ mod tests {added: 10,deleted: 5,}),- diff_vs_main: None,};let json = serde_json::to_string(&wt).unwrap();assert!(json.contains("\"staged\":true"));diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex 091fe3f38..50c4e808b 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -1242,7 +1242,6 @@ mod tests {locked: None,prunable: None,working_tree_diff: Some(LineDiff::from((100, 50))),- working_tree_diff_with_main: Some(Some(LineDiff::default())),git_operation: GitOperationState::None,is_main: false,is_current: false,@@ -1341,7 +1340,6 @@ mod tests {locked: None,prunable: None,working_tree_diff: Some(LineDiff::default()),- working_tree_diff_with_main: Some(Some(LineDiff::default())),git_operation: GitOperationState::None,is_main: true, // Primary worktree: no ahead/behind shownis_current: false,diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 4075e7abf..74b76b6d7 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -195,13 +195,6 @@ pub struct WorktreeData {pub prunable: Option<String>,#[serde(skip_serializing_if = "Option::is_none")]pub working_tree_diff: Option<LineDiff>,- /// Diff between working tree and default branch.- /// `None` means "not computed yet" or "not computed" (optimization: skipped when trees differ).- /// `Some(Some((0, 0)))` means working tree matches default branch exactly.- /// `Some(Some((a, d)))` means a lines added, d deleted vs default branch.- /// `Some(None)` means computation was skipped.- #[serde(skip_serializing_if = "Option::is_none")]- pub working_tree_diff_with_main: Option<Option<LineDiff>>,/// Git operation in progress (rebase/merge)#[serde(skip_serializing_if = "GitOperationState::is_none")]pub git_operation: GitOperationState,@@ -679,17 +672,8 @@ impl ListItem {.as_ref().is_some_and(|d| d.is_empty())&& !has_untracked;- let working_tree_matches_main = data- .working_tree_diff_with_main- .as_ref()- .and_then(|opt| opt.as_ref())- .is_some_and(|diff| diff.is_empty());- let integration = self.check_integration_state(- data.is_main,- default_branch,- is_clean,- working_tree_matches_main,- );+ let integration =+ self.check_integration_state(data.is_main, default_branch, is_clean);// Separately detect SameCommit: same commit as main but with uncommitted work// This is NOT an integration state (has work that would be lost on delete)@@ -730,8 +714,7 @@ impl ListItem {let integration = self.check_integration_state(false, // branches are never main worktreedefault_branch,- true, // branches are always clean (no working tree)- false, // no working tree diff with main for branches+ true, // branches are always clean (no working tree));// Compute main state@@ -771,7 +754,6 @@ impl ListItem {is_main: bool,default_branch: Option<&str>,is_clean: bool,- working_tree_matches_main: bool,) -> Option<MainState> {if is_main || default_branch.is_none() {return None;@@ -800,10 +782,6 @@ impl ListItem {};let reason = check_integration(&mut provider);- // Additional check for wt list: working tree (with uncommitted changes) matches main.- // This is list-specific because wt remove requires a clean working tree anyway.- let reason = reason.or(working_tree_matches_main.then_some(IntegrationReason::TreesMatch));-// Convert to MainState, with SameCommit becoming Empty for displaymatch reason {Some(IntegrationReason::SameCommit) => Some(MainState::Empty),@@ -1678,29 +1656,27 @@ mod tests {}#[test]- fn test_check_integration_state_priority5_requires_clean() {- // Priority 5 checks if working tree matches main.- // It must also require is_clean to avoid marking worktrees with+ fn test_check_integration_state_requires_clean() {+ // Integration checks require is_clean to avoid marking worktrees with// uncommitted changes as integrated (which would incorrectly suggest// they're safe to remove).- // Create a minimal ListItem for testing - only set fields that affect integration checks+ // Create a minimal ListItem for testing - set committed_trees_match = truelet mut item = ListItem::new_branch("abc123".to_string(), "feature".to_string());item.is_ancestor = Some(false); // not an ancestor (to skip priority 1-2)- item.committed_trees_match = Some(false); // trees don't match (to skip priority 4)+ item.committed_trees_match = Some(true); // trees match (priority 4)item.has_file_changes = None; // unknown (to skip priority 3)item.would_merge_add = None; // unknown (to skip priority 6)- // Dirty working tree: should NOT return Integrated even though working tree matches main+ // Dirty working tree: should NOT return Integratedassert_eq!(item.check_integration_state(false, // not mainSome("main"), // has default branchfalse, // is_clean = false (dirty working tree)- true, // working_tree_matches_main = true),None,- "Priority 5 should reject dirty working tree"+ "Integration should reject dirty working tree");// Clean working tree: SHOULD return Integrated(TreesMatch)@@ -1709,10 +1685,9 @@ mod tests {false,Some("main"),true, // is_clean = true- true, // working_tree_matches_main = true),Some(MainState::Integrated(IntegrationReason::TreesMatch)),- "Priority 5 should accept clean working tree"+ "Integration should accept clean working tree with matching trees");}@@ -1724,7 +1699,7 @@ mod tests {let mut item = ListItem::new_branch("abc123".to_string(), "feature".to_string());item.is_ancestor = Some(false);- item.committed_trees_match = Some(false);+ item.committed_trees_match = Some(true); // trees match (would show integration if clean)item.has_file_changes = None;item.would_merge_add = None;@@ -1734,7 +1709,6 @@ mod tests {false,Some("main"),false, // is_clean = false (represents untracked files blocking integration)- true, // working_tree_matches_main = true),None,"Dirty working tree (untracked files) should block integration"@@ -1746,7 +1720,6 @@ mod tests {false,Some("main"),true, // is_clean = true- true, // working_tree_matches_main = true),Some(MainState::Integrated(IntegrationReason::TreesMatch)),"Clean working tree should show as integrated"diff --git a/src/git/mod.rs b/src/git/mod.rsindex 1b3563387..59e6010b6 100644--- a/src/git/mod.rs+++ b/src/git/mod.rs@@ -41,7 +41,7 @@ pub use error::{exit_code,};pub use parse::{parse_porcelain_z, parse_untracked_files};-pub use repository::{Repository, ResolvedWorktree, TreesMatchResult, WorkingTree, set_base_path};+pub use repository::{Repository, ResolvedWorktree, WorkingTree, set_base_path};pub use url::{GitRemoteUrl, parse_owner_repo, parse_remote_host, parse_remote_owner};/// Why branch content is considered integrated into the target branch.///diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rsindex 7fed3f371..c06b35aa9 100644--- a/src/git/repository/mod.rs+++ b/src/git/repository/mod.rs@@ -43,8 +43,8 @@ mod working_tree;mod worktrees;// Re-export WorkingTree+pub use working_tree::WorkingTree;pub(super) use working_tree::path_to_logging_context;-pub use working_tree::{TreesMatchResult, WorkingTree};// ============================================================================// Repository Cachediff --git a/src/git/repository/working_tree.rs b/src/git/repository/working_tree.rsindex 00db569a0..7d28a0259 100644--- a/src/git/repository/working_tree.rs+++ b/src/git/repository/working_tree.rs@@ -211,49 +211,4 @@ impl<'a> WorkingTree<'a> {let stdout = self.run_command(&["diff", "--numstat", ref_name])?;LineDiff::from_numstat(&stdout)}-- /// Check if HEAD tree matches a base branch tree.- ///- /// This runs `rev-parse --verify` + `diff-tree --quiet` and returns the result.- /// Can be called directly for parallel execution with `git status`.- pub fn trees_match_base<'b>(- &self,- base_branch: Option<&'b str>,- ) -> anyhow::Result<TreesMatchResult<'b>> {- let Some(branch) = base_branch else {- return Ok(TreesMatchResult::NoBaseBranch);- };-- // Check if branch exists- if self- .run_command(&["rev-parse", "--verify", branch])- .is_err()- {- return Ok(TreesMatchResult::BranchNotFound);- }-- // Check if trees match- let trees_match = self- .run_command(&["diff-tree", "--quiet", "HEAD", branch])- .is_ok();-- if trees_match {- Ok(TreesMatchResult::TreesMatch { branch })- } else {- Ok(TreesMatchResult::TreesDiffer)- }- }-}--/// Result of checking if HEAD tree matches a base branch tree.-#[derive(Debug, Clone, Copy)]-pub enum TreesMatchResult<'a> {- /// No base branch specified (main worktree).- NoBaseBranch,- /// Base branch doesn't exist.- BranchNotFound,- /// Trees differ between HEAD and base branch.- TreesDiffer,- /// Trees match - includes branch name for computing diff if needed.- TreesMatch { branch: &'a str },}diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 314fba747..f14990d8f 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -212,15 +212,14 @@ Query structured data with [2m--format=json[0m:[1mworking_tree object- Field Type Description- ──────────── ─────── ─────────────────────────────────────────────────────- staged boolean Has staged files- modified boolean Has modified files (unstaged)- untracked boolean Has untracked files- renamed boolean Has renamed files- deleted boolean Has deleted files- diff object Lines changed vs HEAD: {added, deleted}- diff_vs_main object Lines changed vs the default branch: {added, deleted}+ Field Type Description+ ───────── ─────── ───────────────────────────────────────+ staged boolean Has staged files+ modified boolean Has modified files (unstaged)+ untracked boolean Has untracked files+ renamed boolean Has renamed files+ deleted boolean Has deleted files+ diff object Lines changed vs HEAD: {added, deleted}[1mmain objectdiff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snapindex 39f2924c4..18c78b648 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap@@ -234,15 +234,14 @@ Query structured data with [2m--format=json[0m:[1mworking_tree object- Field Type Description- ──────────── ─────── ─────────────────────────────────────────────────────- staged boolean Has staged files- modified boolean Has modified files (unstaged)- untracked boolean Has untracked files- renamed boolean Has renamed files- deleted boolean Has deleted files- diff object Lines changed vs HEAD: {added, deleted}- diff_vs_main object Lines changed vs the default branch: {added, deleted}+ Field Type Description+ ───────── ─────── ───────────────────────────────────────+ staged boolean Has staged files+ modified boolean Has modified files (unstaged)+ untracked boolean Has untracked files+ renamed boolean Has renamed files+ deleted boolean Has deleted files+ diff object Lines changed vs HEAD: {added, deleted}[1mmain objectdiff --git a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snapindex fd5a3800f..ef5921df0 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap@@ -8,7 +8,7 @@ info:env:APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"@@ -21,6 +21,7 @@ info:PATH: "[PATH]"RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyUSERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"@@ -49,10 +50,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "is_main",@@ -84,10 +81,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "integrated",diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snapindex b46dc44af..d8b7bdd2d 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap@@ -8,7 +8,7 @@ info:env:APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"@@ -21,6 +21,7 @@ info:PATH: "[PATH]"RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyUSERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"@@ -49,10 +50,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "is_main",diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snapindex 130cdb184..a1e67a36c 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap@@ -8,7 +8,7 @@ info:env:APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"@@ -21,6 +21,7 @@ info:PATH: "[PATH]"RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyUSERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"@@ -49,10 +50,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "is_main",@@ -84,10 +81,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "empty",diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snapindex e912b7668..1afe4d0fe 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap@@ -8,7 +8,7 @@ info:env:APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"@@ -21,6 +21,7 @@ info:PATH: "[PATH]"RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyUSERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"@@ -49,10 +50,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "is_main",@@ -84,10 +81,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "empty",@@ -123,10 +116,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "empty",diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snapindex 972716c71..ba7ee4de4 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap@@ -8,7 +8,7 @@ info:env:APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"- COLUMNS: "150"+ COLUMNS: "500"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"@@ -21,6 +21,7 @@ info:PATH: "[PATH]"RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ TERM: alacrittyUSERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"@@ -49,10 +50,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "is_main",@@ -84,10 +81,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "empty",@@ -123,10 +116,6 @@ exit_code: 0"diff": {"added": 0,"deleted": 0- },- "diff_vs_main": {- "added": 0,- "deleted": 0}},"main_state": "empty",