refactor(cli): consolidate --no-verify deprecation into one path (#2868)

The deprecated `--no-verify` flag was declared as a clap arg five times
— across `SwitchArgs`, `RemoveArgs`, `CommitArgs`, `SquashArgs`, and
`MergeArgs` — under two field names, resolved through two helpers, with
the deprecation-warning string hand-duplicated in two places.

This collapses the four bool-resolving commands (`switch`, `remove`,
`step commit`, `step squash`) onto a single flattened `HookFlags` args
struct with one `resolve()` method, and routes every `--no-verify`
deprecation warning — merge's included — through one emitter, so the
warning text exists in exactly one place.

`wt merge` keeps its own flags: its hooks flag is genuinely tri-state
(`Option<bool>`, so config `[merge] verify` still applies) with a
positive `--verify` override, which `HookFlags`'s
`SetFalse`/default-true shape cannot express. It shares only the warning
emitter — forcing it into the struct would need a special case.

Behavior is unchanged: `--no-verify` still works as a deprecated alias
and emits the same warning under the same conditions. One visible
`--help` change, a direct consequence of the shared struct: `--no-hooks`
for `step commit`/`step squash` moves under the `Automation` heading,
matching where `switch`/`remove`/`merge` already place it. Doc mirrors
regenerated.

> _This was written by Claude Code on behalf of Maximilian Roos_

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>

Author: max-sixty

docs/content/step.md

@@ -138,9 +138,6 @@ Usage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span>
   <b><span class=c>-b</span></b>, <b><span class=c>--branch</span></b><span class=c> &lt;BRANCH&gt;</span>
           Branch to operate on (defaults to current worktree)
 
-      <b><span class=c>--no-hooks</span></b>
-          Skip hooks
-
       <b><span class=c>--stage</span></b><span class=c> &lt;STAGE&gt;</span>
           What to stage before committing [default: all]
 
@@ -156,6 +153,9 @@ Usage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span>
           Print help (see a summary with &#39;-h&#39;)
 
 <b><span class=g>Automation:</span></b>
+      <b><span class=c>--no-hooks</span></b>
+          Skip hooks
+
       <b><span class=c>--format</span></b><span class=c> &lt;FORMAT&gt;</span>
           Output format
 
@@ -233,9 +233,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>--no-hooks</span></b>
-          Skip hooks
-
       <b><span class=c>--stage</span></b><span class=c> &lt;STAGE&gt;</span>
           What to stage before committing [default: all]
 
@@ -251,6 +248,9 @@ Usage: <b><span class=c>wt step squash</span></b> <span class=c>[OPTIONS]</span>
           Print help (see a summary with &#39;-h&#39;)
 
 <b><span class=g>Automation:</span></b>
+      <b><span class=c>--no-hooks</span></b>
+          Skip hooks
+
       <b><span class=c>--format</span></b><span class=c> &lt;FORMAT&gt;</span>
           Output format
 

skills/worktrunk/reference/step.md

@@ -266,6 +266,39 @@ pub(crate) struct Cli {
     pub command: Option<Commands>,
 }
 
+/// Shared `--no-hooks` / `--no-verify` flags for commands that resolve hook
+/// skipping to a plain `bool` (`switch`, `remove`, `step commit`,
+/// `step squash`).
+///
+/// `wt merge` does not flatten this struct: its hooks flag is tri-state
+/// (`Option<bool>`, so config `[merge] verify` can still apply) and it carries
+/// a positive `--verify` override. It declares its own flags but routes the
+/// `--no-verify` deprecation through `crate::warn_no_verify_deprecated`, so the
+/// warning text lives in exactly one place.
+#[derive(Args)]
+pub(crate) struct HookFlags {
+    /// Skip hooks
+    #[arg(long = "no-hooks", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]
+    pub(crate) verify: bool,
+
+    /// Skip hooks (deprecated alias for --no-hooks)
+    #[arg(long = "no-verify", hide = true)]
+    pub(crate) no_verify_deprecated: bool,
+}
+
+impl HookFlags {
+    /// Resolve to the effective verify value, emitting the deprecation warning
+    /// once if `--no-verify` was used.
+    pub(crate) fn resolve(&self) -> bool {
+        if self.no_verify_deprecated {
+            crate::warn_no_verify_deprecated();
+            false
+        } else {
+            self.verify
+        }
+    }
+}
+
 #[derive(Args)]
 pub(crate) struct SwitchArgs {
     /// Branch name or shortcut
@@ -344,13 +377,8 @@ pub(crate) struct SwitchArgs {
     #[arg(long, overrides_with = "no_cd", hide = true)]
     pub(crate) cd: bool,
 
-    /// Skip hooks
-    #[arg(long = "no-hooks", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]
-    pub(crate) verify: bool,
-
-    /// Skip hooks (deprecated alias for --no-hooks)
-    #[arg(long = "no-verify", hide = true)]
-    pub(crate) no_verify_deprecated: bool,
+    #[command(flatten)]
+    pub(crate) hooks: HookFlags,
 
     /// Output format
     ///
@@ -420,13 +448,8 @@ pub(crate) struct RemoveArgs {
     #[arg(long)]
     pub(crate) foreground: bool,
 
-    /// Skip hooks
-    #[arg(long = "no-hooks", action = clap::ArgAction::SetFalse, default_value_t = true, help_heading = "Automation")]
-    pub(crate) verify: bool,
-
-    /// Skip hooks (deprecated alias for --no-hooks)
-    #[arg(long = "no-verify", hide = true)]
-    pub(crate) no_verify_deprecated: bool,
+    #[command(flatten)]
+    pub(crate) hooks: HookFlags,
 
     /// Force worktree removal
     ///

src/cli/mod.rs

@@ -6,13 +6,8 @@ pub struct CommitArgs {
     #[arg(short, long, add = crate::completion::worktree_only_completer())]
     pub(crate) branch: Option<String>,
 
-    /// Skip hooks
-    #[arg(long = "no-hooks", action = clap::ArgAction::SetFalse, default_value_t = true)]
-    pub(crate) verify: bool,
-
-    /// Skip hooks (deprecated alias for --no-hooks)
-    #[arg(long = "no-verify", hide = true)]
-    pub(crate) no_verify_deprecated: bool,
+    #[command(flatten)]
+    pub(crate) hooks: crate::cli::HookFlags,
 
     /// What to stage before committing [default: all]
     #[arg(long)]
@@ -41,13 +36,8 @@ pub struct SquashArgs {
     #[arg(add = crate::completion::branch_value_completer())]
     pub(crate) target: Option<String>,
 
-    /// Skip hooks
-    #[arg(long = "no-hooks", action = clap::ArgAction::SetFalse, default_value_t = true)]
-    pub(crate) verify: bool,
-
-    /// Skip hooks (deprecated alias for --no-hooks)
-    #[arg(long = "no-verify", hide = true)]
-    pub(crate) no_verify_deprecated: bool,
+    #[command(flatten)]
+    pub(crate) hooks: crate::cli::HookFlags,
 
     /// What to stage before committing [default: all]
     #[arg(long)]

src/cli/step.rs

@@ -144,18 +144,16 @@ fn warn_select_deprecated() {
     );
 }
 
-/// Resolve the `--no-hooks` / `--no-verify` pair: emit a deprecation warning
-/// if the old flag was used, then return the effective verify value.
-fn resolve_verify(verify: bool, no_verify_deprecated: bool) -> bool {
-    if no_verify_deprecated {
-        eprintln!(
-            "{}",
-            warning_message("--no-verify is deprecated; use --no-hooks instead")
-        );
-        false
-    } else {
-        verify
-    }
+/// Emit the canonical `--no-verify` deprecation warning to stderr.
+///
+/// Single source of this warning text. `HookFlags::resolve` (switch, remove,
+/// step commit, step squash) and `handle_merge_command` both call here, so the
+/// message stays identical across every command that accepts `--no-verify`.
+pub(crate) fn warn_no_verify_deprecated() {
+    eprintln!(
+        "{}",
+        warning_message("--no-verify is deprecated; use --no-hooks instead")
+    );
 }
 
 fn handle_hook_command(action: HookCommand, yes: bool) -> anyhow::Result<()> {
@@ -201,7 +199,7 @@ fn handle_hook_command(action: HookCommand, yes: bool) -> anyhow::Result<()> {
 fn handle_step_command(action: StepCommand, yes: bool) -> anyhow::Result<()> {
     match action {
         StepCommand::Commit(args) => {
-            let verify = resolve_verify(args.verify, args.no_verify_deprecated);
+            let verify = args.hooks.resolve();
             let format = args.format;
             // `--show-prompt` and `--dry-run` emit raw text (rendered prompt or LLM
             // preview), which would corrupt a JSON consumer's stdout. Refuse the
@@ -230,7 +228,7 @@ fn handle_step_command(action: StepCommand, yes: bool) -> anyhow::Result<()> {
             Ok(())
         }
         StepCommand::Squash(args) => {
-            let verify = resolve_verify(args.verify, args.no_verify_deprecated);
+            let verify = args.hooks.resolve();
             // `--show-prompt` and `--dry-run` emit raw text (rendered prompt or LLM
             // preview), which would corrupt a JSON consumer's stdout.
             if args.format == SwitchFormat::Json && (args.show_prompt || args.dry_run) {
@@ -670,7 +668,7 @@ fn handle_select_command(_branches: bool, _remotes: bool) -> anyhow::Result<()>
 }
 
 fn handle_switch_command(args: SwitchArgs, yes: bool) -> anyhow::Result<()> {
-    let verify = resolve_verify(args.verify, args.no_verify_deprecated);
+    let verify = args.hooks.resolve();
 
     // With no branch argument, `wt switch` opens a TUI picker — config
     // deprecation warnings would render above the picker and push it down.
@@ -896,7 +894,7 @@ fn validate_remove_targets(
 ///    or success message. See [`commands::process::run_internal_sweep`].
 fn handle_remove_command(args: RemoveArgs, yes: bool) -> anyhow::Result<()> {
     let json_mode = args.format == SwitchFormat::Json;
-    let verify = resolve_verify(args.verify, args.no_verify_deprecated);
+    let verify = args.hooks.resolve();
     UserConfig::load()
         .context("Failed to load config")
         .and_then(|config| {
@@ -1331,10 +1329,7 @@ fn init_logging(verbose_level: u8) {
 
 fn handle_merge_command(args: MergeArgs, yes: bool) -> anyhow::Result<()> {
     if args.no_verify {
-        eprintln!(
-            "{}",
-            warning_message("--no-verify is deprecated; use --no-hooks instead")
-        );
+        warn_no_verify_deprecated();
     }
     handle_merge(MergeOptions {
         target: args.target.as_deref(),

src/main.rs

@@ -2107,6 +2107,39 @@ approved-commands = ["echo 'hook ran' > {}"]
     );
 }
 
+#[rstest]
+fn test_remove_no_verify_deprecated_still_works(mut repo: TestRepo) {
+    let worktree_path = repo.add_worktree("feature-no-verify");
+
+    // --no-verify is a deprecated alias for --no-hooks: still works, still
+    // emits the shared deprecation warning that points at --no-hooks.
+    let output = repo
+        .wt_command()
+        .args([
+            "remove",
+            "--foreground",
+            "--yes",
+            "--no-verify",
+            "feature-no-verify",
+        ])
+        .output()
+        .unwrap();
+    assert!(output.status.success());
+    let stderr = String::from_utf8_lossy(&output.stderr);
+    assert!(
+        stderr.contains("--no-verify is deprecated"),
+        "Expected deprecation warning in stderr: {stderr}"
+    );
+    assert!(
+        stderr.contains("--no-hooks"),
+        "Expected --no-hooks suggestion in stderr: {stderr}"
+    );
+    assert!(
+        !worktree_path.exists(),
+        "Worktree should be removed with --no-verify"
+    );
+}
+
 ///
 /// Even when a worktree is in detached HEAD state (no branch), the pre-remove
 /// hook should still execute.