Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Feat(list): Use new `⇡⇣` symbols for upstream commits
Maximilian Roose80fc4c12e07
diff --git a/README.md b/README.mdindex 45f9a1aab..006870fa8 100644--- a/README.md+++ b/README.md@@ -114,7 +114,7 @@ merge, cleanup.```console$ wt listBranch Status HEAD± main↕ Path Remote⇅ Commit Age Message-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit+@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3@@ -696,7 +696,7 @@ Options:- **main↕:** Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)- **main…±** (`--full`): Line diffs in commits ahead of main (+added -deleted)- **Path:** Worktree directory location-- **Remote⇅:** Commits ahead↑/behind↓ relative to tracking branch (e.g. `origin/branch`)+- **Remote⇅:** Commits ahead⇡/behind⇣ relative to tracking branch (e.g. `origin/branch`)- **CI** (`--full`): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)- `●` **passed** (green) - All checks passed- `●` **running** (blue) - Checks in progressdiff --git a/src/cli.rs b/src/cli.rsindex ababe6eff..721fdafbc 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -596,7 +596,7 @@ Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>- **main↕:** Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)- **main…±** (`--full`): Line diffs in commits ahead of main (+added -deleted)- **Path:** Worktree directory location-- **Remote⇅:** Commits ahead↑/behind↓ relative to tracking branch (e.g. `origin/branch`)+- **Remote⇅:** Commits ahead⇡/behind⇣ relative to tracking branch (e.g. `origin/branch`)- **CI** (`--full`): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)- `●` **passed** (green) - All checks passed- `●` **running** (blue) - Checks in progressdiff --git a/src/commands/list/columns.rs b/src/commands/list/columns.rsindex e5961ca49..bfcb7527a 100644--- a/src/commands/list/columns.rs+++ b/src/commands/list/columns.rs@@ -19,7 +19,10 @@ pub enum ColumnKind {#[derive(Clone, Copy, Debug, PartialEq, Eq)]pub enum DiffVariant {Signs,+ /// Simple arrows (↑↓) for commits ahead/behind mainArrows,+ /// Double-struck arrows (⇡⇣) for commits ahead/behind remote+ UpstreamArrows,}/// Static metadata describing a column's behavior in both layout and rendering.diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex a0f0cb00c..99caba1ae 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -296,7 +296,7 @@ impl ColumnKind {always_show_zeros: false,}),ColumnKind::Upstream => Some(DiffDisplayConfig {- variant: DiffVariant::Arrows,+ variant: DiffVariant::UpstreamArrows,positive_style: ADDITION,negative_style: DELETION.dimmed(),always_show_zeros: true,diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex 7b9356a5c..d7bec9a2d 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -122,6 +122,10 @@ impl DiffVariant {positive: "↑",negative: "↓",},+ DiffVariant::UpstreamArrows => DiffSymbols {+ positive: "⇡",+ negative: "⇣",+ },}}}@@ -165,7 +169,9 @@ impl DiffColumnConfig {// Line diffs: show full number (user prefers precision over compactness)DiffVariant::Signs => (value.to_string(), false),// Commit counts: use C abbreviation- DiffVariant::Arrows => (format!("{}C", value / 100), true),+ DiffVariant::Arrows | DiffVariant::UpstreamArrows => {+ (format!("{}C", value / 100), true)+ }}} else {(value.to_string(), false)diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snapindex 379df46f2..d7c79911a 100644--- a/tests/snapshots/integration__integration_tests__help__help_list.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap@@ -61,7 +61,7 @@ Global Options:- [1mmain↕:[0m Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)- [1mmain…±[0m ([2m--full[0m): Line diffs in commits ahead of main (+added -deleted)- [1mPath:[0m Worktree directory location-- [1mRemote⇅:[0m Commits ahead↑/behind↓ relative to tracking branch (e.g. [2morigin/branch[0m)+- [1mRemote⇅:[0m Commits ahead⇡/behind⇣ relative to tracking branch (e.g. [2morigin/branch[0m)- [1mCI[0m ([2m--full[0m): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)- [2m●[0m [1mpassed[0m (green) - All checks passed- [2m●[0m [1mrunning[0m (blue) - Checks in progressdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 8bd1a5981..83abe2801 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m[2m⇡[0m [1m./test-repo[0m [32m↑1[0m [2m[31m↓0[0m [2m85ed6d3d[0m [2m10mo[0m [2mMain advances[0m-+ feature [36m+[0m[36m![0m[36m?[0m[33m⚠[0m[2m↕[0m[2m⇅[0m[33m⊠[0m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m↑1[0m [2m[31m↓1[0m [2m4afb2b9e[0m [2m10mo[0m [2mLocal commit[0m+@ [1mmain[0m [2m^[0m[2m⇡[0m [1m./test-repo[0m [32m⇡1[0m [2m[31m⇣0[0m [2m85ed6d3d[0m [2m10mo[0m [2mMain advances[0m++ feature [36m+[0m[36m![0m[36m?[0m[33m⚠[0m[2m↕[0m[2m⇅[0m[33m⊠[0m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m10mo[0m [2mLocal commit[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snapindex ccecd2dd5..43bf39e1b 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ bugfix-y [2m↑[0m [32m↑1[0m ./bugfix-y [2m412a27c8[0m [2m10mo[0m [2mFix bug[0m+ feature-x [36m+[0m [2m↑[0m [32m+5[0m [32m↑3[0m ./feature-x [2m7fd821aa[0m [2m10mo[0m [2mAdd file 3[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex b539cd1b7..3cafd88f6 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap@@ -26,8 +26,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m-+ ahead [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./ahead [32m↑1[0m [2m[31m↓0[0m [2m2fff52c2[0m [2m10mo[0m [2mAhead commit[0m-+ [2min-sync[0m [2m∅[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m+@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m++ ahead [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./ahead [32m⇡1[0m [2m[31m⇣0[0m [2m2fff52c2[0m [2m10mo[0m [2mAhead commit[0m++ [2min-sync[0m [2m∅[0m [2m./in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m10mo[0m [2mInitial commit on main[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex a7a098eef..7160acca7 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[0m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m[2mlocal-only-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m[2mlocal-only-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m[2morigin/remote-only-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex 6e14c8cc7..da711b2a0 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+ [2mfeature-with-worktree[0m [2m∅[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m[2morigin/remote-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex dd89fa0e3..6517a3250 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[0m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m[2morigin/remote-feature-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0m[2morigin/remote-feature-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10mo[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 6ff3db78e..c57284e3f 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -27,11 +27,11 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m-+ ahead [2m↑[0m[2m⇡[0m [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [SHA] [2m10mo[0m [2mAhead commit 2[0m-+ [2mbehind[0m [2m∅[0m [2m⇣[0m [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m-+ diverged [2m↑[0m[2m⇅[0m [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [SHA] [2m10mo[0m [2mDiverged local commit[0m-+ [2min-sync[0m [2m∅[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m+@ [1mmain[0m [2m^[0m [1m./test-repo[0m [32m⇡0[0m [2m[31m⇣0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ ahead [2m↑[0m[2m⇡[0m [32m↑2[0m [32m+2[0m ./ahead [32m⇡2[0m [2m[31m⇣0[0m [SHA] [2m10mo[0m [2mAhead commit 2[0m++ [2mbehind[0m [2m∅[0m [2m⇣[0m [2m./behind[0m [32m⇡0[0m [2m[31m⇣1[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m++ diverged [2m↑[0m[2m⇅[0m [32m↑1[0m [32m+1[0m ./diverged [32m⇡1[0m [2m[31m⇣1[0m [SHA] [2m10mo[0m [2mDiverged local commit[0m++ [2min-sync[0m [2m∅[0m [2m./in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m+ [2mno-upstream[0m [2m∅[0m [2m./no-upstream[0m [SHA] [2m10mo[0m [2mInitial commit on main[0m⚪ [2mShowing 6 worktrees, 2 ahead[0m