Skip to content

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

Refine command approval prompt message

Maximilian Roos525baa209eaa
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index c7bb82e27..5f2c815ae 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -89,7 +89,7 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> Result<
crate::output::flush_for_stderr_prompt()?;
eprintln!(
- "{WARNING_EMOJI} {WARNING}{WARNING_BOLD}{project_name}{WARNING_BOLD:#}{WARNING} wants to execute {WARNING_BOLD}{count}{WARNING_BOLD:#}{WARNING} command{plural}:{WARNING:#}"
+ "{WARNING_EMOJI} {WARNING}{WARNING_BOLD}{project_name}{WARNING_BOLD:#}{WARNING} needs approval to execute {WARNING_BOLD}{count}{WARNING_BOLD:#}{WARNING} command{plural}:{WARNING:#}"
);
eprintln!();
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index fb3a3c926..b3cfbb4dd 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-^D🟑 test-repo wants to execute 1 command:
+^D🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index f9126dc37..75e722eea 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -4,7 +4,7 @@ expression: normalized
---
n
-^D🟑 test-repo wants to execute 1 command:
+^D🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index bf594e76d..7da78e90a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-^D🟑 test-repo wants to execute 2 commands:
+^D🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
  echo 'First command'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 4dbc2fbb9..d9ac249a2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -4,7 +4,7 @@ expression: normalized
---
n
-^D🟑 test-repo wants to execute 2 commands:
+^D🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
  echo 'First command'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 2fbfcd7ea..02fc3e55c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-^D🟑 test-repo wants to execute 3 commands:
+^D🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create:
  echo 'First command'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 8aeefec16..19b48ab21 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-^D🟑 test-repo wants to execute 3 commands:
+^D🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create install:
  echo 'Installing dependencies...'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 46d99d400..1744285d0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -4,7 +4,7 @@ expression: normalized
---
y
-^D🟑 test-repo wants to execute 1 command:
+^D🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command'
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.snap
index c7ee87efa..51e16bb45 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSRSVBw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGrgnK1/test-config.toml
---
success: false
exit_code: 1
@@ -27,7 +27,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 1 command:
+🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command'
diff --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.snap
index 94ab0a06e..5f96bab7a 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 2 commands:
+🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
  echo 'First command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index 8d91e670e..c04317e85 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 4 commands:
+🟑 test-repo needs approval to execute 4 commands:
πŸ”„ post-create:
  echo 'Branch: test-nested-branch'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index c5fec5fd1..0bbf242cf 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 3 commands:
+🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create install:
  echo 'Installing dependencies...'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 8e4de590f..7b3e3a357 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 1 command:
+🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'Worktree path: [REPO].feature-test-approval'
diff --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.snap
index 94ab0a06e..5f96bab7a 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 2 commands:
+🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
  echo 'First command'
diff --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.snap
index 2620b1822..7dcec368c 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 1 command:
+🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test command' > output.txt
diff --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.snap
index 674623a8e..5067f7544 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 1 command:
+🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-merge:
  echo 'Post-merge cleanup for main'
diff --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.snap
index 6b6e0e106..5fac643c8 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
@@ -9,7 +9,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 1 command:
+🟑 test-repo needs approval to execute 1 command:
πŸ”„ pre-merge:
  echo 'Running pre-merge checks on main'
diff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
index fe0e47f84..4c67685cc 100644
--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuzpIU1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppPglbl/test-config.toml
---
success: false
exit_code: 1
@@ -27,7 +27,7 @@ exit_code: 1
πŸ’‘ In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt beta ask-approvals'
----- stderr -----
-🟑 test-repo wants to execute 1 command:
+🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
  echo 'test'