Skip to content

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

docs: add interactive picker and copy-ignored to home page (#1095)

Maximilian Roosa361d858727d
diff --git a/README.md b/README.md
index 1dc8b3145..656b25de8 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,8 @@ git branch -d feat</pre></td>
- **[Hooks](https://worktrunk.dev/hook/)** — run commands on create, pre-merge, post-merge, etc
- **[LLM commit messages](https://worktrunk.dev/llm-commits/)** — generate commit messages from diffs
- **[Merge workflow](https://worktrunk.dev/merge/)** — squash, rebase, merge, clean up in one command
+- **[Interactive picker](https://worktrunk.dev/switch/#interactive-picker)** — browse worktrees with live diff and log previews
+- **[Copy build caches](https://worktrunk.dev/step/)** — skip cold starts by sharing `target/`, `node_modules/`, etc between worktrees
- ...and **[lots more](#next-steps)**
A demo with some advanced features:
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 525470e6e..f06bc2971 100644
--- a/docs/content/worktrunk.md
+++ b/docs/content/worktrunk.md
@@ -82,6 +82,8 @@ git branch -d feat{% end %}</td>
- **[Hooks](@/hook.md)** — run commands on create, pre-merge, post-merge, etc
- **[LLM commit messages](@/llm-commits.md)** — generate commit messages from diffs
- **[Merge workflow](@/merge.md)** — squash, rebase, merge, clean up in one command
+- **[Interactive picker](@/switch.md#interactive-picker)** — browse worktrees with live diff and log previews
+- **[Copy build caches](@/step.md)** — skip cold starts by sharing `target/`, `node_modules/`, etc between worktrees
- ...and **[lots more](#next-steps)**
A demo with some advanced features:
@@ -91,7 +93,7 @@ A demo with some advanced features:
<source srcset="/assets/docs/dark/wt-zellij-omnibus.gif" media="(prefers-color-scheme: dark)">
<img src="/assets/docs/light/wt-zellij-omnibus.gif" alt="Worktrunk omnibus demo: multiple Claude agents in Zellij tabs with hooks, LLM commits, and merge workflow" width="1600" height="900">
</picture>
-<figcaption>Multiple Claude agents in parallel with hooks, LLM commits, and merge</figcaption>
+<figcaption>Multiple Claude agents in parallel with interactive picker, hooks, LLM commits, and merge</figcaption>
</figure>
## Install
diff --git a/docs/demos/build b/docs/demos/build
index 5ce9bfd7f..3333a7526 100755
--- a/docs/demos/build
+++ b/docs/demos/build
@@ -86,20 +86,24 @@ def _add_staged_validation(env: DemoEnv):
def _write_user_config(
env: DemoEnv, approved_commands: list[str], commit_generation: bool = False
):
- """Write worktrunk user config."""
+ """Write worktrunk user config and approvals."""
config_dir = env.home / ".config" / "worktrunk"
project_id = str(env.bare_remote).removesuffix(".git")
- content = ""
+ # User config (portable settings only)
+ config_content = ""
if commit_generation:
- content += """[commit.generation]
+ config_content += """[commit.generation]
command = "llm -m claude-haiku-4.5"
"""
- content += f'[projects."{project_id}"]\n'
- content += f"approved-commands = {approved_commands!r}\n"
+ if config_content:
+ (config_dir / "config.toml").write_text(config_content)
- (config_dir / "config.toml").write_text(content)
+ # Approvals (machine-local trust state, separate from config)
+ approvals_content = f'[projects."{project_id}"]\n'
+ approvals_content += f"approved-commands = {approved_commands!r}\n"
+ (config_dir / "approvals.toml").write_text(approvals_content)
# =============================================================================
diff --git a/docs/demos/shared/lib.py b/docs/demos/shared/lib.py
index 41476e86d..23aa3c2e6 100644
--- a/docs/demos/shared/lib.py
+++ b/docs/demos/shared/lib.py
@@ -440,6 +440,10 @@ def setup_claude_code_config(
"opus45MigrationComplete": True,
"thinkingMigrationComplete": True,
"hasShownOpus45Notice": {},
+ "hasShownOpus46Notice": {},
+ "opusProMigrationComplete": True,
+ "opus46FeedSeenCount": 100,
+ "sonnet1m45MigrationComplete": True,
"lastReleaseNotesSeen": "99.0.0",
"lastOnboardingVersion": "99.0.0",
"oauthAccount": {
@@ -451,10 +455,23 @@ def setup_claude_code_config(
"rejected": [],
},
"officialMarketplaceAutoInstalled": True,
+ "effortCalloutDismissed": True,
"tipsHistory": {
"new-user-warmup": 100,
"terminal-setup": 100,
"theme-command": 100,
+ "fast-mode-2026-02-01": 100,
+ "adaptive-thinking-2026-01-28": 100,
+ "prompt-caching-scope-2026-01-05": 100,
+ "plan-mode-for-complex-tasks": 100,
+ "memory-command": 100,
+ "todo-list": 100,
+ "stickers-command": 100,
+ "status-line": 100,
+ "custom-commands": 100,
+ "custom-agents": 100,
+ "permissions": 100,
+ "git-worktrees": 100,
},
"projects": projects_config,
},
@@ -474,7 +491,7 @@ def setup_claude_code_config(
claude_dir.mkdir(exist_ok=True)
settings = {
"permissions": {"allow": allowed_tools or [], "deny": [], "ask": []},
- "model": "claude-opus-4-5-20251101",
+ "model": "claude-opus-4-6",
"statusLine": {
"type": "command",
"command": "wt list statusline --format=claude-code",
@@ -745,7 +762,10 @@ def prepare_demo_repo(env: DemoEnv, repo_root: Path, hooks_config: str = None):
if hooks_config is None:
hooks_config = '[pre-merge]\ntest = "cargo nextest run"\n'
(env.repo / ".config" / "wt.toml").write_text(hooks_config)
- git(["-C", str(env.repo), "add", ".config/wt.toml"])
+ claude_md_dir = env.repo / ".claude"
+ claude_md_dir.mkdir(exist_ok=True)
+ (claude_md_dir / "CLAUDE.md").write_text("# Acme App\n\nRust project. Run `cargo test` for tests.\n")
+ git(["-C", str(env.repo), "add", ".config/wt.toml", ".claude/CLAUDE.md"])
commit_dated(env.repo, "Add project hooks", "5d")
git(["-C", str(env.repo), "push", "-q"])
diff --git a/docs/demos/shared/validation.py b/docs/demos/shared/validation.py
index 394a4e857..b1cf089f4 100644
--- a/docs/demos/shared/validation.py
+++ b/docs/demos/shared/validation.py
@@ -29,14 +29,15 @@ from pathlib import Path
TUI_CHECKPOINTS: dict[str, list[tuple[int, list[str], list[str]]]] = {
# Frame numbers calibrated with permissions cache fix (no permission dialog).
- # At 30fps: frame 100 = ~3.3s, frame 500 = ~16.7s, frame 2000 = ~66.7s
+ # At 30fps: frame 100 = ~3.3s, frame 500 = ~16.7s, frame 2060 = ~68.7s
"wt-zellij-omnibus": [
# Frame 100: After wt list - should see branch table, no permission dialog
(100, ["Branch", "Status", "main", "hooks"], ["Allow?", "permission"]),
- # Frame 500: Claude UI visible - shows Opus model indicator and worktree
- (500, ["Opus", "acme"], ["command not found", "Unknown command"]),
- # Frame 2000: Near end - wt list --full showing all worktrees
- (2000, ["Branch", "main", "feature", "billing"], ["CONFLICT", "error:", "failed"]),
+ # Frame 300: Claude UI visible on TAB 1 (api) - shows Opus model and task
+ (300, ["Opus", "acme", "Add a test"], ["command not found", "Unknown command"]),
+ # Frame 1980: Near end - wt list --full showing all worktrees
+ # (shifted ~75 frames earlier after removing wt list before wt remove)
+ (1980, ["Branch", "main", "feature", "billing"], ["CONFLICT", "error:", "failed"]),
],
}
diff --git a/docs/demos/tapes/shared-commands.tape b/docs/demos/tapes/shared-commands.tape
index c224068b6..269848f0f 100644
--- a/docs/demos/tapes/shared-commands.tape
+++ b/docs/demos/tapes/shared-commands.tape
@@ -2,6 +2,7 @@
Require wt
Require git
+Env CLAUDECODE ""
Env GIT_TERMINAL_PROMPT "0"
Env DEMO_REPO "{{DEMO_REPO}}"
Env RUSTUP_HOME "{{REAL_HOME}}/.rustup"
diff --git a/docs/demos/tapes/wt-zellij-omnibus.tape b/docs/demos/tapes/wt-zellij-omnibus.tape
index 5f2e79a36..3c5e776d2 100644
--- a/docs/demos/tapes/wt-zellij-omnibus.tape
+++ b/docs/demos/tapes/wt-zellij-omnibus.tape
@@ -16,12 +16,12 @@ Output "{{OUTPUT_GIF}}"
# TAB 1: wt list → wt switch api → claude (simple task)
# TAB 2: [NEW TAB] wsl abbreviation (wt switch -x claude --create) → claude
# TAB 3: [NEW TAB] wt switch --create → wt step commit → git push
-# TAB 4: [NEW TAB] wt switch auth → wt list → wt remove → wt list --full
+# TAB 4: [NEW TAB] wt switch (picker) → wt remove → wt list --full
# Then back to TAB 1: [NEW PANE] git diff → wt merge (on Claude's completed work)
#
# Features demonstrated:
# - wt list / wt list --full (URLs, CI status, diff stats)
-# - wt switch (simple navigation)
+# - wt switch (simple navigation + interactive picker)
# - wsl abbreviation (wt switch --execute=claude --create)
# - wt switch --create (with post-start hooks)
# - wt step commit (LLM commit message, standalone)
@@ -63,14 +63,17 @@ Enter
Sleep 3s
# Simple switch with Tab completion - navigate to existing worktree
-# NOTE: Maintainer marked Tab cycling as excellent in wt-core demo
-# - "wt switch a" + Tab → shows api/auth/alpha menu (400ms to review)
-# - Tab → selects api (300ms to see selection)
-# - Enter → accepts selection (dismisses pager)
-# - 50ms then Enter again → executes command
+# Inside Zellij, fish completion needs a moment to render after Tab.
+# - "wt switch a" + pause → let fish process input
+# - Tab → triggers completion menu (alpha/api/auth)
+# - 500ms pause → menu renders and viewer reads it
+# - Tab → cycles to api
+# - 300ms → see selection
+# - Enter → accepts (dismisses pager), 50ms, Enter → executes
Type "wt switch a"
+Sleep 200ms
Tab
-Sleep 400ms
+Sleep 500ms
Tab
Sleep 300ms
Enter
@@ -125,20 +128,23 @@ Type "git push -u origin feature"
Enter
Sleep 2s
-# ==== TAB 4: Navigation, list, and cleanup ====
+# ==== TAB 4: Interactive picker, list, and cleanup ====
# [NEW TAB]
Ctrl+t
Sleep 2s
-# wt switch - navigate to auth worktree
-Type "wt switch auth"
+# wt switch (no args) - opens interactive picker
+Type "wt switch"
Enter
Sleep 1.5s
-# wt list - see current state (before removal)
-Type "wt list"
+# Filter to auth branch
+Type "au"
+Sleep 1s
+
+# Select it
Enter
-Sleep 2.5s
+Sleep 1.5s
# wt remove - delete current worktree (we're in auth)
Type "wt remove"
diff --git a/skills/worktrunk/reference/worktrunk.md b/skills/worktrunk/reference/worktrunk.md
index 9bfd9d1ee..b54189b43 100644
--- a/skills/worktrunk/reference/worktrunk.md
+++ b/skills/worktrunk/reference/worktrunk.md
@@ -71,6 +71,8 @@ git branch -d feat{% end %}</td>
- **[Hooks](https://worktrunk.dev/hook/)** — run commands on create, pre-merge, post-merge, etc
- **[LLM commit messages](https://worktrunk.dev/llm-commits/)** — generate commit messages from diffs
- **[Merge workflow](https://worktrunk.dev/merge/)** — squash, rebase, merge, clean up in one command
+- **[Interactive picker](https://worktrunk.dev/switch/#interactive-picker)** — browse worktrees with live diff and log previews
+- **[Copy build caches](https://worktrunk.dev/step/)** — skip cold starts by sharing `target/`, `node_modules/`, etc between worktrees
- ...and **[lots more](#next-steps)**
A demo with some advanced features: