Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

fix: correct --full example text and add removable worktree to docs (#1775)

worktrunk-bot82d02239f3ed
diff --git a/docs/content/list.md b/docs/content/list.md
index 46c6962c8..66889f41d 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -37,8 +37,9 @@ List all worktrees:
@ feature-api <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>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</span>
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -48,12 +49,13 @@ Include CI status, line diffs, and LLM summaries:
<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap — edit source to update -->
{% terminal(cmd="wt list --full") %}
-&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
+&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Summary</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b>
+@ feature-api <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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span>
+^ main <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>●</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=g>●</span> <span class=d>41ee0834</span>
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -63,14 +65,15 @@ Include branches that don't have worktrees:
<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap — edit source to update -->
{% terminal(cmd="wt list --branches --full") %}
-&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</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>96379229</span> <span class=d>2d</span> <span class=d>Add GraphQL…</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>b40716dc</span> <span class=d>3d</span> <span class=d>Start API do…</span>
-
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
+&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Summary</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b>
+@ feature-api <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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span>
+^ main <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>●</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=g>●</span> <span class=d>41ee0834</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> Explore GraphQL schema and resolvers <span class=d>96379229</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> Start API documentation <span class=d>b40716dc</span>
+
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/tips-patterns.md b/docs/content/tips-patterns.md
index cee539637..31ded8454 100644
--- a/docs/content/tips-patterns.md
+++ b/docs/content/tips-patterns.md
@@ -58,8 +58,9 @@ The URL column in `wt list` shows each worktree's dev server:
@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
+ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>http://localhost:14301</span> <span class=d>41ee0834</span> <span class=d>4d</span>
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index b6cb6121a..82891b4e7 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -19,32 +19,35 @@ List all worktrees:
@ feature-api <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>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</span>
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
Include CI status, line diffs, and LLM summaries:
{% terminal(cmd="wt list --full") %}
-&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
+&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Summary</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b>
+@ feature-api <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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span>
+^ main <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>●</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=g>●</span> <span class=d>41ee0834</span>
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden</span>
{% end %}
Include branches that don't have worktrees:
{% terminal(cmd="wt list --branches --full") %}
-&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</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>96379229</span> <span class=d>2d</span> <span class=d>Add GraphQL…</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>b40716dc</span> <span class=d>3d</span> <span class=d>Start API do…</span>
-
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
+&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Summary</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b>
+@ feature-api <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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span>
+^ main <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>●</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=g>●</span> <span class=d>41ee0834</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> Explore GraphQL schema and resolvers <span class=d>96379229</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> Start API documentation <span class=d>b40716dc</span>
+
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden</span>
{% end %}
Output as JSON for scripting:
diff --git a/skills/worktrunk/reference/tips-patterns.md b/skills/worktrunk/reference/tips-patterns.md
index 55216e768..74368844f 100644
--- a/skills/worktrunk/reference/tips-patterns.md
+++ b/skills/worktrunk/reference/tips-patterns.md
@@ -49,8 +49,9 @@ The URL column in `wt list` shows each worktree's dev server:
@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
+ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>http://localhost:14301</span> <span class=d>41ee0834</span> <span class=d>4d</span>
-<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
{% end %}
Ports are deterministic — `fix-auth` always gets port 16460, regardless of which machine or when. The URL dims if the server isn't running.
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index ee1515ef3..910f1e320 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -1776,6 +1776,13 @@ TODO: Add request/response examples for each endpoint
// Remove the worktree but keep the branch
repo.run_git(&["worktree", "remove", wip_wt.to_str().unwrap()]);
+ // === Create fix-typos worktree (already merged — shows dimmed as removable) ===
+ // Story: A quick typo fix that was already squash-merged into main.
+ // The worktree is still around and can be removed. Shows dimmed in list output.
+ let fix_typos = repo.add_worktree("fix-typos");
+ repo.run_git_in(&fix_typos, &["push", "-u", "origin", "fix-typos"]);
+ mock_ci_status(repo, "fix-typos", "passed", "pull-request", false);
+
// === Mock CI status ===
// CI requires --full flag, but we mock it so examples show realistic output
// Note: main's CI is mocked AFTER the merge commit so the hash matches
@@ -1784,6 +1791,33 @@ TODO: Add request/response examples for each endpoint
// feature-api has unpushed commits, so CI is stale (shows dimmed)
mock_ci_status(repo, "feature-api", "running", "pull-request", true);
+ // === Mock LLM summaries ===
+ // Summary requires --full + [list] summary = true + [commit.generation] command
+ // Pre-populate the cache so tests don't need a real LLM
+ repo.write_test_config(
+ r#"
+[list]
+summary = true
+
+[commit.generation]
+command = "echo unused"
+"#,
+ );
+ mock_summary_cache(
+ repo,
+ "fix-auth",
+ Some(&fix_auth),
+ "Harden auth with constant-time token validation",
+ );
+ mock_summary_cache(
+ repo,
+ "feature-api",
+ Some(&feature_api),
+ "Refactor API to REST architecture with middleware",
+ );
+ mock_summary_cache(repo, "exp", None, "Explore GraphQL schema and resolvers");
+ mock_summary_cache(repo, "wip", None, "Start API documentation");
+
feature_api
}
@@ -1836,6 +1870,82 @@ fn mock_ci_status(repo: &TestRepo, branch: &str, status: &str, source: &str, is_
std::fs::write(&cache_file, &cache_json).unwrap();
}
+/// Mock summary cache by computing the real diff hash and writing a cache entry.
+///
+/// Mirrors `summary::generate_summary_core` — computes the combined diff
+/// (branch + working tree), hashes it, and writes a CachedSummary JSON file.
+fn mock_summary_cache(
+ repo: &TestRepo,
+ branch: &str,
+ worktree_path: Option<&std::path::Path>,
+ summary: &str,
+) {
+ use std::collections::hash_map::DefaultHasher;
+ use std::hash::{Hash, Hasher};
+
+ // Compute combined diff (matching compute_combined_diff in summary.rs)
+ let mut diff = String::new();
+
+ // Branch diff: main...<branch>
+ let head_output = repo
+ .git_command()
+ .args(["rev-parse", branch])
+ .run()
+ .unwrap();
+ let head = String::from_utf8_lossy(&head_output.stdout)
+ .trim()
+ .to_string();
+ let merge_base = format!("main...{}", head);
+ if let Ok(output) = repo.git_command().args(["diff", &merge_base]).run() {
+ let branch_diff = String::from_utf8_lossy(&output.stdout);
+ diff.push_str(&branch_diff);
+ }
+
+ // Working tree diff (only if worktree exists)
+ if let Some(wt_path) = worktree_path {
+ let wt_str = wt_path.display().to_string();
+ if let Ok(output) = repo
+ .git_command()
+ .args(["-C", &wt_str, "diff", "HEAD"])
+ .run()
+ {
+ let wt_diff = String::from_utf8_lossy(&output.stdout);
+ if !wt_diff.trim().is_empty() {
+ diff.push_str(&wt_diff);
+ }
+ }
+ }
+
+ // Hash the diff (matches summary::hash_diff)
+ let mut hasher = DefaultHasher::new();
+ diff.hash(&mut hasher);
+ let diff_hash = hasher.finish();
+
+ // Write cache file
+ let cache_json = format!(
+ r#"{{"summary":"{}","diff_hash":{},"branch":"{}"}}"#,
+ summary, diff_hash, branch
+ );
+
+ let output = repo
+ .git_command()
+ .args(["rev-parse", "--git-common-dir"])
+ .run()
+ .unwrap();
+ let git_dir = String::from_utf8_lossy(&output.stdout).trim().to_string();
+ let git_path = if std::path::Path::new(&git_dir).is_absolute() {
+ std::path::PathBuf::from(&git_dir)
+ } else {
+ repo.root_path().join(&git_dir)
+ };
+
+ let cache_dir = git_path.join("wt").join("cache").join("summaries");
+ std::fs::create_dir_all(&cache_dir).unwrap();
+ let safe_branch = worktrunk::path::sanitize_for_filename(branch);
+ let cache_file = cache_dir.join(format!("{safe_branch}.json"));
+ std::fs::write(&cache_file, &cache_json).unwrap();
+}
+
// =============================================================================
// Quick Start Snapshot Tests
// =============================================================================
@@ -2014,8 +2124,8 @@ fn test_readme_example_list(mut repo: TestRepo) {
/// Generate README example: `wt list --full` output
///
-/// Shows additional columns: main…± (line diffs in commits) and CI status.
-/// Uses narrower width (100 cols) to fit in doc site code blocks.
+/// Shows additional columns: main…± (line diffs), CI status, and LLM summaries.
+/// Uses wider terminal (130 cols) than the base example to fit the Summary column.
/// Output: tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
#[rstest]
fn test_readme_example_list_full(mut repo: TestRepo) {
@@ -2023,6 +2133,7 @@ fn test_readme_example_list_full(mut repo: TestRepo) {
assert_cmd_snapshot!("readme_example_list_full", {
let mut cmd = list_snapshots::command_readme(&repo, &feature_api);
cmd.arg("--full");
+ cmd.env("COLUMNS", "130");
cmd
});
}
@@ -2030,7 +2141,7 @@ fn test_readme_example_list_full(mut repo: TestRepo) {
/// Generate README example: `wt list --branches --full` output
///
/// Shows branches without worktrees (⎇ symbol) alongside worktrees, plus CI status.
-/// Uses narrower width (100 cols) to fit in doc site code blocks.
+/// Uses wider terminal (130 cols) than the base example to fit the Summary column.
/// Output: tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
#[rstest]
fn test_readme_example_list_branches(mut repo: TestRepo) {
@@ -2038,6 +2149,7 @@ fn test_readme_example_list_branches(mut repo: TestRepo) {
assert_cmd_snapshot!("readme_example_list_branches", {
let mut cmd = list_snapshots::command_readme(&repo, &feature_api);
cmd.args(["--branches", "--full"]);
+ cmd.env("COLUMNS", "130");
cmd
});
}
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
index a8a0d4dc4..5fd31e250 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -18,16 +18,20 @@ info:
LANG: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
@@ -39,7 +43,8 @@ exit_code: 0
@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API tests
^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
+ fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
++ fix-typos _| | 41ee0834 4d Merge fix-auth: hardened to…
-○ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
+○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index b408b2c88..fbaa913cb 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
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "98"
+ COLUMNS: "130"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,16 +20,20 @@ info:
LANG: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
@@ -37,13 +41,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 ● 6814f02a 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834 4d Merge fix-au…
-+ fix-auth ↕| ↑2 ↓1 +25 -11 | ● b772e68b 5h Add secure t…
- exp /↕ ↑2 ↓1 +137 96379229 2d Add GraphQL…
- wip /↕ ↑1 ↓1 +33 b40716dc 3d Start API do…
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
+^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
++ fix-typos _| | ● 41ee0834
+ exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
+ wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
-○ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden
+○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
index ba855d8ee..6a690836f 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "98"
+ COLUMNS: "130"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -19,16 +19,20 @@ info:
LANG: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
@@ -36,11 +40,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 ● 6814f02a 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834 4d Merge fix-au…
-+ fix-auth ↕| ↑2 ↓1 +25 -11 | ● b772e68b 5h Add secure t…
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
+^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
++ fix-typos _| | ● 41ee0834
-○ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
+○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
index 52789ee19..0831f2809 100644
--- a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
+++ b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
@@ -18,16 +18,20 @@ info:
LANG: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
@@ -39,7 +43,8 @@ exit_code: 0
@ main ? ^⇅ ⇡1 ⇣1 http://localhost:12107 41ee0834 4d
+ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 http://localhost:10703 6814f02a 30m
+ fix-auth ↕| ↑2 ↓1 | http://localhost:16460 b772e68b 5h
++ fix-typos _| | http://localhost:14301 41ee0834 4d
-○ Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden
+○ Showing 4 worktrees, 2 with changes, 2 ahead, 2 columns hidden
----- stderr -----