Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Group help options into Picker and Automation headings (#1355)
Maximilian Roos2bca89a886b1
diff --git a/docs/content/merge.md b/docs/content/merge.mdindex 7ed41a4b4..853ab382b 100644--- a/docs/content/merge.md+++ b/docs/content/merge.md@@ -114,12 +114,6 @@ Usage: <b><span class=c>wt merge</span></b> <span class=c>[OPTIONS]</span> <span<b><span class=c>--no-remove</span></b>Keep worktree after merge- <b><span class=c>--no-verify</span></b>- Skip hooks-- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>--stage</span></b><span class=c> <STAGE></span>What to stage before committing [default: all]@@ -132,6 +126,13 @@ Usage: <b><span class=c>wt merge</span></b> <span class=c>[OPTIONS]</span> <span<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/docs/content/remove.md b/docs/content/remove.mdindex 547e4bf63..ecbeaeaaf 100644--- a/docs/content/remove.md+++ b/docs/content/remove.md@@ -107,12 +107,6 @@ Usage: <b><span class=c>wt remove</span></b> <span class=c>[OPTIONS]</span> <spa<b><span class=c>--foreground</span></b>Run removal in foreground (block until complete)- <b><span class=c>--no-verify</span></b>- Skip hooks-- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>-f</span></b>, <b><span class=c>--force</span></b>Force worktree removal@@ -122,6 +116,13 @@ Usage: <b><span class=c>wt remove</span></b> <span class=c>[OPTIONS]</span> <spa<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/docs/content/step.md b/docs/content/step.mdindex c533ad58f..6e2ce5421 100644--- a/docs/content/step.md+++ b/docs/content/step.md@@ -157,12 +157,6 @@ wt step commit - Stage and commit with LLM-generated messageUsage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span><b><span class=g>Options:</span></b>- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-- <b><span class=c>--no-verify</span></b>- Skip hooks-<b><span class=c>--stage</span></b><span class=c> <STAGE></span>What to stage before committing [default: all]@@ -180,6 +174,13 @@ Usage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span><b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this command@@ -244,12 +245,6 @@ Usage: <b><span class=c>wt step squash</span></b> <span class=c>[OPTIONS]</span>Defaults to default branch.<b><span class=g>Options:</span></b>- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-- <b><span class=c>--no-verify</span></b>- Skip hooks-<b><span class=c>--stage</span></b><span class=c> <STAGE></span>What to stage before committing [default: all]@@ -267,6 +262,13 @@ Usage: <b><span class=c>wt step squash</span></b> <span class=c>[OPTIONS]</span><b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this command@@ -516,9 +518,6 @@ Usage: <b><span class=c>wt step prune</span></b> <span class=c>[OPTIONS]</span><b><span class=c>--dry-run</span></b>Show what would be removed- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>--min-age</span></b><span class=c> <MIN_AGE></span>Skip worktrees younger than this@@ -530,6 +529,10 @@ Usage: <b><span class=c>wt step prune</span></b> <span class=c>[OPTIONS]</span><b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/docs/content/switch.md b/docs/content/switch.mdindex cc7bed3bd..c747ec1f6 100644--- a/docs/content/switch.md+++ b/docs/content/switch.md@@ -208,9 +208,6 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spaworktree, <b>-x 'tmux new -s {{ branch | sanitize }}'</b> starts a tmuxsession named after the branch.- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>--clobber</span></b>Remove stale paths at target@@ -220,9 +217,6 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spaHooks still run normally. Useful when hooks handle navigation (e.g.,tmux workflows) or for CI/automation.- <b><span class=c>--no-verify</span></b>- Skip hooks-<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')@@ -233,6 +227,13 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spa<b><span class=c>--remotes</span></b>Include remote branches+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/skills/worktrunk/reference/merge.md b/skills/worktrunk/reference/merge.mdindex dbe838cb0..01a47354a 100644--- a/skills/worktrunk/reference/merge.md+++ b/skills/worktrunk/reference/merge.md@@ -91,12 +91,6 @@ Usage: <b><span class=c>wt merge</span></b> <span class=c>[OPTIONS]</span> <span<b><span class=c>--no-remove</span></b>Keep worktree after merge- <b><span class=c>--no-verify</span></b>- Skip hooks-- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>--stage</span></b><span class=c> <STAGE></span>What to stage before committing [default: all]@@ -109,6 +103,13 @@ Usage: <b><span class=c>wt merge</span></b> <span class=c>[OPTIONS]</span> <span<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/skills/worktrunk/reference/remove.md b/skills/worktrunk/reference/remove.mdindex 275c27c4b..7744e0f60 100644--- a/skills/worktrunk/reference/remove.md+++ b/skills/worktrunk/reference/remove.md@@ -92,12 +92,6 @@ Usage: <b><span class=c>wt remove</span></b> <span class=c>[OPTIONS]</span> <spa<b><span class=c>--foreground</span></b>Run removal in foreground (block until complete)- <b><span class=c>--no-verify</span></b>- Skip hooks-- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>-f</span></b>, <b><span class=c>--force</span></b>Force worktree removal@@ -107,6 +101,13 @@ Usage: <b><span class=c>wt remove</span></b> <span class=c>[OPTIONS]</span> <spa<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.mdindex b8bbfadb0..976aa4f39 100644--- a/skills/worktrunk/reference/step.md+++ b/skills/worktrunk/reference/step.md@@ -140,12 +140,6 @@ wt step commit - Stage and commit with LLM-generated messageUsage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span><b><span class=g>Options:</span></b>- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-- <b><span class=c>--no-verify</span></b>- Skip hooks-<b><span class=c>--stage</span></b><span class=c> <STAGE></span>What to stage before committing [default: all]@@ -163,6 +157,13 @@ Usage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span><b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this command@@ -225,12 +226,6 @@ Usage: <b><span class=c>wt step squash</span></b> <span class=c>[OPTIONS]</span>Defaults to default branch.<b><span class=g>Options:</span></b>- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-- <b><span class=c>--no-verify</span></b>- Skip hooks-<b><span class=c>--stage</span></b><span class=c> <STAGE></span>What to stage before committing [default: all]@@ -248,6 +243,13 @@ Usage: <b><span class=c>wt step squash</span></b> <span class=c>[OPTIONS]</span><b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this command@@ -491,9 +493,6 @@ Usage: <b><span class=c>wt step prune</span></b> <span class=c>[OPTIONS]</span><b><span class=c>--dry-run</span></b>Show what would be removed- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>--min-age</span></b><span class=c> <MIN_AGE></span>Skip worktrees younger than this@@ -505,6 +504,10 @@ Usage: <b><span class=c>wt step prune</span></b> <span class=c>[OPTIONS]</span><b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/skills/worktrunk/reference/switch.md b/skills/worktrunk/reference/switch.mdindex 122927873..9a7aaea31 100644--- a/skills/worktrunk/reference/switch.md+++ b/skills/worktrunk/reference/switch.md@@ -178,9 +178,6 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spaworktree, <b>-x 'tmux new -s {{ branch | sanitize }}'</b> starts a tmuxsession named after the branch.- <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>- Skip approval prompts-<b><span class=c>--clobber</span></b>Remove stale paths at target@@ -190,9 +187,6 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spaHooks still run normally. Useful when hooks handle navigation (e.g.,tmux workflows) or for CI/automation.- <b><span class=c>--no-verify</span></b>- Skip hooks-<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')@@ -203,6 +197,13 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spa<b><span class=c>--remotes</span></b>Include remote branches+<b><span class=g>Automation:</span></b>+ <b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>+ Skip approval prompts++ <b><span class=c>--no-verify</span></b>+ Skip hooks+<b><span class=g>Global Options:</span></b><b><span class=c>-C</span></b><span class=c> <path></span>Working directory for this commanddiff --git a/src/cli/hook.rs b/src/cli/hook.rsindex 48e3beffb..9c039c7fa 100644--- a/src/cli/hook.rs+++ b/src/cli/hook.rs@@ -30,7 +30,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -54,7 +54,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -78,7 +78,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -110,7 +110,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -140,7 +140,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -162,7 +162,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -184,7 +184,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -206,7 +206,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executing@@ -230,7 +230,7 @@ pub enum HookCommand {name: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Show what would run without executingdiff --git a/src/cli/mod.rs b/src/cli/mod.rsindex 0c31d2785..f70445fa0 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -442,10 +442,6 @@ To change which branch a worktree is on, use `git switch` inside that worktree.#[arg(last = true, requires = "execute")]execute_args: Vec<String>,- /// Skip approval prompts- #[arg(short, long)]- yes: bool,-/// Remove stale paths at target#[arg(long, requires = "branch")]clobber: bool,@@ -457,8 +453,12 @@ To change which branch a worktree is on, use `git switch` inside that worktree.#[arg(long)]no_cd: bool,+ /// Skip approval prompts+ #[arg(short, long, help_heading = "Automation")]+ yes: bool,+/// Skip hooks- #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true)]+ #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]verify: bool,},@@ -839,14 +839,14 @@ Removal runs in the background by default (returns immediately). Logs are writte#[arg(long = "no-background", hide = true)]no_background: bool,- /// Skip hooks- #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true)]- verify: bool,-/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,+ /// Skip hooks+ #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]+ verify: bool,+/// Force worktree removal////// Remove worktrees even if they contain untracked files (like build@@ -968,18 +968,22 @@ lint = "cargo clippy"#[arg(long = "no-remove", overrides_with = "remove")]no_remove: bool,+ /// Skip approval prompts+ #[arg(short, long, help_heading = "Automation")]+ yes: bool,+/// Force running hooks#[arg(long, overrides_with = "no_verify", hide = true)]verify: bool,/// Skip hooks- #[arg(long = "no-verify", overrides_with = "verify")]+ #[arg(+ long = "no-verify",+ overrides_with = "verify",+ help_heading = "Automation"+ )]no_verify: bool,- /// Skip approval prompts- #[arg(short, long)]- yes: bool,-/// What to stage before committing [default: all]#[arg(long)]stage: Option<crate::commands::commit::StageMode>,diff --git a/src/cli/step.rs b/src/cli/step.rsindex ecfc562fd..d63684b21 100644--- a/src/cli/step.rs+++ b/src/cli/step.rs@@ -46,11 +46,11 @@ wt step commit --show-prompt | llm -m gpt-5-nano)]Commit {/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Skip hooks- #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true)]+ #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]verify: bool,/// What to stage before committing [default: all]@@ -110,11 +110,11 @@ wt step squash --show-prompt | lesstarget: Option<String>,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Skip hooks- #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true)]+ #[arg(long = "no-verify", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]verify: bool,/// What to stage before committing [default: all]@@ -462,7 +462,7 @@ wt step prunedry_run: bool,/// Skip approval prompts- #[arg(short, long)]+ #[arg(short, long, help_heading = "Automation")]yes: bool,/// Skip worktrees younger than thisdiff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snapindex 277db1478..72218a7db 100644--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap@@ -11,12 +11,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ NO_COLOR: ""PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacrittyWORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"@@ -52,12 +54,6 @@ Options:--no-removeKeep worktree after merge- --no-verify- Skip hooks-- -y, --yes- Skip approval prompts---stage <STAGE>What to stage before committing [default: all]@@ -69,6 +65,13 @@ Options:-h, --helpPrint help (see a summary with '-h')+Automation:+ -y, --yes+ Skip approval prompts++ --no-verify+ Skip hooks+Global Options:-C <path>Working directory for this commanddiff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snapindex 361f9638e..0a967f4a4 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap@@ -56,12 +56,6 @@ Usage: [1m[36mwt merge[0m [36m[OPTIONS][0m [36m[TARGET][0m[1m[36m--no-remove[0mKeep worktree after merge- [1m[36m--no-verify[0m- Skip hooks-- [1m[36m-y[0m, [1m[36m--yes[0m- Skip approval prompts-[1m[36m--stage[0m[36m [0m[36m<STAGE>[0mWhat to stage before committing [default: all]@@ -73,6 +67,13 @@ Usage: [1m[36mwt merge[0m [36m[OPTIONS][0m [36m[TARGET][0m[1m[36m-h[0m, [1m[36m--help[0mPrint help (see a summary with '-h')+[1m[32mAutomation:[0m+ [1m[36m-y[0m, [1m[36m--yes[0m+ Skip approval prompts++ [1m[36m--no-verify[0m+ Skip hooks+[1m[32mGlobal Options:[0m[1m[36m-C[0m[36m [0m[36m<path>[0mWorking directory for this commanddiff --git a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap b/tests/snapshots/integration__integration_tests__help__help_merge_short.snapindex ea7e0b5ca..b696378f8 100644--- a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap@@ -11,14 +11,18 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ NO_COLOR: ""PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_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"---@@ -39,11 +43,13 @@ Usage: [1m[36mwt merge[0m [36m[OPTIONS][0m [36m[TARGET][0m[1m[36m--no-commit[0m Skip commit and squash[1m[36m--no-rebase[0m Skip rebase (fail if not already rebased)[1m[36m--no-remove[0m Keep worktree after merge- [1m[36m--no-verify[0m Skip hooks- [1m[36m-y[0m, [1m[36m--yes[0m Skip approval prompts[1m[36m--stage[0m[36m [0m[36m<STAGE>[0m What to stage before committing [default: all] [possible values: all, tracked, none][1m[36m-h[0m, [1m[36m--help[0m Print help (see more with '--help')+[1m[32mAutomation:[0m+ [1m[36m-y[0m, [1m[36m--yes[0m Skip approval prompts+ [1m[36m--no-verify[0m Skip hooks+[1m[32mGlobal Options:[0m[1m[36m-C[0m[36m [0m[36m<path>[0m Working directory for this command[1m[36m--config[0m[36m [0m[36m<path>[0m User config file pathdiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snapindex bb5f062da..cb4112c86 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap@@ -51,12 +51,6 @@ Usage: [1m[36mwt remove[0m [36m[OPTIONS][0m [36m[BRANCHES]...[0m[1m[36m--foreground[0mRun removal in foreground (block until complete)- [1m[36m--no-verify[0m- Skip hooks-- [1m[36m-y[0m, [1m[36m--yes[0m- Skip approval prompts-[1m[36m-f[0m, [1m[36m--force[0mForce worktree removal[0m@@ -65,6 +59,13 @@ Usage: [1m[36mwt remove[0m [36m[OPTIONS][0m [36m[BRANCHES]...[0m[1m[36m-h[0m, [1m[36m--help[0mPrint help (see a summary with '-h')+[1m[32mAutomation:[0m+ [1m[36m-y[0m, [1m[36m--yes[0m+ Skip approval prompts++ [1m[36m--no-verify[0m+ Skip hooks+[1m[32mGlobal Options:[0m[1m[36m-C[0m[36m [0m[36m<path>[0mWorking directory for this commanddiff --git a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap b/tests/snapshots/integration__integration_tests__help__help_remove_short.snapindex ad6073a95..164f3f509 100644--- a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap@@ -11,14 +11,18 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ NO_COLOR: ""PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_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"---@@ -38,11 +42,13 @@ Usage: [1m[36mwt remove[0m [36m[OPTIONS][0m [36m[BRANCHES]...[0m[1m[36m--no-delete-branch[0m Keep branch after removal[1m[36m-D[0m, [1m[36m--force-delete[0m Delete unmerged branches[1m[36m--foreground[0m Run removal in foreground (block until complete)- [1m[36m--no-verify[0m Skip hooks- [1m[36m-y[0m, [1m[36m--yes[0m Skip approval prompts[1m[36m-f[0m, [1m[36m--force[0m Force worktree removal[1m[36m-h[0m, [1m[36m--help[0m Print help (see more with '--help')+[1m[32mAutomation:[0m+ [1m[36m-y[0m, [1m[36m--yes[0m Skip approval prompts+ [1m[36m--no-verify[0m Skip hooks+[1m[32mGlobal Options:[0m[1m[36m-C[0m[36m [0m[36m<path>[0m Working directory for this command[1m[36m--config[0m[36m [0m[36m<path>[0m User config file pathdiff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snapindex 894f4f69d..d334af32e 100644--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap@@ -71,9 +71,6 @@ Usage: [1m[36mwt switch[0m [36m[OPTIONS][0m [36m[BRANCH][0m [1m[36m[--Template example: [1m-x 'code {{ worktree_path }}'[0m opens VS Code at the worktree, [1m-x 'tmux new -s {{ branch | sanitize }}'[0m starts a tmux session named after the branch.[0m- [1m[36m-y[0m, [1m[36m--yes[0m- Skip approval prompts-[1m[36m--clobber[0mRemove stale paths at target@@ -82,9 +79,6 @@ Usage: [1m[36mwt switch[0m [36m[OPTIONS][0m [36m[BRANCH][0m [1m[36m[--Hooks still run normally. Useful when hooks handle navigation (e.g., tmux workflows) or for CI/automation.[0m- [1m[36m--no-verify[0m- Skip hooks-[1m[36m-h[0m, [1m[36m--help[0mPrint help (see a summary with '-h')@@ -95,6 +89,13 @@ Usage: [1m[36mwt switch[0m [36m[OPTIONS][0m [36m[BRANCH][0m [1m[36m[--[1m[36m--remotes[0mInclude remote branches+[1m[32mAutomation:[0m+ [1m[36m-y[0m, [1m[36m--yes[0m+ Skip approval prompts++ [1m[36m--no-verify[0m+ Skip hooks+[1m[32mGlobal Options:[0m[1m[36m-C[0m[36m [0m[36m<path>[0mWorking directory for this commanddiff --git a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap b/tests/snapshots/integration__integration_tests__help__help_switch_short.snapindex 032ab19b0..d8b2e5738 100644--- a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap@@ -43,16 +43,18 @@ Usage: [1m[36mwt switch[0m [36m[OPTIONS][0m [36m[BRANCH][0m [1m[36m[--[1m[36m-c[0m, [1m[36m--create[0m Create a new branch[1m[36m-b[0m, [1m[36m--base[0m[36m [0m[36m<BASE>[0m Base branch[1m[36m-x[0m, [1m[36m--execute[0m[36m [0m[36m<EXECUTE>[0m Command to run after switch- [1m[36m-y[0m, [1m[36m--yes[0m Skip approval prompts[1m[36m--clobber[0m Remove stale paths at target[1m[36m--no-cd[0m Skip directory change after switching- [1m[36m--no-verify[0m Skip hooks[1m[36m-h[0m, [1m[36m--help[0m Print help (see more with '--help')[1m[32mPicker Options:[0m[1m[36m--branches[0m Include branches without worktrees[1m[36m--remotes[0m Include remote branches+[1m[32mAutomation:[0m+ [1m[36m-y[0m, [1m[36m--yes[0m Skip approval prompts+ [1m[36m--no-verify[0m Skip hooks+[1m[32mGlobal Options:[0m[1m[36m-C[0m[36m [0m[36m<path>[0m Working directory for this command[1m[36m--config[0m[36m [0m[36m<path>[0m User config file path