Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replace merge conflict indicator with crossed swords symbol
Maximilian Roosf3b96a837527
diff --git a/CLAUDE.md b/CLAUDE.mdindex 01a6b5ce6..bf0707492 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -78,7 +78,7 @@ Keep the first line of flag and argument descriptions brief—aim for 3-6 words.**Good examples:**- `/// Skip approval prompts`-- `/// Show CI, conflicts, and full diffs`+- `/// Show CI and line diffs`- `/// Target branch (defaults to default branch)`**Bad examples (too verbose):**diff --git a/dev/config.example.toml b/dev/config.example.tomlindex cc78ecc5f..5d0c55be2 100644--- a/dev/config.example.toml+++ b/dev/config.example.toml@@ -46,7 +46,7 @@ worktree-path = "../{{ main_worktree }}.{{ branch }}"# List Command Defaults# Configure default behavior for `wt list`[list]-full = false # Show CI, conflicts, diffs by default+full = false # Show CI and line diffs by defaultbranches = false # Include branches without worktrees by defaultremotes = false # Include remote branches by defaultdiff --git a/docs/content/list.md b/docs/content/list.mdindex 4fe2f0447..a6ad2ae1c 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -30,7 +30,7 @@ List all worktrees:<!-- END AUTO-GENERATED -->-Include CI status and conflict detection:+Include CI status and line diffs:<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap — edit source to update -->@@ -111,7 +111,7 @@ Symbols appear in the Status column in this order:| | `✖` | Merge conflicts || | `↻` | Rebase in progress || | `⋈` | Merge in progress |-| Branch state | `⚔` | Would conflict if merged to main (`--full` only) |+| Branch state | `⚔` | Would conflict if merged to main || | `≡` | Matches main (identical contents) || | `_` | No commits ahead, clean working tree || Main divergence | `^` | Is the main branch |@@ -190,7 +190,7 @@ Options:Include remote branches--full- Show CI, conflicts, diffs+ Show CI and line diffs--progressiveShow fast info immediately, update with slow infodiff --git a/src/cli.rs b/src/cli.rsindex c06104d26..bdaea8b7e 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1361,7 +1361,7 @@ List all worktrees:$ wt list```-Include CI status and conflict detection:+Include CI status and line diffs:<!-- wt list --full -->```console@@ -1422,7 +1422,7 @@ Symbols appear in the Status column in this order:| | `✖` | Merge conflicts || | `↻` | Rebase in progress || | `⋈` | Merge in progress |-| Branch state | `⚔` | Would conflict if merged to main (`--full` only) |+| Branch state | `⚔` | Would conflict if merged to main || | `≡` | Matches main (identical contents) || | `_` | No commits ahead, clean working tree || Main divergence | `^` | Is the main branch |@@ -1492,7 +1492,7 @@ wt list --format=json | jq '.[] | select(.status.main_divergence == "Ahead")'#[arg(long)]remotes: bool,- /// Show CI, conflicts, diffs+ /// Show CI and line diffs#[arg(long)]full: bool,diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex aa92d2c2e..7e37bed09 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -45,7 +45,7 @@//! First run in a repo without cached default branch adds ~100-300ms for network lookup.//!//! After the skeleton appears, cells fill in progressively as git operations complete.-//! The slowest operations (CI status, merge-tree conflict detection) only run with `--full`.+//! The slowest operation (CI status) only runs with `--full`.//!//! ## Git Commands Per Worktree//!@@ -151,17 +151,13 @@ pub fn handle_list(let repo = Repository::current();// Build skip set based on flags- // Without --full: skip expensive operations (BranchDiff, CiStatus, MergeTreeConflicts)+ // Without --full: skip expensive operations (BranchDiff, CiStatus)let skip_tasks: std::collections::HashSet<TaskKind> = if show_full {std::collections::HashSet::new() // Compute everything} else {- [- TaskKind::BranchDiff,- TaskKind::CiStatus,- TaskKind::MergeTreeConflicts,- ]- .into_iter()- .collect()+ [TaskKind::BranchDiff, TaskKind::CiStatus]+ .into_iter()+ .collect()};// Progressive rendering only for table format with Progressive modediff --git a/src/config/user.rs b/src/config/user.rsindex 1e5ba4cd8..4fe3966df 100644--- a/src/config/user.rs+++ b/src/config/user.rs@@ -224,7 +224,7 @@ pub struct UserProjectConfig {/// Configuration for the `wt list` command#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]pub struct ListConfig {- /// Show CI, conflicts, and diffs by default+ /// Show CI and line diffs by default#[serde(skip_serializing_if = "Option::is_none")]pub full: Option<bool>,diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex 5257a1453..d38da8f7d 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -90,7 +90,7 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[2m# List Command Defaults[0m[2m# Configure default behavior for `wt list`[0m[2m[list][0m- [2mfull = false # Show CI, conflicts, diffs by default[0m+ [2mfull = false # Show CI and line diffs by default[0m[2mbranches = false # Include branches without worktrees by default[0m[2mremotes = false # Include remote branches by default[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex ab58306c9..87dcd4081 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -37,7 +37,7 @@ Usage: [1m[36mwt list[0m [36m[OPTIONS][0mInclude remote branches[1m[36m--full[0m- Show CI, conflicts, diffs+ Show CI and line diffs[1m[36m--progressive[0mShow fast info immediately, update with slow info[0m@@ -67,7 +67,7 @@ List all worktrees:[2m$ wt list[0m-Include CI status and conflict detection:+Include CI status and line diffs:[2m$ wt list --full[0m@@ -112,29 +112,29 @@ CI is only checked for branches that track a remote — local-only branches showSymbols appear in the Status column in this order:- Category Symbol Meaning- ───────────────── ────── ──────────────────────────────────────────────- Working tree [36m+[0m Staged files- [36m![0m Modified files (unstaged)- [36m?[0m Untracked files- [31m✖[0m Merge conflicts- [33m↻[0m Rebase in progress- [33m⋈[0m Merge in progress- Branch state [33m⚔[0m Would conflict if merged to main ([2m--full[0m only)- [2m≡[0m Matches main (identical contents)- [2m_[0m No commits ahead, clean working tree- Main divergence [2m^[0m Is the main branch- [2m↑[0m Ahead of main- [2m↓[0m Behind main- [2m↕[0m Diverged from main- Remote divergence [2m|[0m In sync with remote- [2m⇡[0m Ahead of remote- [2m⇣[0m Behind remote- [2m⇅[0m Diverged from remote- Worktree state [2m/[0m Branch without worktree- [31m⚑[0m Path doesn't match template- [33m⌫[0m Prunable (directory missing)- [33m⊠[0m Locked worktree+ Category Symbol Meaning+ ───────────────── ────── ────────────────────────────────────+ Working tree [36m+[0m Staged files+ [36m![0m Modified files (unstaged)+ [36m?[0m Untracked files+ [31m✖[0m Merge conflicts+ [33m↻[0m Rebase in progress+ [33m⋈[0m Merge in progress+ Branch state [33m⚔[0m Would conflict if merged to main+ [2m≡[0m Matches main (identical contents)+ [2m_[0m No commits ahead, clean working tree+ Main divergence [2m^[0m Is the main branch+ [2m↑[0m Ahead of main+ [2m↓[0m Behind main+ [2m↕[0m Diverged from main+ Remote divergence [2m|[0m In sync with remote+ [2m⇡[0m Ahead of remote+ [2m⇣[0m Behind remote+ [2m⇅[0m Diverged from remote+ Worktree state [2m/[0m Branch without worktree+ [31m⚑[0m Path doesn't match template+ [33m⌫[0m Prunable (directory missing)+ [33m⊠[0m Locked worktreeRows are dimmed when the branch content is already in main ([2m≡[0m matches main or [2m_[0m no commits ahead).diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snapindex 8484e4568..7b639a9bd 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap@@ -28,7 +28,7 @@ Usage: [1m[36mwt list[0m [36m[OPTIONS][0m[1m[36m--format[0m[36m [0m[36m<FORMAT>[0m Output format (table, json) [default: table][1m[36m--branches[0m Include branches without worktrees[1m[36m--remotes[0m Include remote branches- [1m[36m--full[0m Show CI, conflicts, diffs+ [1m[36m--full[0m Show CI and line diffs[1m[36m--progressive[0m Show fast info immediately, update with slow info[1m[36m-h[0m, [1m[36m--help[0m Print help (see more with '--help')