Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Test: enable for_each tests on Windows (#166)
Maximilian Roosd1480a5b0ee3
diff --git a/README.md b/README.mdindex c4a368be4..cc2196a1d 100644--- a/README.md+++ b/README.md@@ -86,9 +86,9 @@ See all worktrees at a glance:```console$ wt listBranch Status HEAD± main↕ Path Remote⇅ Commit Age Message-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 d35485d7 30m Add API tests-^ main ^⇅ ./repo ⇡1 ⇣1 e18e1b4d 4d Merge fix-auth:…-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 2517d700 5h Add secure token…+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 ec97decc 30m Add API tests+^ main ^⇅ ./repo ⇡1 ⇣1 6088adb3 4d Merge fix-auth:…++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 127407de 5h Add secure token…⚪ Showing 3 worktrees, 1 with changes, 2 ahead```diff --git a/docs/content/claude-code.md b/docs/content/claude-code.mdindex 3d6a25547..04e5868a7 100644--- a/docs/content/claude-code.md+++ b/docs/content/claude-code.md@@ -17,10 +17,10 @@ The plugin adds status indicators to `wt list`:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list</span><b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>-@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>002eabd0</span> <span class=d>1d</span> <span class=d>Initial commit</span>-+ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>2f045483</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>-+ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>b8c11f99</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>-+ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>002eabd0</span> <span class=d>1d</span> <span class=d>Initial commit</span>+@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>a058e792</span> <span class=d>1d</span> <span class=d>Initial commit</span>++ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>95e48b49</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>++ 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>++ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <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>{% end %}diff --git a/docs/content/list.md b/docs/content/list.mdindex 587cd4717..b65294a84 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -21,9 +21,9 @@ List all worktrees:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list</span><b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>d35485d7</span> <span class=d>30m</span> <span class=d>Add API tests</span>-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>e18e1b4d</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>2517d700</span> <span class=d>5h</span> <span class=d>Add secure token…</span>+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token…</span>⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>{% end %}@@ -37,9 +37,9 @@ Include CI status and line diffs:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list --full</span><b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>d35485d7</span> <span class=d>30m</span>-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>e18e1b4d</span> <span class=d>4d</span>-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>2517d700</span> <span class=d>5h</span>+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span>+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span>++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span>⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>{% end %}@@ -53,11 +53,11 @@ Include branches that don't have worktrees:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list --branches --full</span><b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>d35485d7</span> <span class=d>30m</span>-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>e18e1b4d</span> <span class=d>4d</span>-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>2517d700</span> <span class=d>5h</span>- exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>52cad122</span> <span class=d>2d</span>- wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>7ca6d817</span> <span class=d>3d</span>+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span>+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span>++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span>+ exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>99e114de</span> <span class=d>2d</span>+ wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>d62fd0e8</span> <span class=d>3d</span>⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>{% end %}diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.mdindex 6de964c76..9e94a0233 100644--- a/docs/content/worktrunk.md+++ b/docs/content/worktrunk.md@@ -73,9 +73,9 @@ See all worktrees at a glance:{% terminal() %}<span class="prompt">$</span> <span class="cmd">wt list</span><b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>d35485d7</span> <span class=d>30m</span> <span class=d>Add API tests</span>-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>e18e1b4d</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>2517d700</span> <span class=d>5h</span> <span class=d>Add secure token…</span>+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token…</span>⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>{% end %}diff --git a/tests/common/mod.rs b/tests/common/mod.rsindex 455b85411..8252ab6d1 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -454,6 +454,13 @@ fn copy_fixture_template(dest: &Path) {// Copy file.txt (part of the initial commit)std::fs::copy(template.join("file.txt"), repo_path.join("file.txt")).unwrap();+ // Copy .gitattributes (forces LF line endings on all platforms)+ std::fs::copy(+ template.join(".gitattributes"),+ repo_path.join(".gitattributes"),+ )+ .unwrap();+// Copy gitconfigstd::fs::copy(template.join("gitconfig"), dest.join("test-gitconfig")).unwrap();}diff --git a/tests/fixtures/template-repo/.gitattributes b/tests/fixtures/template-repo/.gitattributesnew file mode 100644index 000000000..8dc927875--- /dev/null+++ b/tests/fixtures/template-repo/.gitattributes@@ -0,0 +1,2 @@+# Force LF line endings for all text files+* text=auto eol=lfdiff --git a/tests/fixtures/template-repo/_git/index b/tests/fixtures/template-repo/_git/indexindex bd148bd40..e06b84058 100644Binary files a/tests/fixtures/template-repo/_git/index and b/tests/fixtures/template-repo/_git/index differdiff --git a/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda b/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fdadeleted file mode 100644index 915806835..000000000--- a/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda+++ /dev/null@@ -1,2 +0,0 @@-x���-1D=�+r���f� �ջ~@["�V��|~�s��7��ZpƝvBHS���� #F�c�%aBa��h��)�6�pT�g���Z�[=u������,�7��;wy-q��}Y6�\ No newline at end of filediff --git a/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8 b/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8deleted file mode 100644index 564346681..000000000Binary files a/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8 and /dev/null differdiff --git a/tests/fixtures/template-repo/_git/objects/6c/b382c5e1a55e3935e5a3e33913cc3ec47c49a5 b/tests/fixtures/template-repo/_git/objects/6c/b382c5e1a55e3935e5a3e33913cc3ec47c49a5new file mode 100644index 000000000..c7c36e114--- /dev/null+++ b/tests/fixtures/template-repo/_git/objects/6c/b382c5e1a55e3935e5a3e33913cc3ec47c49a5@@ -0,0 +1 @@+x+)JMU0�`040031Q�K�,I,))�L*-I-f�=��x{vv����6�_~�pAU�e��T�0D}q������`�D�Y�El�_�!�\ No newline at end of filediff --git a/tests/fixtures/template-repo/_git/objects/8d/c9278751db9b6b8dc85f72558621fae0fa7c0a b/tests/fixtures/template-repo/_git/objects/8d/c9278751db9b6b8dc85f72558621fae0fa7c0anew file mode 100644index 000000000..3b57ea7e4Binary files /dev/null and b/tests/fixtures/template-repo/_git/objects/8d/c9278751db9b6b8dc85f72558621fae0fa7c0a differdiff --git a/tests/fixtures/template-repo/_git/objects/a1/e809f511b21ee516412a4520497f0cea4af366 b/tests/fixtures/template-repo/_git/objects/a1/e809f511b21ee516412a4520497f0cea4af366new file mode 100644index 000000000..260c4f4be--- /dev/null+++ b/tests/fixtures/template-repo/_git/objects/a1/e809f511b21ee516412a4520497f0cea4af366@@ -0,0 +1,2 @@+x���+1D=�+r�5����]? ��k��߈_��a��Ho��L;����QH)$%FE, EPe�e*L�������6������� Ҍ���c�}to��|�.�j����`�5\ No newline at end of filediff --git a/tests/fixtures/template-repo/_git/refs/heads/main b/tests/fixtures/template-repo/_git/refs/heads/mainindex a735b6ef7..fd35c138f 100644--- a/tests/fixtures/template-repo/_git/refs/heads/main+++ b/tests/fixtures/template-repo/_git/refs/heads/main@@ -1 +1 @@-23e5a15006b67068f23d976a978dfffdb68e5fda+a1e809f511b21ee516412a4520497f0cea4af366diff --git a/tests/integration_tests/for_each.rs b/tests/integration_tests/for_each.rsindex eefccdbe2..fc890b1d5 100644--- a/tests/integration_tests/for_each.rs+++ b/tests/integration_tests/for_each.rs@@ -13,8 +13,6 @@ fn snapshot_for_each(test_name: &str, repo: &TestRepo, args: &[&str]) {});}-/// Skipped on Windows: git status shows line-ending differences (CRLF vs LF).-#[cfg_attr(windows, ignore)]#[rstest]fn test_for_each_single_worktree(repo: TestRepo) {// Only main worktree exists@@ -25,8 +23,6 @@ fn test_for_each_single_worktree(repo: TestRepo) {);}-/// Skipped on Windows: git status shows line-ending differences (CRLF vs LF).-#[cfg_attr(windows, ignore)]#[rstest]fn test_for_each_multiple_worktrees(mut repo: TestRepo) {// Create additional worktrees@@ -40,8 +36,6 @@ fn test_for_each_multiple_worktrees(mut repo: TestRepo) {);}-/// Skipped on Windows: git show error messages may differ.-#[cfg_attr(windows, ignore)]#[rstest]fn test_for_each_command_fails_in_one(mut repo: TestRepo) {repo.add_worktree("feature");@@ -60,8 +54,6 @@ fn test_for_each_no_args_error(repo: TestRepo) {snapshot_for_each("for_each_no_args", &repo, &["for-each"]);}-/// Skipped on Windows: git status shows line-ending differences (CRLF vs LF).-#[cfg_attr(windows, ignore)]#[rstest]fn test_for_each_with_detached_head(mut repo: TestRepo) {// Create a worktree and detach its HEAD@@ -75,8 +67,6 @@ fn test_for_each_with_detached_head(mut repo: TestRepo) {);}-/// Skipped on Windows: `echo` command has different quoting behavior.-#[cfg_attr(windows, ignore)]#[rstest]fn test_for_each_with_template(repo: TestRepo) {// Test template expansion with {{ branch }}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex a8abb73d2..98c298e4a 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -1650,8 +1650,8 @@ fn test_merge_no_commit_with_clean_tree(mut repo_with_feature_worktree: TestRepo----- stdout ---------- stderr ------ 🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m- [107m [0m * [33m3cf9bf5[m Add feature file+ 🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+ [107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m@@ -1711,8 +1711,8 @@ fn test_merge_no_commit_no_squash_no_remove_redundant(mut repo_with_feature_work----- stdout ---------- stderr ------ 🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m- [107m [0m * [33m3cf9bf5[m Add feature file+ 🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+ [107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snapindex 945f7a569..fc304de2f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap@@ -4,7 +4,7 @@ expression: normalized---> [QUERY] │[PREVIEW_HEADER]Branch Status HEAD± main↕ Path Remote⇅ Com│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog-> @ main ^ . 2..│+> @ main ^ . a..││⚪ main has no uncommitted changes││diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snapindex 6c8bee8d2..67e6e5cde 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap@@ -5,12 +5,12 @@ expression: normalized> [QUERY] │[PREVIEW_HEADER]Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog> + feature ↑ ↑5 ./repo.feature ..│- │* d2cf233 1d (feature) Add file 5 with important changes- │* 996c924 1d Add file 4 with important changes- │* a2eefed 1d Add file 3 with important changes- │* 1c1106b 1d Add file 2 with important changes- │* 0602185 1d Add file 1 with important changes- │* 23e5a15 1d Initial commit+ │* 4ac610b 1d (feature) Add file 5 with important changes+ │* f68805a 1d Add file 4 with important changes+ │* ae793ef 1d Add file 3 with important changes+ │* 258fa75 1d Add file 2 with important changes+ │* d3b6cb8 1d Add file 1 with important changes+ │* a1e809f 1d Initial commit│││diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex d1488dc9a..fb24f91fd 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap@@ -8,6 +8,7 @@ info:- main- "--no-remove"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,18 +16,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snapindex 2dc2b651c..35a74acd2 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap@@ -30,8 +30,8 @@ exit_code: 0Set-Location '[PATH]'----- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 8e8b55827..55f4c0436 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -7,6 +7,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,8 +30,8 @@ exit_code: 0cd '[PATH]'----- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snapindex 6ee9473e0..b813f0907 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap@@ -10,6 +10,7 @@ info:- status- "--short"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -17,10 +18,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,6 +33,5 @@ exit_code: 0----- stderr -----🔄 [36mRunning in [1mmain[22m...[39m-warning: untracked cache is disabled on this system or location✅ [32mCompleted in 1 worktree[39mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snapindex e48369e18..d574a664a 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap@@ -10,6 +10,7 @@ info:- status- "--short"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -17,10 +18,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,7 +33,6 @@ exit_code: 0----- stderr -----🔄 [36mRunning in [1mmain[22m...[39m-warning: untracked cache is disabled on this system or location🔄 [36mRunning in [1m(detached)[22m...[39m✅ [32mCompleted in 2 worktrees[39mdiff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snapindex 7d18aed71..092c163c2 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap@@ -6,6 +6,7 @@ info:- "--internal"- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,6 +29,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 953ab9845..8a5d85208 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap@@ -6,6 +6,7 @@ info:- list- "--branches"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,7 +29,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mbranch-only[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mbranch-only[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktrees, 1 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snapindex 182782cc5..6976b7f03 100644--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mdevelop[0m [31m⚑[39m[2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mdevelop[0m [31m⚑[39m[2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 08611ae05..263c53b8e 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1m-[0m [31m⚑[39m[2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1m-[0m [31m⚑[39m[2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snapindex 392272f7e..8fea10004 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2m-[0m [31m⚑[39m[2m_[22m [2m./repo.feature[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2m-[0m [31m⚑[39m[2m_[22m [2m./repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snapindex f437a07a3..06eceb4ca 100644--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap@@ -6,6 +6,7 @@ info:- list- "--format=json"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,8 +32,8 @@ exit_code: 0"path": "[REPO]","kind": "worktree","commit": {- "sha": "ede2fd3bb9c1e19c7b803c11c0648d0b6d335ea2",- "short_sha": "ede2fd3",+ "sha": "33c3e5aa9f928d3eab87da8cbcd187e2ab921064",+ "short_sha": "33c3e5a","message": "Same content on main","timestamp": 0},@@ -62,8 +67,8 @@ exit_code: 0"path": "[REPO].feature-merged","kind": "worktree","commit": {- "sha": "034aef5b37347d10e770bb86865c148124ff8546",- "short_sha": "034aef5",+ "sha": "ee45656141f6f30e6e036767adf380b3ccc639d7",+ "short_sha": "ee45656","message": "Merge main into feature","timestamp": 0},diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snapindex a3e5cd189..9399a1885 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap@@ -6,6 +6,7 @@ info:- list- "--format=json"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,8 +32,8 @@ exit_code: 0"path": "[REPO]","kind": "worktree","commit": {- "sha": "2c97a38e97cba7ea1d95d6c8b948b0cf5199fc79",- "short_sha": "2c97a38",+ "sha": "4803e9416c19681b83017135ac3a8c1b04898868",+ "short_sha": "4803e94","message": "Main commit 2","timestamp": 0},@@ -62,8 +67,8 @@ exit_code: 0"path": "[REPO].feature-ahead","kind": "worktree","commit": {- "sha": "13797c6a6136f965d1186fdb1f4fa2de2707df6d",- "short_sha": "13797c6",+ "sha": "1080181c245695ed0d64aba6b0b0b7c0bfff9530",+ "short_sha": "1080181","message": "Feature commit 2","timestamp": 0},@@ -96,8 +101,8 @@ exit_code: 0"path": "[REPO].feature-behind","kind": "worktree","commit": {- "sha": "98ef56c1ce6de2d5c942729c2be35461c4441a8a",- "short_sha": "98ef56c",+ "sha": "b8b9f4453f95a585105de3ae3439d8017dee67f3",+ "short_sha": "b8b9f44","message": "Initial commit on main","timestamp": 0},diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snapindex fca5e1dbd..252906477 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap@@ -6,6 +6,7 @@ info:- list- "--format=json"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,8 +32,8 @@ exit_code: 0"path": "[REPO]","kind": "worktree","commit": {- "sha": "3109da74e45839c90409a6e4774cdf0bae50a284",- "short_sha": "3109da7",+ "sha": "33244e69fc0c568ce7cffd49b04c9c89ffb22510",+ "short_sha": "33244e6","message": "Main conflicting changes","timestamp": 0},@@ -62,8 +67,8 @@ exit_code: 0"path": "[REPO].feature","kind": "worktree","commit": {- "sha": "3109da74e45839c90409a6e4774cdf0bae50a284",- "short_sha": "3109da7",+ "sha": "33244e69fc0c568ce7cffd49b04c9c89ffb22510",+ "short_sha": "33244e6","message": "Main conflicting changes","timestamp": 0},diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex 605e996d4..f10398f91 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -6,6 +6,7 @@ info:- list- "--format=json"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,8 +32,8 @@ exit_code: 0"path": "[REPO]","kind": "worktree","commit": {- "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",- "short_sha": "23e5a15",+ "sha": "a1e809f511b21ee516412a4520497f0cea4af366",+ "short_sha": "a1e809f","message": "Initial commit","timestamp": 0},@@ -62,8 +67,8 @@ exit_code: 0"path": "[REPO].feature-detached","kind": "worktree","commit": {- "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",- "short_sha": "23e5a15",+ "sha": "a1e809f511b21ee516412a4520497f0cea4af366",+ "short_sha": "a1e809f","message": "Initial commit","timestamp": 0},@@ -100,8 +105,8 @@ exit_code: 0"path": "[REPO].locked-feature","kind": "worktree","commit": {- "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",- "short_sha": "23e5a15",+ "sha": "a1e809f511b21ee516412a4520497f0cea4af366",+ "short_sha": "a1e809f","message": "Initial commit","timestamp": 0},diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snapindex 0ad2fd53c..34a4618a7 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap@@ -6,6 +6,7 @@ info:- list- "--format=json"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,8 +32,8 @@ exit_code: 0"path": "[REPO]","kind": "worktree","commit": {- "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",- "short_sha": "002eabd",+ "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",+ "short_sha": "a058e79","message": "Initial commit","timestamp": 0},@@ -62,8 +67,8 @@ exit_code: 0"path": "[REPO].with-status","kind": "worktree","commit": {- "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",- "short_sha": "002eabd",+ "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",+ "short_sha": "a058e79","message": "Initial commit","timestamp": 0},@@ -100,8 +105,8 @@ exit_code: 0"path": "[REPO].without-status","kind": "worktree","commit": {- "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",- "short_sha": "002eabd",+ "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",+ "short_sha": "a058e79","message": "Initial commit","timestamp": 0},diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex db096e556..a3e59526e 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ diverged [36m![39m [2m↑[22m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./repo.diverged [2mb5af29ef[0m [2m1d[0m [2mDiverged commit-+ feature-changes [36m![39m[36m?[39m [2m↑[22m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./repo.feature-changes [2mc22cc0ea[0m [2m1d[0m [2mAdd 100 lines-+ [2mfix[0m [36m?[39m [2m_[22m 💬 [2m./repo.fix[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ diverged [36m![39m [2m↑[22m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./repo.diverged [2ma86ce3fb[0m [2m1d[0m [2mDiverged commit++ 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++ [2mfix[0m [36m?[39m [2m_[22m 💬 [2m./repo.fix[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktrees, 2 with changes, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 46a695800..4950bd81a 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,10 +28,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mfeature-current[0m [2m↑[22m [32m↑1[0m [1m./repo.feature-current[0m [2m0a3c2673[0m [2m23h[0m [2mCommit at 01:00-^ main [2m^[22m ./repo [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main-+ feature-newest [2m↑[22m [32m↑1[0m ./repo.feature-newest [2mfecd7fba[0m [2m21h[0m [2mCommit at 03:00-+ feature-middle [2m↑[22m [32m↑1[0m ./repo.feature-middle [2mb3bdc202[0m [2m22h[0m [2mCommit at 02:00-+ feature-oldest [2m↑[22m [32m↑1[0m ./repo.feature-oldest [2m4e1d6a2d[0m [2m23h[0m [2mCommit at 00:30+@ [1mfeature-current[0m [2m↑[22m [32m↑1[0m [1m./repo.feature-current[0m [2m431987e2[0m [2m23h[0m [2mCommit at 01:00+^ main [2m^[22m ./repo [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main++ feature-newest [2m↑[22m [32m↑1[0m ./repo.feature-newest [2m721211d9[0m [2m21h[0m [2mCommit at 03:00++ feature-middle [2m↑[22m [32m↑1[0m ./repo.feature-middle [2ma84219ce[0m [2m22h[0m [2mCommit at 02:00++ feature-oldest [2m↑[22m [32m↑1[0m ./repo.feature-oldest [2m9777b5e4[0m [2m23h[0m [2mCommit at 00:30⚪ [2mShowing 5 worktrees, 4 aheaddiff --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.snapindex 60624189c..1da4d8ddf 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,8 +28,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mdevelop[0m [31m⚑[39m[2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mdevelop[0m [31m⚑[39m[2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex e3ab2ad0c..60a927dd0 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@@ -19,8 +19,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex cb9d3efb4..30e6e1239 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mlocked-no-reason[0m [33m⊞[39m[2m_[22m [2m./repo.locked-no-reason[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mlocked-no-reason[0m [33m⊞[39m[2m_[22m [2m./repo.locked-no-reason[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex 799565930..97baaec75 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mlocked-feature[0m [33m⊞[39m[2m_[22m [2m./repo.locked-feature[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mlocked-feature[0m [33m⊞[39m[2m_[22m [2m./repo.locked-feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex a9c978c71..eca9bff5a 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2me255c04f[0m [2m1d[0m [2mShort message-+ [2mfeature-a[0m [2m⊂[22m [2m[31m↓1[0m [2m./repo.feature-a[0m [2m706db1c1[0m [2m1d[0m [2mThis is a very long commit message that should test how the…+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mc80da958[0m [2m1d[0m [2mShort message++ [2mfeature-a[0m [2m⊂[22m [2m[31m↓1[0m [2m./repo.feature-a[0m [2m0fcd1a46[0m [2m1d[0m [2mThis is a very long commit message that should test how the…⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 1ab8f6dd0..56248326e 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,10 +28,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mmedium-name[0m [2m_[22m [2m./repo.medium-name[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mshort[0m [2m_[22m [2m./repo.short[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mvery-long-branch-name-here[0m [2m_[22m [2m./repo.very-long-branch-name-here[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mwith-changes[0m [2m_[22m [2m./repo.with-changes[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mmedium-name[0m [2m_[22m [2m./repo.medium-name[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mshort[0m [2m_[22m [2m./repo.short[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mvery-long-branch-name-here[0m [2m_[22m [2m./repo.very-long-branch-name-here[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mwith-changes[0m [2m_[22m [2m./repo.with-changes[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 5 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 2f9dd0294..cb547af64 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -29,7 +29,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-@ [1mmain[0m [2m^[22m[2m⇡[22m [1m./repo[0m [32m⇡1[0m [2m7bfbaf47[0m [2m1d[0m [2mMain advances-+ feature [36m+[39m[36m![39m[36m?[39m[33m⊞[39m[33m✗[39m[2m⇅[22m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m63aaaeb2[0m [2m1d[0m [2mLocal commit+@ [1mmain[0m [2m^[22m[2m⇡[22m [1m./repo[0m [32m⇡1[0m [2m9dd6c628[0m [2m1d[0m [2mMain advances++ feature [36m+[39m[36m![39m[36m?[39m[33m⊞[39m[33m✗[39m[2m⇅[22m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m88205002[0m [2m1d[0m [2mLocal commit⚪ [2mShowing 2 worktrees, 1 with changes, 1 aheaddiff --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.snapindex 9af7e54db..3bb2c71f8 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@@ -29,7 +29,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-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m966ac172[0m [2m1d[0m [2mMain conflicting changes-+ feature [36m+[39m[36m![39m[36m?[39m[31m✘[39m 🤖 [32m+7[0m ./repo.feature [2m966ac172[0m [2m1d[0m [2mMain conflicting changes+@ [1mmain[0m [2m^[22m [1m./repo[0m [2m1c3b3fec[0m [2m1d[0m [2mMain conflicting changes++ feature [36m+[39m[36m![39m[36m?[39m[31m✘[39m 🤖 [32m+7[0m ./repo.feature [2m1c3b3fec[0m [2m1d[0m [2mMain conflicting changes⚪ [2mShowing 2 worktrees, 1 with changesdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snapindex 50184e079..558f97e62 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ feature [36m+[39m[36m![39m[36m?[39m [2m↑[22m [32m+2[0m [31m-3[0m [32m↑1[0m ./repo.feature [2mbeeae57b[0m [2m1d[0m [2mAdd files+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ feature [36m+[39m[36m![39m[36m?[39m [2m↑[22m [32m+2[0m [31m-3[0m [32m↑1[0m ./repo.feature [2m095602ce[0m [2m1d[0m [2mAdd files⚪ [2mShowing 2 worktrees, 1 with changes, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex e5f2d90b5..c0c3dbaf7 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,8 +28,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex de1949f9f..4c73c656e 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -6,6 +6,7 @@ info:- list- "--no-progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,7 +29,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snapindex b674e7a59..9f32a05d6 100644--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-- [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+- [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex ca9182abd..7de6440b7 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,8 +29,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex 85a530581..6dcf0f753 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -7,6 +7,7 @@ info:- "--progressive"- "--branches"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,9 +30,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morphan-1[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morphan-2[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morphan-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morphan-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktrees, 2 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snapindex d5db0e947..648b834e4 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "115"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,8 +28,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [1m./repo.feature-api[0m [32m⇡3[0m [2md35485d7[0m [2m30m[0m [2mAdd API tests-^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [2me18e1b4d[0m [2m4d[0m [2mMerge fix-auth:…-+ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m ./repo.fix-auth [2m|[0m [2m2517d700[0m [2m5h[0m [2mAdd secure token…+@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [1m./repo.feature-api[0m [32m⇡3[0m [2mec97decc[0m [2m30m[0m [2mAdd API tests+^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [2m6088adb3[0m [2m4d[0m [2mMerge fix-auth:…++ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m ./repo.fix-auth [2m|[0m [2m127407de[0m [2m5h[0m [2mAdd secure token…⚪ [2mShowing 3 worktrees, 1 with changes, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snapindex 8f6f2f0c5..35df6f87c 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@@ -30,10 +30,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge-@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2md35485d7[0m [2m30m-^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2me18e1b4d[0m [2m4d-+ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m2517d700[0m [2m5h- exp [2m/[22m[2m↕[22m [32m↑2[0m [2m[31m↓1[0m [32m+137[0m [2m52cad122[0m [2m2d- wip [2m/[22m[2m↕[22m [32m↑1[0m [2m[31m↓1[0m [32m+33[0m [2m7ca6d817[0m [2m3d+@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2mec97decc[0m [2m30m+^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m6088adb3[0m [2m4d++ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m127407de[0m [2m5h+ exp [2m/[22m[2m↕[22m [32m↑2[0m [2m[31m↓1[0m [32m+137[0m [2m99e114de[0m [2m2d+ wip [2m/[22m[2m↕[22m [32m↑1[0m [2m[31m↓1[0m [32m+33[0m [2md62fd0e8[0m [2m3d⚪ [2mShowing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snapindex 895937a26..64aad8b6c 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@@ -29,8 +29,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge-@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2md35485d7[0m [2m30m-^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2me18e1b4d[0m [2m4d-+ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m2517d700[0m [2m5h+@ [1mfeature-api[0m [36m+[39m [2m↕[22m[2m⇡[22m [32m+54[0m [31m-5[0m [32m↑4[0m [2m[31m↓1[0m [32m+234[0m [31m-24[0m [1m./repo.feature-api[0m [32m⇡3[0m [2m[34m●[0m [2mec97decc[0m [2m30m+^ main [2m^[22m[2m⇅[22m ./repo [32m⇡1[0m [2m[31m⇣1[0m [32m●[0m [2m6088adb3[0m [2m4d++ fix-auth [2m↕[22m[2m|[22m [32m↑2[0m [2m[31m↓1[0m [32m+25[0m [31m-11[0m ./repo.fix-auth [2m|[0m [32m●[0m [2m127407de[0m [2m5h⚪ [2mShowing 3 worktrees, 1 with changes, 2 ahead, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex e36bb8a39..68026737e 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snapindex 50d29e5b6..91aa24f9f 100644--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ main-symbol [2m↑[22m 💬 [32m↑1[0m ./repo.main-symbol [2m8640e085[0m [2m1d[0m [2mSymbol commit-+ pr-link [2m↑[22m 🤖 [32m↑1[0m ./repo.pr-link [2me276c9d3[0m [2m1d[0m [2mPR commit-+ wli-sequence [36m![39m[36m?[39m [2m↑[22m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./repo.wli-sequence [2m9bb9b94c[0m [2m1d[0m [2mInitial content+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ main-symbol [2m↑[22m 💬 [32m↑1[0m ./repo.main-symbol [2mb69fe20d[0m [2m1d[0m [2mSymbol commit++ pr-link [2m↑[22m 🤖 [32m↑1[0m ./repo.pr-link [2mf42f2185[0m [2m1d[0m [2mPR commit++ wli-sequence [36m![39m[36m?[39m [2m↑[22m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./repo.wli-sequence [2mc73070d4[0m [2m1d[0m [2mInitial content⚪ [2mShowing 4 worktrees, 1 with changes, 3 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snapindex 06a70c5f3..e639f1dc2 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,6 +29,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1m-[0m [31m⚑[39m[2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1m-[0m [31m⚑[39m[2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --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 c004c4a0c..529b7b5d4 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@@ -30,8 +30,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-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [36m?[39m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ feature-b [2m↑[22m [32m↑1[0m [32m+1[0m [31m-1[0m ./repo.feature-b [2ma1aff845[0m [2m1d[0m [2mTest commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [36m?[39m [2m_[22m [2m./repo.feature-a[0m [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 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex efc4a669f..c763d0d3a 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,16 +29,16 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-1[0m [2m_[22m [2m./repo.feature-1[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-10[0m [2m_[22m [2m./repo.feature-10[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-2[0m [2m_[22m [2m./repo.feature-2[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-3[0m [2m_[22m [2m./repo.feature-3[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-4[0m [2m_[22m [2m./repo.feature-4[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-5[0m [2m_[22m [2m./repo.feature-5[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-6[0m [2m_[22m [2m./repo.feature-6[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-7[0m [2m_[22m [2m./repo.feature-7[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-8[0m [2m_[22m [2m./repo.feature-8[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-9[0m [2m_[22m [2m./repo.feature-9[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-1[0m [2m_[22m [2m./repo.feature-1[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-10[0m [2m_[22m [2m./repo.feature-10[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-2[0m [2m_[22m [2m./repo.feature-2[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-3[0m [2m_[22m [2m./repo.feature-3[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-4[0m [2m_[22m [2m./repo.feature-4[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-5[0m [2m_[22m [2m./repo.feature-5[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-6[0m [2m_[22m [2m./repo.feature-6[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-7[0m [2m_[22m [2m./repo.feature-7[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-8[0m [2m_[22m [2m./repo.feature-8[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-9[0m [2m_[22m [2m./repo.feature-9[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 11 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex 86dfa7cc4..af301d0fa 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,9 +29,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-c[0m [2m_[22m [2m./repo.feature-c[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-c[0m [2m_[22m [2m./repo.feature-c[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snapindex aad852715..f51154293 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@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,10 +29,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mfeature-current[0m [2m↑[22m [32m↑1[0m [1m./repo.feature-current[0m [2m0a3c2673[0m [2m23h[0m [2mCommit at 01:00-^ main [2m^[22m ./repo [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main-+ feature-newest [2m↑[22m [32m↑1[0m ./repo.feature-newest [2mfecd7fba[0m [2m21h[0m [2mCommit at 03:00-+ feature-middle [2m↑[22m [32m↑1[0m ./repo.feature-middle [2mb3bdc202[0m [2m22h[0m [2mCommit at 02:00-+ feature-oldest [2m↑[22m [32m↑1[0m ./repo.feature-oldest [2m4e1d6a2d[0m [2m23h[0m [2mCommit at 00:30+@ [1mfeature-current[0m [2m↑[22m [32m↑1[0m [1m./repo.feature-current[0m [2m431987e2[0m [2m23h[0m [2mCommit at 01:00+^ main [2m^[22m ./repo [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main++ feature-newest [2m↑[22m [32m↑1[0m ./repo.feature-newest [2m721211d9[0m [2m21h[0m [2mCommit at 03:00++ feature-middle [2m↑[22m [32m↑1[0m ./repo.feature-middle [2ma84219ce[0m [2m22h[0m [2mCommit at 02:00++ feature-oldest [2m↑[22m [32m↑1[0m ./repo.feature-oldest [2m9777b5e4[0m [2m23h[0m [2mCommit at 00:30⚪ [2mShowing 5 worktrees, 4 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snapindex 1c56736aa..70649ec0c 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,6 +29,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex 438f649f9..77104daed 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap@@ -6,6 +6,7 @@ info:- list- "--progressive"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,8 +29,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mlocked[0m [33m⊞[39m[2m_[22m [2m./repo.locked[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mnormal[0m [2m_[22m [2m./repo.normal[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mlocked[0m [33m⊞[39m[2m_[22m [2m./repo.locked[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mnormal[0m [2m_[22m [2m./repo.normal[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --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 4a73fc2fd..ee93e8d3c 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@@ -30,8 +30,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-@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main-+ ahead [2m↑[22m[2m⇡[22m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2m52e3cac0[0m [2m1d[0m [2mAhead commit-+ [2min-sync[0m [2m_[22m[2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main+@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main++ ahead [2m↑[22m[2m⇡[22m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2ma66d3071[0m [2m1d[0m [2mAhead commit++ [2min-sync[0m [2m_[22m[2m|[22m [2m./repo.in-sync[0m [2m|[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main⚪ [2mShowing 3 worktrees, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex ebc4e6560..9f72625ac 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m6129b674[0m [2m1d[0m [2mFix bug with café ☕ handling-+ [2mfeature-test[0m [2m⊂[22m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m18096b4b[0m [2m1d[0m [2mAdd support for 日本語 and émoji 🎉+@ [1mmain[0m [2m^[22m [1m./repo[0m [2md167d3cc[0m [2m1d[0m [2mFix bug with café ☕ handling++ [2mfeature-test[0m [2m⊂[22m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m96b95eab[0m [2m1d[0m [2mAdd support for 日本語 and émoji 🎉⚪ [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snapindex 26fe270a4..741c303a0 100644--- a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap+++ b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,8 +28,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2memoji[0m [2m_[22m 🔄 [2m./repo.emoji[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mmulti[0m [2m_[22m 👨💻 [2m./repo.multi[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2memoji[0m [2m_[22m 🔄 [2m./repo.emoji[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mmulti[0m [2m_[22m 👨💻 [2m./repo.multi[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 4e0aca8a1..63d37a565 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -6,6 +6,7 @@ info:- list- "--branches"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,10 +29,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2manother-branch[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mfeature-without-worktree[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mfix-bug[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2manother-branch[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-without-worktree[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfix-bug[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktrees, 3 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snapindex 325c54884..e72e0e736 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap@@ -6,6 +6,7 @@ info:- list- "--branches"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,8 +29,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snapindex d7cd9fcbe..7601670cf 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap@@ -6,6 +6,7 @@ info:- list- "--branches"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,9 +29,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mbranch-alpha[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mbranch-beta[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mbranch-gamma[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mbranch-alpha[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mbranch-beta[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mbranch-gamma[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktrees, 3 branchesdiff --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 2181bbecb..d765691d8 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@@ -7,6 +7,7 @@ info:- "--branches"- "--remotes"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,10 +30,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mlocal-only-1[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mlocal-only-2[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morigin/remote-only-1[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morigin/remote-only-2[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mlocal-only-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mlocal-only-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morigin/remote-only-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morigin/remote-only-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktrees, 2 branches, 2 remote branchesdiff --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 d06c551a9..fdf815ff7 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@@ -6,6 +6,7 @@ info:- list- "--remotes"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,8 +29,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morigin/remote-only[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morigin/remote-only[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 2 worktrees, 1 remote branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex 05cc96876..863aab31f 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap@@ -6,6 +6,7 @@ info:- list- "--remotes"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,8 +29,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morigin/remote-feature-1[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2morigin/remote-feature-2[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morigin/remote-feature-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2morigin/remote-feature-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktrees, 2 remote branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 2f6a5d08a..5ed88e815 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -7,6 +7,7 @@ info:- "--branches"- "--full"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,11 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -26,11 +30,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-@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main-+ ahead [2m↑[22m[2m⇡[22m [32m↑2[0m [32m+2[0m ./repo.ahead [32m⇡2[0m [2ma7df60e1[0m [2m1d[0m [2mAhead commit 2-+ [2mbehind[0m [2m_[22m[2m⇣[22m [2m./repo.behind[0m [2m[31m⇣1[0m [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main-+ diverged [2m↑[22m[2m⇅[22m [32m↑1[0m [32m+1[0m ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [2m26606aa3[0m [2m1d[0m [2mDiverged local commit-+ [2min-sync[0m [2m_[22m[2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main-+ [2mno-upstream[0m [2m_[22m [2m./repo.no-upstream[0m [2m98ef56c1[0m [2m1d[0m [2mInitial commit on main+@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main++ ahead [2m↑[22m[2m⇡[22m [32m↑2[0m [32m+2[0m ./repo.ahead [32m⇡2[0m [2m9c8b56b3[0m [2m1d[0m [2mAhead commit 2++ [2mbehind[0m [2m_[22m[2m⇣[22m [2m./repo.behind[0m [2m[31m⇣1[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main++ diverged [2m↑[22m[2m⇅[22m [32m↑1[0m [32m+1[0m ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [2m3b16f5c5[0m [2m1d[0m [2mDiverged local commit++ [2min-sync[0m [2m_[22m[2m|[22m [2m./repo.in-sync[0m [2m|[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main++ [2mno-upstream[0m [2m_[22m [2m./repo.no-upstream[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main⚪ [2mShowing 6 worktrees, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snapindex 9cce272e7..3defb4e40 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m002eabd0[0m [2m1d[0m [2mInitial commit-+ feature-api [2m↑[22m 🤖 [32m↑1[0m ./repo.feature-api [2m2f045483[0m [2m1d[0m [2mAdd REST API endpoints-+ review-ui [36m?[39m [2m↑[22m 💬 [32m↑1[0m ./repo.review-ui [2mb8c11f99[0m [2m1d[0m [2mAdd dashboard component-+ [2mwip-docs[0m [36m?[39m [2m_[22m [2m./repo.wip-docs[0m [2m002eabd0[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma058e792[0m [2m1d[0m [2mInitial commit++ feature-api [2m↑[22m 🤖 [32m↑1[0m ./repo.feature-api [2m95e48b49[0m [2m1d[0m [2mAdd REST API endpoints++ review-ui [36m?[39m [2m↑[22m 💬 [32m↑1[0m ./repo.review-ui [2m46b6a187[0m [2m1d[0m [2mAdd dashboard component++ [2mwip-docs[0m [36m?[39m [2m_[22m [2m./repo.wip-docs[0m [2ma058e792[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktrees, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snapindex 07c35bbf6..3e01b8759 100644--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap@@ -28,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ test [36m![39m[36m?[39m [2m↑[22m [32m+1[0m [31m-1[0m [32m↑1[0m ./repo.test [2m34f7b918[0m [2m1d[0m [2mTest+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ test [36m![39m[36m?[39m [2m↑[22m [32m+1[0m [31m-1[0m [32m↑1[0m ./repo.test [2m689d5d16[0m [2m1d[0m [2mTest⚪ [2mShowing 2 worktrees, 1 with changes, 1 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 b3744bf13..85ecaa369 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@@ -28,8 +28,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ complex [36m+[39m [36m?[39m [2m↑[22m [32m+1[0m [31m-1[0m [32m↑1[0m ./repo.complex [2ma9d67c29[0m [2m1d[0m [2mComplex-+ simple [36m?[39m [2m↑[22m [32m↑1[0m ./repo.simple [2m9ce20ca0[0m [2m1d[0m [2mSimple+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ 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 aheaddiff --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.snapindex 639e45e5a..70c34368c 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@@ -16,6 +16,7 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -27,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snapindex cc8ac121c..ed8ea46fb 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap@@ -17,6 +17,7 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,7 +29,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit- [2mfeature[0m [2m/[22m[2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktrees, 1 branchesdiff --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.snapindex 639e45e5a..70c34368c 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@@ -16,6 +16,7 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -27,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --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.snapindex 639e45e5a..70c34368c 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@@ -16,6 +16,7 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -27,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snapindex 639e45e5a..70c34368c 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@@ -16,6 +16,7 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -27,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 32fe40095..2e117d771 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,12 +29,12 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ e997a6b[22m+💡 [2mBackup created @ 14fc72d[22m🔄 [36mGenerating squash commit message...[39m[107m [0m [1mfix: update file 1 content[22m-✅ [32mSquashed @ [2m735173c[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m735173c[22m (no rebase needed)[39m-[107m [0m * [33m735173c[m fix: update file 1 content+✅ [32mSquashed @ [2mf1c474c[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mf1c474c[22m (no rebase needed)[39m+[107m [0m * [33mf1c474c[m fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 29f6d34d3..4f2d52a2f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,16 +29,16 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ 0b230e0[22m+💡 [2mBackup created @ 183cc8b[22m🔄 [36mGenerating squash commit message...[39m💡 [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: initial feature-✅ [32mSquashed @ [2m760ba6d[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m760ba6d[22m (no rebase needed)[39m-[107m [0m * [33m760ba6d[m Squash commits from main+✅ [32mSquashed @ [2md3582c0[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md3582c0[22m (no rebase needed)[39m+[107m [0m * [33md3582c0[m Squash commits from main[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex 3584c4622..03b91b445 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -24,12 +29,12 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ 174c6c4[22m+💡 [2mBackup created @ 5e120d3[22m🔄 [36mGenerating squash commit message...[39m[107m [0m [1mfix: improve auth validation logic[22m-✅ [32mSquashed @ [2m0b55555[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m0b55555[22m (no rebase needed)[39m-[107m [0m * [33m0b55555[m fix: improve auth validation logic+✅ [32mSquashed @ [2m88fed03[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m88fed03[22m (no rebase needed)[39m+[107m [0m * [33m88fed03[m fix: improve auth validation logic[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex dca532455..04cc468b2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,9 +33,9 @@ exit_code: 0🔄 [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m💡 [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m[107m [0m [1mChanges to dirty.txt[22m-✅ [32mCommitted changes @ [2ma73fb89[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2ma73fb89[22m (no rebase needed)[39m-[107m [0m * [33ma73fb89[m Changes to dirty.txt+✅ [32mCommitted changes @ [2mb44b09f[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mb44b09f[22m (no rebase needed)[39m+[107m [0m * [33mb44b09f[m Changes to dirty.txt[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex a855e45c5..05d43b5a7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snapindex 551671133..5e5e6fdf0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap@@ -8,6 +8,7 @@ info:- "--no-commit"- "--no-remove"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,10 +16,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1@@ -26,6 +31,6 @@ exit_code: 1----- stderr -----❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m-[107m [0m * [33mfd8f601[m Add main file+[107m [0m * [33m1b32c68[m Add main file💡 [2mRun [90mwt merge[39m again to incorporate these changes[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex adad00483..8fd4cc8d3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,9 +33,9 @@ exit_code: 0🔄 [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m💡 [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m[107m [0m [1mChanges to newfile.txt[22m-✅ [32mCommitted changes @ [2m4b94530[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m4b94530[22m (no rebase needed)[39m-[107m [0m * [33m4b94530[m Changes to newfile.txt+✅ [32mCommitted changes @ [2mbbcee27[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mbbcee27[22m (no rebase needed)[39m+[107m [0m * [33mbbcee27[m Changes to newfile.txt[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 924b8279c..52f94b4ea 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -5,6 +5,7 @@ info:args:- mergeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,18 +13,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex bb8c67a20..251657226 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -7,6 +7,7 @@ info:- main- "--no-squash"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,19 +15,23 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 2 commits to [1mmain[22m @ [2m1c5f30c[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m1c5f30c[m feat: add file 2-[107m [0m * [33mb795264[m feat: add file 1+🔄 [36mMerging 2 commits to [1mmain[22m @ [2mf0d31ff[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mf0d31ff[m feat: add file 2+[107m [0m * [33m65fe669[m feat: add file 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 12da59f74..f6e699c6f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m83771b6[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m83771b6[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m430212e[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m430212e[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex a91e12c1b..a84c4fd3a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap@@ -29,8 +29,8 @@ exit_code: 1----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2mb979f04[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mb979f04[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m623e1f1[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m623e1f1[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snapindex 7787a0efb..5bf8c8063 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2mf907cce[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mf907cce[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m40d535b[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m40d535b[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snapindex 2c5fbac3c..189110ca8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap@@ -8,6 +8,7 @@ info:- "--force"- "--no-verify"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,18 +16,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2md553927[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33md553927[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m75e8546[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m75e8546[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex cd3ddec62..62cf38f20 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2md553927[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33md553927[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m75e8546[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m75e8546[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex eb34b1eec..4aaea5531 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -32,9 +37,9 @@ exit_code: 0🔄 [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m💡 [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m[107m [0m [1mChanges to feature.txt[22m-✅ [32mCommitted changes @ [2m544fecb[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m544fecb[22m (no rebase needed)[39m-[107m [0m * [33m544fecb[m Changes to feature.txt+✅ [32mCommitted changes @ [2mfce4243[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfce4243[22m (no rebase needed)[39m+[107m [0m * [33mfce4243[m Changes to feature.txt[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex a16f647dd..503ed3034 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -30,8 +35,8 @@ exit_code: 0[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m🔄 [36mRunning project pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m56c009e[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m56c009e[m Add feature file+[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m4a48dbd[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m4a48dbd[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex 005d5ef4d..3bb2ba0c3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -7,6 +7,7 @@ info:- main- "--no-verify"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m959ea18[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m959ea18[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2ma3a6eaf[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33ma3a6eaf[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snapindex d1680437a..1b83da7ee 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -26,8 +31,8 @@ exit_code: 0----- stderr -----🔄 [36mRunning project pre-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m0ceef32[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m0ceef32[m Add feature file+[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m4f5863f[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m4f5863f[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snapindex e4c465f48..82259a8b9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,8 +32,8 @@ exit_code: 0🔄 [36mRunning project pre-commit:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mPre-commit check passed-🔄 [36mMerging 1 commit to [1mmain[22m @ [2md4561b9[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33md4561b9[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mef627f5[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mef627f5[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex 42a964642..306a4aa1f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex b7182f913..2cd32f5eb 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,8 +30,8 @@ exit_code: 0----- stderr -----🔄 [36mRebasing onto [1mmain[22m...[39m✅ [32mRebased onto [1mmain[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m5a61dea[22m (no commit/squash needed)[39m-[107m [0m * [33m5a61dea[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2meadc502[22m (no commit/squash needed)[39m+[107m [0m * [33meadc502[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snapindex 44999e076..0c21149b2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap@@ -7,6 +7,7 @@ info:- main- "--no-remove"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 467cd096d..a34b96200 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1@@ -26,7 +31,7 @@ exit_code: 1🔄 [36mRebasing onto [1mmain[22m...[39m❌ [31mRebase onto [1mmain[22m incomplete[39m[107m [0m Rebasing (1/1)-[107m [0m error: could not apply e1cf9a1... Update shared.txt in feature-[107m [0m Could not apply e1cf9a1... # Update shared.txt in feature+[107m [0m error: could not apply bed6661... Update shared.txt in feature+[107m [0m Could not apply bed6661... # Update shared.txt in feature[107m [0m Auto-merging shared.txt[107m [0m CONFLICT (content): Merge conflict in shared.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snapindex 8464c5e9c..5e7d59821 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,8 +30,8 @@ exit_code: 0----- stderr -----🔄 [36mRebasing onto [1mmain[22m...[39m✅ [32mRebased onto [1mmain[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m0bb882f[22m (no commit/squash needed)[39m-[107m [0m * [33m0bb882f[m Add feature+🔄 [36mMerging 1 commit to [1mmain[22m @ [2ma5e5492[22m (no commit/squash needed)[39m+[107m [0m * [33ma5e5492[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex fba801031..172204103 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -32,9 +37,9 @@ exit_code: 0[107m [0m - feat: add file 1[107m [0m - fix: update logic[107m [0m - docs: update readme-✅ [32mSquashed @ [2mdd1e5fd[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2mdd1e5fd[22m (no rebase needed)[39m-[107m [0m * [33mdd1e5fd[m Squash commits from main+✅ [32mSquashed @ [2maf8c227[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2maf8c227[22m (no rebase needed)[39m+[107m [0m * [33maf8c227[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex d41c0cbdd..2af2a09f6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2me26db67[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33me26db67[m feat: single commit+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mc2e3582[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mc2e3582[m feat: single commit[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 000bf7293..3d2a93a5b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -26,9 +31,9 @@ exit_code: 0🔄 [36mSquashing 2 commits into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m🔄 [36mGenerating squash commit message...[39m[107m [0m [1mfeat: implement user authentication system[22m-✅ [32mSquashed @ [2ma0c80b0[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2ma0c80b0[22m (no rebase needed)[39m-[107m [0m * [33ma0c80b0[m feat: implement user authentication system+✅ [32mSquashed @ [2m785d1ff[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m785d1ff[22m (no rebase needed)[39m+[107m [0m * [33m785d1ff[m feat: implement user authentication system[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex 3d36ff827..238a5c778 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,12 +14,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update files"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -26,12 +31,12 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ e997a6b[22m+💡 [2mBackup created @ 14fc72d[22m🔄 [36mGenerating squash commit message...[39m[107m [0m [1mfix: update files[22m-✅ [32mSquashed @ [2m06dba69[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m06dba69[22m (no rebase needed)[39m-[107m [0m * [33m06dba69[m fix: update files+✅ [32mSquashed @ [2m257ac9f[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m257ac9f[22m (no rebase needed)[39m+[107m [0m * [33m257ac9f[m fix: update files[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 924b8279c..52f94b4ea 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -5,6 +5,7 @@ info:args:- mergeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,18 +13,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snapindex 247c1082e..07ec38673 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap@@ -6,6 +6,7 @@ info:- merge- stagingenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,8 +30,8 @@ exit_code: 0----- stderr -----🔄 [36mRebasing onto [1mstaging[22m...[39m✅ [32mRebased onto [1mstaging[22m[39m-🔄 [36mMerging 1 commit to [1mstaging[22m @ [2m4240724[22m (no commit/squash needed)[39m-[107m [0m * [33m4240724[m Add feature for staging+🔄 [36mMerging 1 commit to [1mstaging[22m @ [2m278a642[22m (no commit/squash needed)[39m+[107m [0m * [33m278a642[m Add feature for staging[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snapindex a855e45c5..05d43b5a7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex 9575725d5..d01870604 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -6,6 +6,7 @@ info:- merge- ^env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex 44999e076..0c21149b2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap@@ -7,6 +7,7 @@ info:- main- "--no-remove"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m3cf9bf5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex a8ee1259d..db6981e9d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,12 +14,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -29,12 +34,12 @@ exit_code: 0[107m [0m untracked1.txt[107m [0m untracked2.txt🔄 [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ b8f4f9c[22m+💡 [2mBackup created @ fefa700[22m🔄 [36mGenerating squash commit message...[39m[107m [0m [1mfix: commit changes[22m-✅ [32mSquashed @ [2mc785ba8[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2mc785ba8[22m (no rebase needed)[39m-[107m [0m * [33mc785ba8[m fix: commit changes+✅ [32mSquashed @ [2m69f015f[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m69f015f[22m (no rebase needed)[39m+[107m [0m * [33m69f015f[m fix: commit changes[107m [0m file1.txt | 1 [32m+[m[107m [0m untracked1.txt | 1 [32m+[m[107m [0m untracked2.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex d00552112..fd5a90415 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,11 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -36,7 +40,7 @@ exit_code: 0[107m [0m - Implement token refresh mechanism with expiry handling[107m [0m - Add JWT encoding/decoding with signature verification[107m [0m - Create test suite covering all authentication flows-✅ [32mSquashed @ [2m25c560f[22m[39m+✅ [32mSquashed @ [2m85d3884[22m[39m🔄 [36mRunning project pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0m Finished test [unoptimized + debuginfo] target(s) in 0.12s@@ -53,8 +57,8 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m25c560f[22m (no rebase needed)[39m-[107m [0m * [33m25c560f[m feat(auth): Implement JWT authentication system+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m85d3884[22m (no rebase needed)[39m+[107m [0m * [33m85d3884[m feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m[107m [0m jwt.rs | 8 [32m++++++++[mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snapindex 8df109c99..59321c438 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap@@ -7,6 +7,7 @@ info:- main- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,11 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -31,7 +35,7 @@ exit_code: 0[107m [0m[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.-✅ [32mSquashed @ [2m34e674c[22m[39m+✅ [32mSquashed @ [2m7323bc5[22m[39m🔄 [36mRunning project pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest@@ -49,8 +53,8 @@ tests/test_auth.py::test_token_validation PASSED [100%]All checks passed!-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m34e674c[22m (no rebase needed)[39m-[107m [0m * [33m34e674c[m feat(api): Add user authentication endpoints+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m7323bc5[22m (no rebase needed)[39m+[107m [0m * [33m7323bc5[m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 2bd6a81ce..850bcf418 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -6,6 +6,7 @@ info:- merge- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m0fc2285[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m0fc2285[m Implement JWT validation+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m8f777c3[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m8f777c3[m Implement JWT validation[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex 8b56d2d0e..2e68bfac5 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap@@ -8,6 +8,7 @@ info:- "--no-verify"- "--stage=tracked"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,12 +16,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -30,4 +35,4 @@ exit_code: 0⚪ Skipping pre-commit hooks ([90m--no-verify[39m)🔄 [36mGenerating commit message and committing tracked changes... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m[107m [0m [1mfix: update file[22m-✅ [32mCommitted changes @ [2m720fda9[22m[39m+✅ [32mCommitted changes @ [2mb92c41b[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex 6b209e0b1..009104392 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap@@ -7,6 +7,7 @@ info:- commit- "--no-verify"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,12 +15,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: add file"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -32,4 +37,4 @@ exit_code: 0[107m [0m file1.txt🔄 [36mGenerating commit message and committing changes... [90m(2 files, [32m+2[39m[39m[90m)[39m[39m[107m [0m [1mfeat: add file[22m-✅ [32mCommitted changes @ [2mf8c8262[22m[39m+✅ [32mCommitted changes @ [2m388183d[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex 324e00b86..fc8d4eb78 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap@@ -7,6 +7,7 @@ info:- commit- "--stage=tracked"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,12 +15,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update tracked file"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,4 +33,4 @@ exit_code: 0----- stderr -----🔄 [36mGenerating commit message and committing tracked changes... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m[107m [0m [1mfix: update tracked file[22m-✅ [32mCommitted changes @ [2me6cf891[22m[39m+✅ [32mCommitted changes @ [2m0495397[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex cec3889e7..8a4462b1a 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap@@ -8,6 +8,7 @@ info:- "--no-verify"- "--stage=tracked"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,12 +16,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -29,7 +34,7 @@ exit_code: 0----- stderr -----⚪ Skipping pre-commit hooks ([90m--no-verify[39m)🔄 [36mSquashing 2 commits & tracked changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ 209c929[22m+💡 [2mBackup created @ ef0df66[22m🔄 [36mGenerating squash commit message...[39m[107m [0m [1msquash: combined commits[22m-✅ [32mSquashed @ [2m08bd578[22m[39m+✅ [32mSquashed @ [2m3c1afb6[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex da560a21e..76ab7c15c 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap@@ -7,6 +7,7 @@ info:- squash- "--no-verify"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,12 +15,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -30,4 +35,4 @@ exit_code: 0🔄 [36mSquashing 2 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m🔄 [36mGenerating squash commit message...[39m[107m [0m [1msquash: combined commits[22m-✅ [32mSquashed @ [2m0c65059[22m[39m+✅ [32mSquashed @ [2mfc99904[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 770669817..a81cc839f 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap@@ -7,6 +7,7 @@ info:- squash- "--stage=tracked"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,12 +15,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -27,7 +32,7 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 2 commits & tracked changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-💡 [2mBackup created @ b7407a4[22m+💡 [2mBackup created @ 6aa1805[22m🔄 [36mGenerating squash commit message...[39m[107m [0m [1msquash: combined commits[22m-✅ [32mSquashed @ [2md5e34f6[22m[39m+✅ [32mSquashed @ [2m7335b29[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snapindex 8ad99536e..39f687218 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap@@ -8,6 +8,7 @@ info:- feature- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -18,9 +19,11 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -28,9 +31,9 @@ exit_code: 0----- stderr -----🔄 [36mRunning project post-create [1mcommit[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Commit: 549b3f44d1c4dfb3c7a36090fda2db14ff8b90df'[0m[2m [0m[2m[36m>[0m[2m git_vars.txt+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Commit: 5caad75ed9319b7bd5c35c626d7051d252f987e7'[0m[2m [0m[2m[36m>[0m[2m git_vars.txt[0m🔄 [36mRunning project post-create [1mshort[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Short: 549b3f4'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Short: 5caad75'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt[0m🔄 [36mRunning project post-create [1mremote[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Remote: origin'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt[0m🔄 [36mRunning project post-create [1mworktree_name[22m:[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snapindex 7b3f6c106..12e044799 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap@@ -7,6 +7,7 @@ info:- push- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -25,8 +30,8 @@ exit_code: 0----- stderr -----🔄 [36mStashing changes in [1m[REPO][22m...[39m-🔄 [36mPushing 1 commit to [1mmain[22m @ [2m3cf9bf5[22m[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)🔄 [36mRestoring stashed changes in [1m[REPO][22m...[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex 4349a650d..703da3c4c 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap@@ -7,6 +7,7 @@ info:- push- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1@@ -25,6 +30,6 @@ exit_code: 1----- stderr -----❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m-[107m [0m * [33m26e1582[m Main commit+[107m [0m * [33m54bc2d7[m Main commit💡 [2mUse [90mwt step rebase[39m or [90mwt merge[39m to rebase onto [1mmain[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 240c042b2..4a7c2b135 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -7,6 +7,7 @@ info:- push- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mPushing 1 commit to [1mmain[22m @ [2m23fcc89[22m[39m-[107m [0m * [33m23fcc89[m Add test file+🔄 [36mPushing 1 commit to [1mmain[22m @ [2me26c61d[22m[39m+[107m [0m * [33me26c61d[m Add test file[107m [0m test.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex 49f387a7b..a5782f71b 100644--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap@@ -6,6 +6,7 @@ info:- step- pushenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mPushing 1 commit to [1mmain[22m @ [2m3cf9bf5[22m[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex 2a2181389..35b0c1c31 100644--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap@@ -7,6 +7,7 @@ info:- push- mainenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,18 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mPushing 1 commit to [1mmain[22m @ [2m83771b6[22m[39m-[107m [0m * [33m83771b6[m Add feature file+🔄 [36mPushing 1 commit to [1mmain[22m @ [2m430212e[22m[39m+[107m [0m * [33m430212e[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 49f387a7b..a5782f71b 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -6,6 +6,7 @@ info:- step- pushenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,18 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mPushing 1 commit to [1mmain[22m @ [2m3cf9bf5[22m[39m-[107m [0m * [33m3cf9bf5[m Add feature file+🔄 [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m+[107m [0m * [33mfc12499[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snapindex fe0f49b2b..6cb665dbb 100644--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap@@ -8,6 +8,7 @@ info:- main- "--allow-merge-commits"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,22 +16,26 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------🔄 [36mPushing 3 commits to [1mmain[22m @ [2m519f364[22m (merge commits allowed)[39m-[107m [0m * [33m519f364[m Merge temp+🔄 [36mPushing 3 commits to [1mmain[22m @ [2m2489484[22m (merge commits allowed)[39m+[107m [0m * [33m2489484[m Merge temp[107m [0m [31m|[m[32m/[m-[107m [0m [31m|[m * [33m37cd3fe[m Commit 2+[107m [0m [31m|[m * [33me03c938[m Commit 2[107m [0m [31m|[m[31m/[m-[107m [0m * [33mac37628[m Commit 1+[107m [0m * [33m9ca7ddd[m Commit 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)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.snapindex 5c5f030ba..75e195336 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,7 +28,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2mecfb1c3a[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4-+ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mecfb1c3a[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4+@ [1mmain[0m [2m^[22m [1m./repo[0m [2m85d55864[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4++ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2m85d55864[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4⚪ [2mShowing 2 worktreesdiff --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.snapindex ba1b2ec21..d50183ffc 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,6 +28,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m.[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m.[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 1 worktreediff --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.snapindex 2b40e6dfa..85c260d4f 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2malso-no-changes[0m [2m_[22m [2m./repo.also-no-changes[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mno-changes[0m [2m_[22m [2m./repo.no-changes[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ with-changes [36m![39m [32m+1[0m [31m-1[0m ./repo.with-changes [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2malso-no-changes[0m [2m_[22m [2m./repo.also-no-changes[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mno-changes[0m [2m_[22m [2m./repo.no-changes[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ with-changes [36m![39m [32m+1[0m [31m-1[0m ./repo.with-changes [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktrees, 1 with changesdiff --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 b7895b539..559bd87de 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,8 +28,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mhuge[0m [36m?[39m [2m_[22m [2m./repo.huge[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ tiny [36m![39m [32m+1[0m [31m-1[0m ./repo.tiny [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mhuge[0m [36m?[39m [2m_[22m [2m./repo.huge[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ tiny [36m![39m [32m+1[0m [31m-1[0m ./repo.tiny [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 3 worktrees, 1 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 053da7d47..9a9519a8c 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-large[0m [36m?[39m [2m_[22m [2m./repo.feature-large[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-medium[0m [36m?[39m [2m_[22m [2m./repo.feature-medium[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mfeature-small[0m [36m?[39m [2m_[22m [2m./repo.feature-small[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-large[0m [36m?[39m [2m_[22m [2m./repo.feature-large[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-medium[0m [36m?[39m [2m_[22m [2m./repo.feature-medium[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mfeature-small[0m [36m?[39m [2m_[22m [2m./repo.feature-small[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktreesdiff --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.snapindex 1efb3830e..7e92c4209 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d-+ [2manother-extremely-long-name-here[0m [2m_[22m [2m./repo.another-extremely-long-name-here[0m [2m23e5a150[0m [2m1d-+ [2mshort[0m [2m_[22m [2m./repo.short[0m [2m23e5a150[0m [2m1d-+ [2mvery-long-feature-branch-name[0m [2m_[22m [2m./repo.very-long-feature-branch-name[0m [2m23e5a150[0m [2m1d+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d++ [2manother-extremely-long-name-here[0m [2m_[22m [2m./repo.another-extremely-long-name-here[0m [2ma1e809f5[0m [2m1d++ [2mshort[0m [2m_[22m [2m./repo.short[0m [2ma1e809f5[0m [2m1d++ [2mvery-long-feature-branch-name[0m [2m_[22m [2m./repo.very-long-feature-branch-name[0m [2ma1e809f5[0m [2m1d⚪ [2mShowing 4 worktrees, 1 column hiddendiff --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.snapindex e11a03c4b..71730a40a 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mmedium[0m [2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mx[0m [2m_[22m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mmedium[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mx[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktrees, 1 column hiddendiff --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.snapindex 7e1cc249a..265b7530e 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2ma[0m [2m_[22m [2m./repo.a[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mbb[0m [2m_[22m [2m./repo.bb[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mccc[0m [2m_[22m [2m./repo.ccc[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2ma[0m [2m_[22m [2m./repo.a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mbb[0m [2m_[22m [2m./repo.bb[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mccc[0m [2m_[22m [2m./repo.ccc[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktreesdiff --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.snapindex 98705e387..e17850968 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@@ -5,6 +5,7 @@ info:args:- listenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,10 +13,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -23,9 +28,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage-@ [1mmain[0m [2m^[22m [1m./repo[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mcafe[0m [2m_[22m [2m./repo.cafe[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mnaive[0m [2m_[22m [2m./repo.naive[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit-+ [2mresume[0m [2m_[22m [2m./repo.resume[0m [2m23e5a150[0m [2m1d[0m [2mInitial commit+@ [1mmain[0m [2m^[22m [1m./repo[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mcafe[0m [2m_[22m [2m./repo.cafe[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mnaive[0m [2m_[22m [2m./repo.naive[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit++ [2mresume[0m [2m_[22m [2m./repo.resume[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit⚪ [2mShowing 4 worktreesdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snapindex d45752288..36b982425 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap@@ -30,8 +30,8 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m90f2330[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m90f2330[m Add feature+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33md233817[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snapindex 74c2f13c9..dab841df3 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap@@ -8,6 +8,7 @@ info:- "--force"- "--no-remove"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,10 +16,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0@@ -32,9 +37,9 @@ exit_code: 0[0m🔄 [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m💡 [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m[107m [0m [1mChanges to uncommitted.txt[22m-✅ [32mCommitted changes @ [2m234d7f9[22m[39m-🔄 [36mMerging 1 commit to [1mmain[22m @ [2m234d7f9[22m (no rebase needed)[39m-[107m [0m * [33m234d7f9[m Changes to uncommitted.txt+✅ [32mCommitted changes @ [2mfc0fed2[22m[39m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfc0fed2[22m (no rebase needed)[39m+[107m [0m * [33mfc0fed2[m Changes to uncommitted.txt[107m [0m uncommitted.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snapindex 6349c4dac..8dec7b179 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap@@ -32,8 +32,8 @@ exit_code: 0----- stderr -----🔄 [36mRunning user pre-merge [1mcheck[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_premerge.txt-[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m90f2330[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m90f2330[m Add feature+[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33md233817[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snapindex 27bffe037..3182df837 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap@@ -31,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mMerging 1 commit to [1mmain[22m @ [2m90f2330[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m90f2330[m Add feature+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33md233817[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)✅ [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m