Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor: Rename `approvals ask` to `approvals add`
Maximilian Roosc77f0fa62fcd
diff --git a/src/cli.rs b/src/cli.rsindex a179ddd0f..827e5089a 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -254,7 +254,7 @@ pub enum ApprovalsCommand {By default, shows only unapproved commands. Use `--all` to review all commandsincluding previously approved ones. Use `--force` to approve without prompts."#)]- Ask {+ Add {/// Skip approval prompts#[arg(short, long)]force: bool,@@ -344,7 +344,7 @@ commands.Pre-approve all commands for current project:```console-wt config approvals ask+wt config approvals add```Clear approvals for current project:diff --git a/src/commands/mod.rs b/src/commands/mod.rsindex 5271a99fb..14e0ae165 100644--- a/src/commands/mod.rs+++ b/src/commands/mod.rs@@ -28,7 +28,7 @@ pub use merge::handle_merge;#[cfg(unix)]pub use select::handle_select;pub use standalone::{- RebaseResult, handle_rebase, handle_squash, handle_standalone_ask_approvals,+ RebaseResult, handle_rebase, handle_squash, handle_standalone_add_approvals,handle_standalone_clear_approvals, handle_standalone_commit, handle_standalone_run_hook,};pub use worktree::{handle_remove, handle_switch};diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex c276d37f6..46703b4e5 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -346,8 +346,8 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {Ok(RebaseResult::Rebased)}-/// Handle `wt config approvals ask` command - approve all commands in the project-pub fn handle_standalone_ask_approvals(force: bool, show_all: bool) -> anyhow::Result<()> {+/// Handle `wt config approvals add` command - approve all commands in the project+pub fn handle_standalone_add_approvals(force: bool, show_all: bool) -> anyhow::Result<()> {use super::command_approval::approve_command_batch;use worktrunk::config::WorktrunkConfig;diff --git a/src/git/error.rs b/src/git/error.rsindex 9bea38595..615bcf6d9 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -190,7 +190,7 @@ pub fn merge_commits_found() -> anyhow::Error {/// Not interactive errorpub fn not_interactive() -> anyhow::Error {anyhow::anyhow!(- "{ERROR_EMOJI} {ERROR}Cannot prompt for approval in non-interactive environment{ERROR:#}\n\n{HINT_EMOJI} {HINT}In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Cannot prompt for approval in non-interactive environment{ERROR:#}\n\n{HINT_EMOJI} {HINT}In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'{HINT:#}")}diff --git a/src/main.rs b/src/main.rsindex 000cd49cc..b23a27f44 100644--- a/src/main.rs+++ b/src/main.rs@@ -27,7 +27,7 @@ use commands::{ConfigAction, RebaseResult, handle_config_create, handle_config_refresh_cache,handle_config_show, handle_config_status_set, handle_config_status_unset,handle_configure_shell, handle_init, handle_list, handle_merge, handle_rebase, handle_remove,- handle_squash, handle_standalone_ask_approvals, handle_standalone_clear_approvals,+ handle_squash, handle_standalone_add_approvals, handle_standalone_clear_approvals,handle_standalone_commit, handle_standalone_run_hook, handle_switch, handle_unconfigure_shell,};use output::{execute_user_command, handle_remove_output, handle_switch_output};@@ -479,7 +479,7 @@ fn main() {StatusAction::Unset { target } => handle_config_status_unset(target),},ConfigCommand::Approvals { action } => match action {- ApprovalsCommand::Ask { force, all } => handle_standalone_ask_approvals(force, all),+ ApprovalsCommand::Add { force, all } => handle_standalone_add_approvals(force, all),ApprovalsCommand::Clear { global } => handle_standalone_clear_approvals(global),},},diff --git a/tests/integration_tests/approvals.rs b/tests/integration_tests/approvals.rsindex d4cc6fcdd..9dae5ac10 100644--- a/tests/integration_tests/approvals.rs+++ b/tests/integration_tests/approvals.rs@@ -1,15 +1,15 @@-//! Integration tests for ask-approvals and clear-approvals commands+//! Integration tests for add-approvals and clear-approvals commandsuse crate::common::{TestRepo, make_snapshot_cmd, setup_snapshot_settings};use insta_cmd::assert_cmd_snapshot;use worktrunk::config::WorktrunkConfig;-/// Helper to snapshot ask-approvals command-fn snapshot_ask_approvals(test_name: &str, repo: &TestRepo, args: &[&str]) {+/// Helper to snapshot add-approvals command+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);- cmd.arg("approvals").arg("ask").args(args);+ cmd.arg("approvals").arg("add").args(args);assert_cmd_snapshot!(test_name, cmd);});}@@ -25,45 +25,45 @@ fn snapshot_clear_approvals(test_name: &str, repo: &TestRepo, args: &[&str]) {}// ============================================================================-// ask-approvals tests+// add-approvals tests// ============================================================================#[test]-fn test_ask_approvals_no_config() {+fn test_add_approvals_no_config() {let repo = TestRepo::new();repo.commit("Initial commit");- snapshot_ask_approvals("ask_approvals_no_config", &repo, &[]);+ snapshot_add_approvals("add_approvals_no_config", &repo, &[]);}#[test]-fn test_ask_approvals_force() {+fn test_add_approvals_force() {let repo = TestRepo::new();repo.commit("Initial commit");repo.write_project_config(r#"post-create = "echo 'test'""#);repo.commit("Add config");- snapshot_ask_approvals("ask_approvals_force", &repo, &["--force"]);+ snapshot_add_approvals("add_approvals_force", &repo, &["--force"]);}#[test]-fn test_ask_approvals_all_with_none_approved() {+fn test_add_approvals_all_with_none_approved() {let repo = TestRepo::new();repo.commit("Initial commit");repo.write_project_config(r#"post-create = "echo 'test'""#);repo.commit("Add config");- snapshot_ask_approvals("ask_approvals_all_none_approved", &repo, &["--all"]);+ snapshot_add_approvals("add_approvals_all_none_approved", &repo, &["--all"]);}#[test]-fn test_ask_approvals_empty_config() {+fn test_add_approvals_empty_config() {let repo = TestRepo::new();repo.commit("Initial commit");repo.write_project_config("");repo.commit("Add empty config");- snapshot_ask_approvals("ask_approvals_empty_config", &repo, &[]);+ snapshot_add_approvals("add_approvals_empty_config", &repo, &[]);}// ============================================================================diff --git a/tests/integration_tests/help.rs b/tests/integration_tests/help.rsindex ddfa02b86..04454cbfa 100644--- a/tests/integration_tests/help.rs+++ b/tests/integration_tests/help.rs@@ -97,10 +97,10 @@ fn help_config_approvals() {}#[test]-fn help_config_approvals_ask() {+fn help_config_approvals_add() {snapshot_help(- "help_config_approvals_ask",- &["config", "approvals", "ask", "--help"],+ "help_config_approvals_add",+ &["config", "approvals", "add", "--help"],);}diff --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 a54265aaf..6363faa79 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@@ -24,7 +24,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mdiff --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 3495a3f7a..2c2d170b7 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0mdiff --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 d24ded3bf..01ea3c48c 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m4[0m[33m commands:[0mdiff --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 4dc6cde07..78e0ee843 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0mdiff --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 a7ad82325..7e700b9a5 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mdiff --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 3495a3f7a..2c2d170b7 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0mdiff --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 3c81ef554..252978cfb 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mdiff --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 c2437f37e..dc23fbff9 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mdiff --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 a371492c2..deac852da 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@@ -6,7 +6,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snapsimilarity index 94%rename from tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snaprename to tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snapindex 47130162d..deaf5c9da 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap@@ -5,7 +5,7 @@ info:args:- config- approvals- - ask+ - add- "--all"env:CLICOLOR_FORCE: "1"@@ -25,7 +25,7 @@ exit_code: 1----- stdout -----β [31mCannot prompt for approval in non-interactive environment[0m-π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals ask'[0m+π‘ [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m----- stderr -----π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snapsimilarity index 98%rename from tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snaprename to tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snapindex 0738be824..5295feb9b 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_empty_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap@@ -5,7 +5,7 @@ info:args:- config- approvals- - ask+ - addenv:CLICOLOR_FORCE: "1"COLUMNS: "150"diff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snapsimilarity index 98%rename from tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snaprename to tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snapindex 4e66d45bd..b273a74d9 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_force.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap@@ -5,7 +5,7 @@ info:args:- config- approvals- - ask+ - add- "--force"env:CLICOLOR_FORCE: "1"diff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snapsimilarity index 98%rename from tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snaprename to tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snapindex 0e1464b04..f3dc8e376 100644--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_no_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap@@ -5,7 +5,7 @@ info:args:- config- approvals- - ask+ - addenv:CLICOLOR_FORCE: "1"COLUMNS: "150"diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snapindex 6fd59ee9a..063473139 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap@@ -19,7 +19,7 @@ wt config approvals - Manage command approvalsUsage: wt config approvals [OPTIONS] <COMMAND>Commands:- ask Store approvals in config+ add Store approvals in configclear Clear approved commands from configOptions:@@ -58,7 +58,7 @@ commands.[32mExamples[0mPre-approve all commands for current project:- [2mwt config approvals ask[0m+ [2mwt config approvals add[0mClear approvals for current project:[2mwt config approvals clear[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snapsimilarity index 89%rename from tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snaprename to tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snapindex 87493c79a..e474030f7 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_ask.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap@@ -5,7 +5,7 @@ info:args:- config- approvals- - ask+ - add- "--help"env:CLICOLOR_FORCE: "1"@@ -16,8 +16,8 @@ info:success: trueexit_code: 0----- stdout ------wt config approvals ask - Store approvals in config-Usage: wt config approvals ask [OPTIONS]+wt config approvals add - Store approvals in config+Usage: wt config approvals add [OPTIONS]Options:-f, --force