Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Fix dirty worktree detection to include untracked files
Maximilian Roosdccef45f5c7c
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.mdindex f40c2b1f4..3be77ac20 100644--- a/docs/content/claude-code.md+++ b/docs/content/claude-code.md@@ -22,7 +22,7 @@ The plugin adds status indicators to `wt list`:+ review-ui <span class=c>?</span> <span class=d>β</span> π¬ <span class=g>β1</span> ./repo.review-ui <span class=d>46b6a187</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>+ wip-docs <span class=c>?</span> <span class=d>β</span> ./repo.wip-docs <span class=d>a058e792</span> <span class=d>1d</span> <span class=d>Initial commit</span>-βͺ <span class=d>Showing 4 worktrees, 2 ahead</span>+βͺ <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>{% end %}<!-- END AUTO-GENERATED -->diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex 8219cf8a9..adaef524f 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -282,12 +282,14 @@ impl SummaryMetrics {}fn update(&mut self, item: &ListItem) {- if let Some(data) = item.worktree_data() {+ if let Some(_data) = item.worktree_data() {self.worktrees += 1;- if data- .working_tree_diff+ // Use status_symbols.working_tree which includes untracked files,+ // not just working_tree_diff which only has tracked changes+ if item+ .status_symbols.as_ref()- .is_some_and(|d| !d.is_empty())+ .is_some_and(|s| s.working_tree.is_dirty()){self.dirty_worktrees += 1;}diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex 904861e50..c21a7d57f 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -33,4 +33,4 @@ exit_code: 0+ feature-changes [36m![39m[36m?[39m [2mβ[22m π€ [32m+50[0m [31m-100[0m [32mβ1[0m ./repo.feature-changes [2m38944dae[0m [2m1d[0m [2mAdd 100 lines+ fix [36m?[39m [2mβ[22m π¬ ./repo.fix [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 2 with changes, 2 ahead+βͺ [2mShowing 4 worktrees, 3 with changes, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snapindex 8f4f69b33..fbed30d41 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap@@ -34,4 +34,4 @@ exit_code: 0+ feature-a [36m?[39m [2mβ[22m ./repo.feature-a [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature-b [2mβ[22m [32mβ1[0m [32m+1[0m [31m-1[0m ./repo.feature-b [2m86bdffd3[0m [2m1d[0m [2mTest commit-βͺ [2mShowing 3 worktrees, 1 ahead+βͺ [2mShowing 3 worktrees, 1 with changes, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snapindex c8d56d02f..8facc028e 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap@@ -33,4 +33,4 @@ exit_code: 0+ review-ui [36m?[39m [2mβ[22m π¬ [32mβ1[0m ./repo.review-ui [2m46b6a187[0m [2m1d[0m [2mAdd dashboard component+ wip-docs [36m?[39m [2mβ[22m ./repo.wip-docs [2ma058e792[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 2 ahead+βͺ [2mShowing 4 worktrees, 2 with changes, 2 aheaddiff --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.snapindex 85ecaa369..78c255cf8 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@@ -32,4 +32,4 @@ exit_code: 0+ complex [36m+[39m [36m?[39m [2mβ[22m [32m+1[0m [31m-1[0m [32mβ1[0m ./repo.complex [2m42162296[0m [2m1d[0m [2mComplex+ simple [36m?[39m [2mβ[22m [32mβ1[0m ./repo.simple [2m63ee5cb5[0m [2m1d[0m [2mSimple-βͺ [2mShowing 3 worktrees, 1 with changes, 2 ahead+βͺ [2mShowing 3 worktrees, 2 with changes, 2 aheaddiff --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.snapindex 771be0dcf..eb9d28575 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@@ -32,4 +32,4 @@ exit_code: 0+ huge [36m?[39m [2mβ[22m ./repo.huge [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ tiny [36m![39m [2mβ[22m [32m+1[0m [31m-1[0m ./repo.tiny [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees, 1 with changes+βͺ [2mShowing 3 worktrees, 2 with changesdiff --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.snapindex e41f7c88a..424afb45a 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@@ -33,4 +33,4 @@ exit_code: 0+ feature-medium [36m?[39m [2mβ[22m ./repo.feature-medium [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature-small [36m?[39m [2mβ[22m ./repo.feature-small [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees+βͺ [2mShowing 4 worktrees, 3 with changes