Skip to content

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

Refactor demo setup and consolidate preparation functions

Maximilian Roos413a92c4ee26
diff --git a/docs/demos/build b/docs/demos/build
index 7abc60247..14ffe1889 100755
--- a/docs/demos/build
+++ b/docs/demos/build
@@ -19,6 +19,7 @@ import subprocess
import sys
import tempfile
from concurrent.futures import ProcessPoolExecutor, as_completed
+from functools import partial
from pathlib import Path
# Add docs/demos/ to path for shared library
@@ -121,22 +122,12 @@ cleanup = "{cleanup_cmd}"
_add_billing_branch(env)
-def prepare_with_hooks_deps(env: DemoEnv):
- """Standard hooks demo with deps (for pickling compatibility)."""
- prepare_with_hooks(env, include_deps=True)
-
-
-def prepare_with_llm_commit(env: DemoEnv):
- """LLM commit generation demo with staged changes."""
- prepare_demo_repo(env, REPO_ROOT)
- _write_user_config(env, ["cargo nextest run"], commit_generation=True)
- _add_staged_validation(env)
-
-
-def prepare_merge_only(env: DemoEnv):
- """Merge demo without LLM commit generation."""
+def prepare_merge_demo(env: DemoEnv, commit_generation: bool = True, staged_changes: bool = True):
+ """Merge demo setup. Use commit_generation=False for social (no LLM in GIF)."""
prepare_demo_repo(env, REPO_ROOT)
- _write_user_config(env, ["cargo nextest run"])
+ _write_user_config(env, ["cargo nextest run"], commit_generation=commit_generation)
+ if staged_changes:
+ _add_staged_validation(env)
def prepare_switch(env: DemoEnv):
@@ -266,7 +257,7 @@ echo "Add placeholder module for user profile settings."
DOCS_DEMOS = [
("wt-core.tape", "wt-core", prepare_with_hooks, "vhs"),
- ("wt-merge.tape", "wt-merge", prepare_with_llm_commit, "vhs"),
+ ("wt-merge.tape", "wt-merge", prepare_merge_demo, "vhs"),
("wt-select.tape", "wt-select", prepare_basic, "vhs-keystrokes"),
("wt-zellij-omnibus.tape", "wt-zellij-omnibus", prepare_zellij_omnibus, "vhs"),
]
@@ -276,10 +267,10 @@ SOCIAL_DEMOS = [
("wt-statusline.tape", "wt-statusline", prepare_switch, "vhs"),
("wt-list.tape", "wt-list", prepare_with_hooks, "vhs"),
("wt-list-remove.tape", "wt-list-remove", prepare_with_hooks, "vhs"),
- ("wt-hooks.tape", "wt-hooks", prepare_with_hooks_deps, "vhs"),
+ ("wt-hooks.tape", "wt-hooks", partial(prepare_with_hooks, include_deps=True), "vhs"),
("wt-devserver.tape", "wt-devserver", prepare_devserver, "vhs"),
- ("wt-commit.tape", "wt-commit", prepare_with_llm_commit, "vhs"),
- ("wt-merge.tape", "wt-merge", prepare_merge_only, "vhs"),
+ ("wt-commit.tape", "wt-commit", prepare_merge_demo, "vhs"),
+ ("wt-merge.tape", "wt-merge", partial(prepare_merge_demo, commit_generation=False, staged_changes=False), "vhs"),
("wt-select-short.tape", "wt-select-short", prepare_basic, "vhs-keystrokes"),
("wt-core.tape", "wt-core", prepare_with_hooks, "vhs"),
("wt-zellij-omnibus.tape", "wt-zellij-omnibus", prepare_zellij_omnibus, "vhs"),
diff --git a/docs/demos/tapes/shared-commands.tape b/docs/demos/tapes/shared-commands.tape
index 28cad34d1..ac5ec5578 100644
--- a/docs/demos/tapes/shared-commands.tape
+++ b/docs/demos/tapes/shared-commands.tape
@@ -1,4 +1,7 @@
-# Environment variables and shell setup - Source after Require
+# Common requirements and environment - Source after Output
+Require wt
+Require git
+
Env GIT_TERMINAL_PROMPT "0"
Env DEMO_REPO "{{DEMO_REPO}}"
Env RUSTUP_HOME "{{REAL_HOME}}/.rustup"
diff --git a/docs/demos/tapes/wt-commit.tape b/docs/demos/tapes/wt-commit.tape
index cfd8e5565..c4127b034 100644
--- a/docs/demos/tapes/wt-commit.tape
+++ b/docs/demos/tapes/wt-commit.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-core.tape b/docs/demos/tapes/wt-core.tape
index 5e762cb8b..026258795 100644
--- a/docs/demos/tapes/wt-core.tape
+++ b/docs/demos/tapes/wt-core.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-devserver.tape b/docs/demos/tapes/wt-devserver.tape
index 21debc56c..eea90b3da 100644
--- a/docs/demos/tapes/wt-devserver.tape
+++ b/docs/demos/tapes/wt-devserver.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-hooks.tape b/docs/demos/tapes/wt-hooks.tape
index ea07c3992..6fc76ca6e 100644
--- a/docs/demos/tapes/wt-hooks.tape
+++ b/docs/demos/tapes/wt-hooks.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-list-remove.tape b/docs/demos/tapes/wt-list-remove.tape
index 74e5c187f..e878882c9 100644
--- a/docs/demos/tapes/wt-list-remove.tape
+++ b/docs/demos/tapes/wt-list-remove.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-list.tape b/docs/demos/tapes/wt-list.tape
index c2e6337be..157a1aaff 100644
--- a/docs/demos/tapes/wt-list.tape
+++ b/docs/demos/tapes/wt-list.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-merge.tape b/docs/demos/tapes/wt-merge.tape
index 005429f20..7a34eb57c 100644
--- a/docs/demos/tapes/wt-merge.tape
+++ b/docs/demos/tapes/wt-merge.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Env NEXTEST_STATUS_LEVEL "none"
diff --git a/docs/demos/tapes/wt-select-short.tape b/docs/demos/tapes/wt-select-short.tape
index 31b1f91a0..7bd3f7aaf 100644
--- a/docs/demos/tapes/wt-select-short.tape
+++ b/docs/demos/tapes/wt-select-short.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-select.tape b/docs/demos/tapes/wt-select.tape
index 719e034a6..fc78451b9 100644
--- a/docs/demos/tapes/wt-select.tape
+++ b/docs/demos/tapes/wt-select.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Type "clear"
diff --git a/docs/demos/tapes/wt-statusline.tape b/docs/demos/tapes/wt-statusline.tape
index 8c1942819..80d862cda 100644
--- a/docs/demos/tapes/wt-statusline.tape
+++ b/docs/demos/tapes/wt-statusline.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Env ANTHROPIC_API_KEY "{{ANTHROPIC_API_KEY}}"
diff --git a/docs/demos/tapes/wt-switch.tape b/docs/demos/tapes/wt-switch.tape
index 830edd720..2e322a426 100644
--- a/docs/demos/tapes/wt-switch.tape
+++ b/docs/demos/tapes/wt-switch.tape
@@ -2,9 +2,6 @@ Source docs/demos/tapes/shared-setup.tape
Output "{{OUTPUT_GIF}}"
-Require wt
-Require git
-
Source docs/demos/tapes/shared-commands.tape
Env ANTHROPIC_API_KEY "{{ANTHROPIC_API_KEY}}"
diff --git a/docs/demos/tapes/wt-zellij-omnibus.tape b/docs/demos/tapes/wt-zellij-omnibus.tape
index 1064ca947..f761454ec 100644
--- a/docs/demos/tapes/wt-zellij-omnibus.tape
+++ b/docs/demos/tapes/wt-zellij-omnibus.tape
@@ -29,8 +29,6 @@ Output "{{OUTPUT_GIF}}"
# - wt remove (cleanup)
# - Multi-agent Claude Code in parallel tabs
-Require wt
-Require git
Require zellij
Source docs/demos/tapes/shared-commands.tape