Skip to content

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

feat: enable help text wrapping for better readability

Maximilian Roosfe981c2e5d00
diff --git a/Cargo.lock b/Cargo.lock
index 1389d78a1..19522e12e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -342,6 +342,7 @@ dependencies = [
"anstyle",
"clap_lex",
"strsim",
+ "terminal_size",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7a3cb1797..0b2c593f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,7 @@ ansi-str = "0.9"
color-print = "0.3"
askama = { version = "0.14", default-features = false, features = ["derive", "std"] }
chrono = "0.4"
-clap = { version = "4.5", features = ["derive", "unstable-ext"] }
+clap = { version = "4.5", features = ["derive", "unstable-ext", "wrap_help"] }
clap_complete = { version = "4.5", features = ["unstable-dynamic"] }
config = { version = "0.15", features = ["convert-case"] }
crossbeam-channel = "0.5"
diff --git a/docs/content/config.md b/docs/content/config.md
index b22f6c118..8abb854bb 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -542,6 +542,7 @@ With `--project`, creates `.config/wt.toml` in the current repository:
```
wt config create - Create configuration file
+
Usage: wt config create [OPTIONS]
Options:
@@ -596,6 +597,7 @@ wt config var clear marker --all
```
wt config var - Get or set runtime variables (stored in git config)
+
Usage: wt config var [OPTIONS] <COMMAND>
Commands:
@@ -624,6 +626,7 @@ Global Options:
```
wt config - Manage configuration and shell integration
+
Usage: wt config [OPTIONS] <COMMAND>
Commands:
diff --git a/docs/content/hook.md b/docs/content/hook.md
index 9260315fd..771d61c8b 100644
--- a/docs/content/hook.md
+++ b/docs/content/hook.md
@@ -297,6 +297,7 @@ env = "cp {{ repo_root }}/.env.local .env"
```
wt hook - Run project hooks
+
Usage: wt hook [OPTIONS] <COMMAND>
Commands:
diff --git a/docs/content/list.md b/docs/content/list.md
index be944bc14..8055e3bc8 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -183,6 +183,7 @@ wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branc
```
wt list - List worktrees and optionally branches
+
Usage: wt list [OPTIONS]
wt list <COMMAND>
@@ -207,7 +208,8 @@ Options:
--progressive
Show fast info immediately, update with slow info
- Displays local data (branches, paths, status) first, then updates with remote data (CI, upstream) as it arrives. Auto-enabled for TTY.
+ Displays local data (branches, paths, status) first, then updates with
+ remote data (CI, upstream) as it arrives. Auto-enabled for TTY.
-h, --help
Print help (see a summary with '-h')
diff --git a/docs/content/merge.md b/docs/content/merge.md
index afa0422ae..7d8a955a6 100644
--- a/docs/content/merge.md
+++ b/docs/content/merge.md
@@ -70,6 +70,7 @@ Use `--no-commit` to skip all git operations (steps 1-2) and only run hooks and
```
wt merge - Merge worktree into target branch
+
Usage: wt merge [OPTIONS] [TARGET]
Arguments:
@@ -98,7 +99,8 @@ Options:
What to stage before committing [default: all]
Possible values:
- - all: Stage everything: untracked files + unstaged tracked changes
+ - all: Stage everything: untracked files + unstaged tracked
+ changes
- tracked: Stage tracked changes only (like git add -u)
- none: Stage nothing, commit only what's already in the index
diff --git a/docs/content/remove.md b/docs/content/remove.md
index f563a5c33..eacfff924 100644
--- a/docs/content/remove.md
+++ b/docs/content/remove.md
@@ -69,6 +69,7 @@ Arguments resolve by path first, then branch name. [Shortcuts](@/switch.md#short
```
wt remove - Remove worktree and branch
+
Usage: wt remove [OPTIONS] [WORKTREES]...
Arguments:
diff --git a/docs/content/select.md b/docs/content/select.md
index 327fdefbd..fe744f836 100644
--- a/docs/content/select.md
+++ b/docs/content/select.md
@@ -55,6 +55,7 @@ Toggle between views with number keys:
wt select - Interactive worktree selector
Toggle preview tabs with 1/2/3 keys. Toggle preview visibility with alt-p.
+
Usage: wt select [OPTIONS]
Options:
diff --git a/docs/content/step.md b/docs/content/step.md
index b5597b72c..b0f0120ad 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -46,6 +46,7 @@ wt step push
```
wt step - Run individual workflow operations
+
Usage: wt step [OPTIONS] <COMMAND>
Commands:
diff --git a/docs/content/switch.md b/docs/content/switch.md
index 93d4f41fe..b78d0dcd2 100644
--- a/docs/content/switch.md
+++ b/docs/content/switch.md
@@ -68,6 +68,7 @@ wt switch --create fix --base=@ # Branch from current HEAD
```
wt switch - Switch to a worktree
+
Usage: wt switch [OPTIONS] <BRANCH>
Arguments:
@@ -88,9 +89,12 @@ Options:
-x, --execute <EXECUTE>
Command to run after switch
- Replaces the wt process with the command after switching, giving it full terminal control. Useful for launching editors, AI agents, or other interactive tools.
+ Replaces the wt process with the command after switching, giving it
+ full terminal control. Useful for launching editors, AI agents, or
+ other interactive tools.
- Especially useful in shell aliases to create a worktree and start working in one command:
+ Especially useful in shell aliases to create a worktree and start
+ working in one command:
alias wsc='wt switch --create --execute=claude'
diff --git a/src/cli.rs b/src/cli.rs
index 2760aed57..f84437d5c 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -45,7 +45,7 @@ const DEFAULT_COMMAND_NAME: &str = "wt";
/// Help template for commands
const HELP_TEMPLATE: &str = "\
-{before-help}{name} - {about-with-newline}\
+{before-help}{name} - {about-with-newline}
Usage: {usage}
{all-args}{after-help}";
@@ -96,9 +96,17 @@ pub enum OutputFormat {
#[command(disable_help_subcommand = true)]
#[command(styles = help_styles())]
#[command(arg_required_else_help = true)]
-#[command(
- after_long_help = r#"See `wt config --help` for configuration file locations and setup."#
-)]
+#[command(after_long_help = "\
+Getting started
+
+ wt switch --create feature Create worktree and branch
+ wt switch feature Switch to existing worktree
+ wt merge Squash, rebase, and merge to main
+
+Run `wt config shell` to set up directory switching.
+
+Docs: https://worktrunk.dev
+GitHub: https://github.com/max-sixty/worktrunk")]
pub struct Cli {
/// Working directory for this command
#[arg(
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
index 614afaa85..d7fbde824 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
@@ -19,6 +19,7 @@ exit_code: 0
----- stderr -----
wt config approvals - Manage command approvals
+
Usage: wt config approvals [OPTIONS] <COMMAND>
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap
index fc57eeb99..8bc54a140 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap
@@ -20,6 +20,7 @@ exit_code: 0
----- stderr -----
wt config approvals add - Store approvals in config
+
Usage: wt config approvals add [OPTIONS]
Options:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
index 2c3538be4..9f1d6370e 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
@@ -20,6 +20,7 @@ exit_code: 0
----- stderr -----
wt config approvals clear - Clear approved commands from config
+
Usage: wt config approvals clear [OPTIONS]
Options:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index de292f342..ded7c85a1 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -19,6 +19,7 @@ exit_code: 0
----- stderr -----
wt config create - Create configuration file
+
Usage: wt config create [OPTIONS]
Options:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 9357d7a94..adf681ce6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt config - Manage configuration and shell integration
+
Usage: wt config [OPTIONS] <COMMAND>
Commands:
@@ -145,7 +146,8 @@ Manage approvals with wt config approvals list and wt config approva
Project config
-The project config defines lifecycle hooks — commands that run at specific points during worktree operations. This file is checked into version control and shared across the team.
+The project config defines lifecycle hooks — commands that run at specific points during worktree operations. This file is checked into version
+control and shared across the team.
Create .config/wt.toml in the repository root:
@@ -183,7 +185,8 @@ All user config options can be overridden with environment variables using the 
Naming convention
-Config keys use kebab-case (worktree-path), while env vars use SCREAMING_SNAKE_CASE (WORKTRUNK_WORKTREE_PATH). The conversion happens automatically.
+Config keys use kebab-case (worktree-path), while env vars use SCREAMING_SNAKE_CASE (WORKTRUNK_WORKTREE_PATH). The conversion happens
+automatically.
For nested config sections, use double underscores to separate levels:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
index 1f26f48ca..e6a34d3b3 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
@@ -19,6 +19,7 @@ exit_code: 0
----- stderr -----
wt config shell - Shell integration setup
+
Usage: wt config shell [OPTIONS] <COMMAND>
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_short.snap b/tests/snapshots/integration__integration_tests__help__help_config_short.snap
index e3d10cb9e..a2e5ed83d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_short.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt config - Manage configuration and shell integration
+
Usage: wt config [OPTIONS] <COMMAND>
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_show.snap b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
index a0b58da41..a0b86ad0d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_show.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
@@ -19,6 +19,7 @@ exit_code: 0
----- stderr -----
wt config show - Show configuration files & locations
+
Usage: wt config show [OPTIONS]
Options:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_var.snap b/tests/snapshots/integration__integration_tests__help__help_config_var.snap
index 8dadaf9c4..aeab0534b 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_var.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_var.snap
@@ -19,6 +19,7 @@ exit_code: 0
----- stderr -----
wt config var - Get or set runtime variables (stored in git config)
+
Usage: wt config var [OPTIONS] <COMMAND>
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_var_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_var_clear.snap
index d5d3d80bb..3d7409a52 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_var_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_var_clear.snap
@@ -20,6 +20,7 @@ exit_code: 0
----- stderr -----
wt config var clear - Clear a variable value
+
Usage: wt config var clear [OPTIONS] <KEY>
Arguments:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_var_get.snap b/tests/snapshots/integration__integration_tests__help__help_config_var_get.snap
index f7dd94ea5..43aaf3c10 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_var_get.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_var_get.snap
@@ -20,6 +20,7 @@ exit_code: 0
----- stderr -----
wt config var get - Get a variable value
+
Usage: wt config var get [OPTIONS] <KEY>
Arguments:
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_var_set.snap b/tests/snapshots/integration__integration_tests__help__help_config_var_set.snap
index 7b2a1a6df..766e35260 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_var_set.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_var_set.snap
@@ -20,6 +20,7 @@ exit_code: 0
----- stderr -----
wt config var set - Set a variable value
+
Usage: wt config var set [OPTIONS] <KEY> <VALUE>
Arguments:
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index bc5aa9983..f069da575 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt list - List worktrees and optionally branches
+
Usage: wt list [OPTIONS]
wt list <COMMAND>
@@ -59,7 +60,9 @@ Usage: wt list [OPTIONS]
Show all worktrees with their status. The table includes uncommitted changes, divergence from main and remote, and optional CI status.
-The table renders progressively: branch names, paths, and commit hashes appear immediately, then status, divergence, and other columns fill in as background git operations complete. With --full, CI status fetches from the network — the table displays instantly and CI fills in as results arrive.
+The table renders progressively: branch names, paths, and commit hashes appear immediately, then status, divergence, and other columns fill in as
+background git operations complete. With --full, CI status fetches from the network — the table displays instantly and CI fills in as results
+arrive.
Examples
@@ -108,7 +111,8 @@ The CI column shows GitHub/GitLab pipeline status:
● gray No checks configured
(blank) No upstream or no PR/MR
-CI is only checked for branches that track a remote — local-only branches show blank. Any CI dot appears dimmed when there are unpushed local changes (stale status). CI indicators are clickable links to the PR page. Results are cached for 30-60 seconds; use wt config cache to view or clear.
+CI is only checked for branches that track a remote — local-only branches show blank. Any CI dot appears dimmed when there are unpushed local changes
+(stale status). CI indicators are clickable links to the PR page. Results are cached for 30-60 seconds; use wt config cache to view or clear.
Status symbols
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
index aa057be3e..786149544 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt list - List worktrees and optionally branches
+
Usage: wt list [OPTIONS]
wt list <COMMAND>
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
index c9291bf9f..5eac2ce91 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt merge - Merge worktree into target branch
+
Usage: wt merge [OPTIONS] [TARGET]
Arguments:
@@ -63,7 +64,8 @@ Usage: wt merge [OPTIONS] [TARGET]
-v, --verbose
Show commands and debug info
-Merge the current branch into the target branch and clean up. Handles the full workflow: commit uncommitted changes, squash commits, rebase, run hooks, push to target, and remove the worktree.
+Merge the current branch into the target branch and clean up. Handles the full workflow: commit uncommitted changes, squash commits, rebase, run
+hooks, push to target, and remove the worktree.
When already on the target branch or in the main worktree, the worktree is preserved automatically.
@@ -93,7 +95,9 @@ Skip git operations, only run hooks and push:
wt merge runs these steps:
-1. Squash — Stages uncommitted changes, then combines all commits since target into one (like GitHub's "Squash and merge"). Use --stage to control what gets staged: all (default), tracked, or none. A backup ref is saved to refs/wt-backup/<branch>. With --no-squash, uncommitted changes are committed separately and individual commits are preserved.
+1. Squash — Stages uncommitted changes, then combines all commits since target into one (like GitHub's "Squash and merge"). Use --stage to
+control what gets staged: all (default), tracked, or none. A backup ref is saved to refs/wt-backup/<branch>. With --no-squash, uncommitted
+changes are committed separately and individual commits are preserved.
2. Rebase — Rebases onto target if behind. Skipped if already up-to-date. Conflicts abort immediately.
3. Pre-merge hooks — Project commands run after rebase, before merge. Failures abort. See wt hook.
4. Merge — Fast-forward merge to the target branch. Non-fast-forward merges are rejected.
@@ -101,7 +105,8 @@ Skip git operations, only run hooks and push:
6. Cleanup — Removes the worktree and branch. Use --no-remove to keep the worktree.
7. Post-merge hooks — Project commands run after cleanup. Failures are logged but don't abort.
-Use --no-commit to skip all git operations (steps 1-2) and only run hooks and merge. Useful after preparing commits manually with wt step. Requires a clean working tree.
+Use --no-commit to skip all git operations (steps 1-2) and only run hooks and merge. Useful after preparing commits manually with wt step.
+Requires a clean working tree.
See also
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
index fa86712de..8154afcd3 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt merge - Merge worktree into target branch
+
Usage: wt merge [OPTIONS] [TARGET]
Arguments:
diff --git a/tests/snapshots/integration__integration_tests__help__help_no_args.snap b/tests/snapshots/integration__integration_tests__help__help_no_args.snap
index 7520a4fab..93c73819a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_no_args.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_no_args.snap
@@ -16,6 +16,7 @@ exit_code: 0
----- stderr -----
wt - Git worktree management
+
Usage: wt [OPTIONS] [COMMAND]
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
index 2b468d4a8..65e020305 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt remove - Remove worktree and branch
+
Usage: wt remove [OPTIONS] [WORKTREES]...
Arguments:
@@ -73,14 +74,18 @@ Force-delete an unmerged branch:
Branch cleanup
-Branches delete automatically when their content is already in the target branch (typically main). This works with squash-merge and rebase workflows where commit history differs but file changes match.
+Branches delete automatically when their content is already in the target branch (typically main). This works with squash-merge and rebase workflows
+where commit history differs but file changes match.
A branch is safe to delete when its content is already reflected in the target. Worktrunk checks four conditions (in order of cost):
1. Same commit — Branch HEAD is literally the same commit as target.
-2. No added changes — Three-dot diff (main...branch) shows no files. The branch has no file changes beyond the merge-base (includes "branch is ancestor" case).
-3. Tree contents match — Branch tree SHA equals main tree SHA. Commit history differs but file contents are identical (e.g., after a revert or merge commit pulling in main).
-4. Merge adds nothing — Simulated merge (git merge-tree) produces the same tree as main. Handles squash-merged branches where main has since advanced.
+2. No added changes — Three-dot diff (main...branch) shows no files. The branch has no file changes beyond the merge-base (includes "branch is
+ancestor" case).
+3. Tree contents match — Branch tree SHA equals main tree SHA. Commit history differs but file contents are identical (e.g., after a revert or
+merge commit pulling in main).
+4. Merge adds nothing — Simulated merge (git merge-tree) produces the same tree as main. Handles squash-merged branches where main has since
+advanced.
In wt list, _ indicates same commit, and ⊂ indicates content is integrated. Branches showing either are dimmed as safe to delete.
@@ -88,7 +93,8 @@ Use -D to force-delete branches with unmerged changes. Use --no-dele
Background removal
-Removal runs in the background by default (returns immediately). Logs are written to .git/wt-logs/{branch}-remove.log. Use --no-background to run in the foreground.
+Removal runs in the background by default (returns immediately). Logs are written to .git/wt-logs/{branch}-remove.log. Use --no-background to run
+in the foreground.
Arguments resolve by path first, then branch name. Shortcuts: @ (current), - (previous), ^ (main worktree).
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
index 96530694b..c98b432d7 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt remove - Remove worktree and branch
+
Usage: wt remove [OPTIONS] [WORKTREES]...
Arguments:
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_long.snap b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
index dc1d1cdac..f97fdaf31 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
@@ -17,6 +17,7 @@ exit_code: 0
----- stderr -----
wt - Git worktree management
+
Usage: wt [OPTIONS] [COMMAND]
Commands:
@@ -46,4 +47,13 @@ Usage: wt [OPTIONS] [COMMAND]
-v, --verbose
Show commands and debug info
-See wt config --help for configuration file locations and setup.
+Getting started
+
+ wt switch --create feature Create worktree and branch
+ wt switch feature Switch to existing worktree
+ wt merge Squash, rebase, and merge to main
+
+Run wt config shell to set up directory switching.
+
+Docs: https://worktrunk.dev
+GitHub: https://github.com/max-sixty/worktrunk
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_short.snap b/tests/snapshots/integration__integration_tests__help__help_root_short.snap
index 209a5e986..e78df219d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_short.snap
@@ -17,6 +17,7 @@ exit_code: 0
----- stderr -----
wt - Git worktree management
+
Usage: wt [OPTIONS] [COMMAND]
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
index b2bd24af0..a281cb637 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt step - Run individual workflow operations
+
Usage: wt step [OPTIONS] <COMMAND>
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_short.snap b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
index 0a29c08a3..24cedb713 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt step - Run individual workflow operations
+
Usage: wt step [OPTIONS] <COMMAND>
Commands:
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index 8d55bf38c..d67336917 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt switch - Switch to a worktree
+
Usage: wt switch [OPTIONS] <BRANCH>
Arguments:
@@ -38,7 +39,8 @@ Usage: wt switch [OPTIONS] <BRANCH>
-x, --execute <EXECUTE>
Command to run after switch

- Replaces the wt process with the command after switching, giving it full terminal control. Useful for launching editors, AI agents, or other interactive tools.
+ Replaces the wt process with the command after switching, giving it full terminal control. Useful for launching editors, AI agents, or other
+ interactive tools.

Especially useful in shell aliases to create a worktree and start working in one command:

diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
index fd30b2d08..139b065bf 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
@@ -18,6 +18,7 @@ exit_code: 0
----- stderr -----
wt switch - Switch to a worktree
+
Usage: wt switch [OPTIONS] <BRANCH>
Arguments: