Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Move approvals command from config to hook
Maximilian Roosb7b1b9e3c84e
diff --git a/docs/content/config.md b/docs/content/config.mdindex a6dd07a34..a713bcbf7 100644--- a/docs/content/config.md+++ b/docs/content/config.md@@ -127,7 +127,7 @@ approved-commands = []```-Manage approvals with `wt config approvals add` to review and pre-approve commands, and `wt config approvals clear` to reset (add `--global` to clear all projects).+Manage approvals with `wt hook approvals add` to review and pre-approve commands, and `wt hook approvals clear` to reset (add `--global` to clear all projects).### User hooks@@ -635,12 +635,11 @@ wt config - Manage configuration and shell integrationUsage: wt config [OPTIONS] <COMMAND>Commands:- shell Shell integration setup- create Create configuration file- show Show configuration files & locations- cache Manage caches (CI status, default branch)- var Get or set runtime variables (stored in git config)- approvals Manage command approvals+ shell Shell integration setup+ create Create configuration file+ show Show configuration files & locations+ cache Manage caches (CI status, default branch)+ var Get or set runtime variables (stored in git config)Options:-h, --helpdiff --git a/docs/content/hook.md b/docs/content/hook.mdindex 13eb2e9c4..4c33f4be8 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -177,7 +177,7 @@ Project commands require approval on first run:- Use `--force` to bypass prompts (useful for CI/automation)- Use `--no-verify` to skip hooks-Manage approvals with `wt config approvals add` and `wt config approvals clear`.+Manage approvals with `wt hook approvals add` and `wt hook approvals clear`.## User hooks@@ -360,6 +360,7 @@ Commands:pre-merge Run pre-merge hookspost-merge Run post-merge hookspre-remove Run pre-remove hooks+ approvals Manage command approvalsOptions:-h, --helpdiff --git a/src/cli.rs b/src/cli.rsindex d453c5d7c..97f13f2e1 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -383,47 +383,6 @@ wt config var clear marker --all#[command(subcommand)]action: VarCommand,},-- /// Manage command approvals- #[command(after_long_help = r#"## How Approvals Work--Commands from project hooks (`.config/wt.toml`) and LLM configuration require-approval on first run. This prevents untrusted projects from running arbitrary-commands.--**Approval flow:**-1. Command is shown with expanded template variables-2. User approves or denies-3. Approved commands are saved to user config under `[projects."project-id"]`--**When re-approval is required:**-- Command template changes (not just variable values)-- Project ID changes (repository moves)--**Bypassing prompts:**-- `--force` flag on individual commands (e.g., `wt merge --force`)-- Useful for CI/automation where prompts aren't possible--## Examples--Pre-approve all commands for current project:-```console-wt config approvals add-```--Clear approvals for current project:-```console-wt config approvals clear-```--Clear global approvals:-```console-wt config approvals clear --global-```"#)]- Approvals {- #[command(subcommand)]- action: ApprovalsCommand,- },}#[derive(Subcommand)]@@ -741,6 +700,47 @@ pub enum HookCommand {#[arg(short, long)]force: bool,},++ /// Manage command approvals+ #[command(after_long_help = r#"## How Approvals Work++Commands from project hooks (`.config/wt.toml`) and LLM configuration require+approval on first run. This prevents untrusted projects from running arbitrary+commands.++**Approval flow:**+1. Command is shown with expanded template variables+2. User approves or denies+3. Approved commands are saved to user config under `[projects."project-id"]`++**When re-approval is required:**+- Command template changes (not just variable values)+- Project ID changes (repository moves)++**Bypassing prompts:**+- `--force` flag on individual commands (e.g., `wt merge --force`)+- Useful for CI/automation where prompts aren't possible++## Examples++Pre-approve all commands for current project:+```console+wt hook approvals add+```++Clear approvals for current project:+```console+wt hook approvals clear+```++Clear global approvals:+```console+wt hook approvals clear --global+```"#)]+ Approvals {+ #[command(subcommand)]+ action: ApprovalsCommand,+ },}/// Subcommands for `wt list`@@ -886,7 +886,7 @@ approved-commands = []```-Manage approvals with `wt config approvals add` to review and pre-approve commands, and `wt config approvals clear` to reset (add `--global` to clear all projects).+Manage approvals with `wt hook approvals add` to review and pre-approve commands, and `wt hook approvals clear` to reset (add `--global` to clear all projects).### User hooks@@ -1211,7 +1211,7 @@ Project commands require approval on first run:- Use `--force` to bypass prompts (useful for CI/automation)- Use `--no-verify` to skip hooks-Manage approvals with `wt config approvals add` and `wt config approvals clear`.+Manage approvals with `wt hook approvals add` and `wt hook approvals clear`.## User hooksdiff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex 59a813377..7ffb2e05b 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -559,7 +559,7 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {Ok(RebaseResult::Rebased)}-/// Handle `wt config approvals add` command - approve all commands in the project+/// Handle `wt hook approvals add` command - approve all commands in the projectpub fn add_approvals(show_all: bool) -> anyhow::Result<()> {use super::command_approval::approve_command_batch;use worktrunk::config::WorktrunkConfig;@@ -619,7 +619,7 @@ pub fn add_approvals(show_all: bool) -> anyhow::Result<()> {Ok(())}-/// Handle `wt config approvals clear` command - clear approved commands+/// Handle `wt hook approvals clear` command - clear approved commandspub fn clear_approvals(global: bool) -> anyhow::Result<()> {use worktrunk::config::WorktrunkConfig;diff --git a/src/git/error.rs b/src/git/error.rsindex 448a97ba5..60694d22a 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -417,7 +417,7 @@ impl std::fmt::Display for GitError {"{}\n\n{}",error_message("Cannot prompt for approval in non-interactive environment"),hint_message(cformat!(- "In CI/CD, use <bright-black>--force</> to skip prompts. To pre-approve commands, use <bright-black>wt config approvals add</>"+ "In CI/CD, use <bright-black>--force</> to skip prompts. To pre-approve commands, use <bright-black>wt hook approvals add</>")))}diff --git a/src/main.rs b/src/main.rsindex 26035ac57..9c72cf884 100644--- a/src/main.rs+++ b/src/main.rs@@ -891,10 +891,6 @@ fn main() {VarCommand::Set { key, value, branch } => handle_var_set(&key, value, branch),VarCommand::Clear { key, branch, all } => handle_var_clear(&key, branch, all),},- ConfigCommand::Approvals { action } => match action {- ApprovalsCommand::Add { all } => add_approvals(all),- ApprovalsCommand::Clear { global } => clear_approvals(global),- },},Commands::Step { action } => match action {StepCommand::Commit {@@ -999,6 +995,10 @@ fn main() {HookCommand::PreRemove { name, force } => {run_hook(HookType::PreRemove, force, name.as_deref())}+ HookCommand::Approvals { action } => match action {+ ApprovalsCommand::Add { all } => add_approvals(all),+ ApprovalsCommand::Clear { global } => clear_approvals(global),+ },},#[cfg(unix)]Commands::Select => handle_select(cli.internal),diff --git a/tests/integration_tests/approvals.rs b/tests/integration_tests/approvals.rsindex 27b710f25..ceabcd462 100644--- a/tests/integration_tests/approvals.rs+++ b/tests/integration_tests/approvals.rs@@ -8,7 +8,7 @@ use worktrunk::config::WorktrunkConfig;fn snapshot_add_approvals(test_name: &str, repo: &TestRepo, args: &[&str]) {let settings = setup_snapshot_settings(repo);settings.bind(|| {- let mut cmd = make_snapshot_cmd(repo, "config", &[], None);+ let mut cmd = make_snapshot_cmd(repo, "hook", &[], None);cmd.arg("approvals").arg("add").args(args);assert_cmd_snapshot!(test_name, cmd);});@@ -18,7 +18,7 @@ fn snapshot_add_approvals(test_name: &str, repo: &TestRepo, args: &[&str]) {fn snapshot_clear_approvals(test_name: &str, repo: &TestRepo, args: &[&str]) {let settings = setup_snapshot_settings(repo);settings.bind(|| {- let mut cmd = make_snapshot_cmd(repo, "config", &[], None);+ let mut cmd = make_snapshot_cmd(repo, "hook", &[], None);cmd.arg("approvals").arg("clear").args(args);assert_cmd_snapshot!(test_name, cmd);});@@ -143,7 +143,7 @@ fn test_clear_approvals_after_clear() {.unwrap();// Clear approvals- let mut cmd = make_snapshot_cmd(&repo, "config", &[], None);+ let mut cmd = make_snapshot_cmd(&repo, "hook", &[], None);cmd.arg("approvals").arg("clear");cmd.output().unwrap();diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rsindex a041a6db6..ea972f1ec 100644--- a/tests/integration_tests/completion.rs+++ b/tests/integration_tests/completion.rs@@ -727,10 +727,11 @@ fn test_complete_hook_subcommands() {assert!(subcommands.contains(&"pre-merge"), "Missing pre-merge");assert!(subcommands.contains(&"post-merge"), "Missing post-merge");assert!(subcommands.contains(&"pre-remove"), "Missing pre-remove");+ assert!(subcommands.contains(&"approvals"), "Missing approvals");assert_eq!(subcommands.len(),- 7,- "Should have exactly 7 hook subcommands"+ 8,+ "Should have exactly 8 hook subcommands");// Test 2: Partial input "po" - filters to post-* subcommandsdiff --git a/tests/integration_tests/help.rs b/tests/integration_tests/help.rsindex 50595e4be..0ab86b029 100644--- a/tests/integration_tests/help.rs+++ b/tests/integration_tests/help.rs@@ -147,22 +147,22 @@ fn help_config_var_clear() {}#[test]-fn help_config_approvals() {- snapshot_help("help_config_approvals", &["config", "approvals", "--help"]);+fn help_hook_approvals() {+ snapshot_help("help_hook_approvals", &["hook", "approvals", "--help"]);}#[test]-fn help_config_approvals_add() {+fn help_hook_approvals_add() {snapshot_help(- "help_config_approvals_add",- &["config", "approvals", "add", "--help"],+ "help_hook_approvals_add",+ &["hook", "approvals", "add", "--help"],);}#[test]-fn help_config_approvals_clear() {+fn help_hook_approvals_clear() {snapshot_help(- "help_config_approvals_clear",- &["config", "approvals", "clear", "--help"],+ "help_hook_approvals_clear",+ &["hook", "approvals", "clear", "--help"],);}diff --git a/tests/snapshots/git_error_display__not_interactive.snap b/tests/snapshots/git_error_display__not_interactive.snapindex 9b5bf352f..bb1b8ca98 100644--- a/tests/snapshots/git_error_display__not_interactive.snap+++ b/tests/snapshots/git_error_display__not_interactive.snap@@ -4,4 +4,4 @@ expression: err.to_string()---β [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snapindex 4a44a942f..071817782 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap@@ -30,4 +30,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snapindex 127cffb25..db2de9676 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap@@ -14,4 +14,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snapindex 871d8a752..c3ed37c79 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap@@ -18,4 +18,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mcd[0m[2m [REPO].test-nested-branch [0m[2m[36m&&[0m[2m [0m[2m[34mpwd[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snapindex df0ae93f9..cc86913cc 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap@@ -16,4 +16,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snapindex 5897426a0..3fdbd8f03 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap@@ -12,4 +12,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree path: [REPO].feature-test-approval'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snapindex 127cffb25..db2de9676 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap@@ -14,4 +14,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snapindex 3e79ad0cd..f69bc8de7 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap@@ -12,4 +12,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snapindex c9abbe748..f73906acb 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap@@ -12,4 +12,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Post-merge cleanup for main'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snapindex e2dc71126..d9688745e 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap@@ -12,4 +12,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running pre-merge checks on main'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snapindex 28a0e316e..ef1a8f354 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- add- "--all"@@ -31,4 +31,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test'[0m[2m[0mβ [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22m+π‘ [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snapindex bf4ce0c48..d5d05238b 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- addenv:diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snapindex 80da913b9..fed3cfa25 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- addenv:diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snapindex 15ae92248..faa0829d1 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- clearenv:diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snapindex fd64f8f8e..88df60bf7 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- clear- "--global"diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snapindex 307646afd..df8cbae65 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- clear- "--global"diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snapindex 15ae92248..faa0829d1 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- clearenv:diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snapindex 15ae92248..faa0829d1 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- clearenv:diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snapindex 15ae92248..faa0829d1 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/approvals.rsinfo:program: wtargs:- - config+ - hook- approvals- clearenv:diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex c932ca09c..a194dcde9 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -22,12 +22,11 @@ wt config - Manage configuration and shell integrationUsage: [1m[36mwt config[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[32mCommands:[0m- [1m[36mshell[0m Shell integration setup- [1m[36mcreate[0m Create configuration file- [1m[36mshow[0m Show configuration files & locations- [1m[36mcache[0m Manage caches (CI status, default branch)- [1m[36mvar[0m Get or set runtime variables (stored in git config)- [1m[36mapprovals[0m Manage command approvals+ [1m[36mshell[0m Shell integration setup+ [1m[36mcreate[0m Create configuration file+ [1m[36mshow[0m Show configuration files & locations+ [1m[36mcache[0m Manage caches (CI status, default branch)+ [1m[36mvar[0m Get or set runtime variables (stored in git config)[1m[32mOptions:[0m[1m[36m-h[0m, [1m[36m--help[0m@@ -142,8 +141,8 @@ When project hooks run for the first time, Worktrunk prompts for approval. Appro[2m "pre-merge.test = npm test",[0m[2m][0m-Manage approvals with [2mwt config approvals add[0m to review and pre-approve commands, and [2mwt config approvals clear[0m to reset (add [2m--global[0m to clear-all projects).+Manage approvals with [2mwt hook approvals add[0m to review and pre-approve commands, and [2mwt hook approvals clear[0m to reset (add [2m--global[0m to clear all+projects).[1mUser hooks[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_short.snap b/tests/snapshots/integration__integration_tests__help__help_config_short.snapindex a2e5ed83d..c156fc9a4 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_short.snap@@ -22,12 +22,11 @@ wt config - Manage configuration and shell integrationUsage: [1m[36mwt config[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[32mCommands:[0m- [1m[36mshell[0m Shell integration setup- [1m[36mcreate[0m Create configuration file- [1m[36mshow[0m Show configuration files & locations- [1m[36mcache[0m Manage caches (CI status, default branch)- [1m[36mvar[0m Get or set runtime variables (stored in git config)- [1m[36mapprovals[0m Manage command approvals+ [1m[36mshell[0m Shell integration setup+ [1m[36mcreate[0m Create configuration file+ [1m[36mshow[0m Show configuration files & locations+ [1m[36mcache[0m Manage caches (CI status, default branch)+ [1m[36mvar[0m Get or set runtime variables (stored in git config)[1m[32mOptions:[0m[1m[36m-h[0m, [1m[36m--help[0m Print help (see more with '--help')diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_hook_approvals.snapsimilarity index 86%rename from tests/snapshots/integration__integration_tests__help__help_config_approvals.snaprename to tests/snapshots/integration__integration_tests__help__help_hook_approvals.snapindex d7fbde824..84624165c 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap+++ b/tests/snapshots/integration__integration_tests__help__help_hook_approvals.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/help.rsinfo:program: wtargs:- - config+ - hook- approvals- "--help"env:@@ -18,9 +18,9 @@ exit_code: 0----- stdout ---------- stderr ------wt config approvals - Manage command approvals+wt hook approvals - Manage command approvals-Usage: [1m[36mwt config approvals[0m [36m[OPTIONS][0m [36m<COMMAND>[0m+Usage: [1m[36mwt hook approvals[0m [36m[OPTIONS][0m [36m<COMMAND>[0m[1m[32mCommands:[0m[1m[36madd[0m Store approvals in config@@ -62,10 +62,10 @@ commands.[32mExamples[0mPre-approve all commands for current project:- [2mwt config approvals add[0m+ [2mwt hook approvals add[0mClear approvals for current project:- [2mwt config approvals clear[0m+ [2mwt hook approvals clear[0mClear global approvals:- [2mwt config approvals clear --global[0m+ [2mwt hook approvals clear --global[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snapsimilarity index 88%rename from tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snaprename to tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snapindex a19f2b76c..5f83ce4e9 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap+++ b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_add.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/help.rsinfo:program: wtargs:- - config+ - hook- approvals- add- "--help"@@ -19,9 +19,9 @@ exit_code: 0----- stdout ---------- stderr ------wt config approvals add - Store approvals in config+wt hook approvals add - Store approvals in config-Usage: [1m[36mwt config approvals add[0m [36m[OPTIONS][0m+Usage: [1m[36mwt hook approvals add[0m [36m[OPTIONS][0m[1m[32mOptions:[0m[1m[36m--all[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snapsimilarity index 87%rename from tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snaprename to tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snapindex 9f1d6370e..9733668db 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap+++ b/tests/snapshots/integration__integration_tests__help__help_hook_approvals_clear.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/help.rsinfo:program: wtargs:- - config+ - hook- approvals- clear- "--help"@@ -19,9 +19,9 @@ exit_code: 0----- stdout ---------- stderr ------wt config approvals clear - Clear approved commands from config+wt hook approvals clear - Clear approved commands from config-Usage: [1m[36mwt config approvals clear[0m [36m[OPTIONS][0m+Usage: [1m[36mwt hook approvals clear[0m [36m[OPTIONS][0m[1m[32mOptions:[0m[1m[36m-g[0m, [1m[36m--global[0m