Skip to content

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

feat: Use INFO_EMOJI for command approval previews

Maximilian Roosc35805e902a4
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index d7995f26f..f60fa8e62 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -7,8 +7,8 @@ use anyhow::Context;
use worktrunk::config::{Command, WorktrunkConfig};
use worktrunk::git::not_interactive;
use worktrunk::styling::{
- AnstyleStyle, HINT_EMOJI, PROGRESS_EMOJI, WARNING, WARNING_BOLD, WARNING_EMOJI, eprint,
- eprintln, format_bash_with_gutter, stderr,
+ AnstyleStyle, HINT_EMOJI, INFO_EMOJI, WARNING, WARNING_BOLD, WARNING_EMOJI, eprint, eprintln,
+ format_bash_with_gutter, stderr,
};
/// Batch approval helper used when multiple commands are queued for execution.
@@ -94,10 +94,11 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> anyhow:
for cmd in commands {
// Format as: {phase} {bold}{name}{bold:#}:
// Phase comes from the command itself (e.g., "pre-commit", "pre-merge")
+ // Uses INFO_EMOJI (βšͺ) since this is a preview, not active execution
let phase = cmd.phase.to_string();
let label = match &cmd.name {
- Some(name) => format!("{PROGRESS_EMOJI} {phase} {bold}{name}{bold:#}:"),
- None => format!("{PROGRESS_EMOJI} {phase}:"),
+ Some(name) => format!("{INFO_EMOJI} {phase} {bold}{name}{bold:#}:"),
+ None => format!("{INFO_EMOJI} {phase}:"),
};
eprintln!("{label}");
eprint!("{}", format_bash_with_gutter(&cmd.expanded, ""));
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 dea4fdc3b..522c21af9 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
@@ -6,7 +6,7 @@ y
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
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 9a0288c70..90056fdf0 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
@@ -6,7 +6,7 @@ n
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
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 3a2644db1..3d9f1f3aa 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
@@ -6,10 +6,10 @@ y
🟑 test-repo needs approval to execute 2 commands:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'First command'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
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 e74e3ddce..8ea278474 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
@@ -6,10 +6,10 @@ n
🟑 test-repo needs approval to execute 2 commands:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'First command'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
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 b6633e9d9..392fc8915 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
@@ -6,13 +6,13 @@ y
🟑 test-repo needs approval to execute 3 commands:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'First command'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Second command'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
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 67841cf65..6cab82350 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
@@ -6,13 +6,13 @@ y
🟑 test-repo needs approval to execute 3 commands:
-πŸ”„ post-create install:
+βšͺ post-create install:
  echo 'Installing dependencies...'
-πŸ”„ post-create build:
+βšͺ post-create build:
  echo 'Building project...'
-πŸ”„ post-create test:
+βšͺ post-create test:
  echo 'Running tests...'
πŸ’‘ Allow and remember? [y/N]
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 cff9a0d94..a5ad14ae3 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
@@ -6,7 +6,7 @@ y
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
index 5933bb828..50caa42d0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap
@@ -1,17 +1,16 @@
---
source: tests/integration_tests/shell_wrapper.rs
-assertion_line: 2396
expression: prompt_only
---
🟑 test-repo needs approval to execute 3 commands:
-πŸ”„ post-create install:
+βšͺ post-create install:
echo 'Installing dependencies...'
-πŸ”„ post-create build:
+βšͺ post-create build:
echo 'Building project...'
-πŸ”„ post-create test:
+βšͺ post-create test:
echo 'Running tests...'
πŸ’‘ Allow and remember? [y/N]
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 6363faa79..0f545e555 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
@@ -29,5 +29,5 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ 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 2c2d170b7..dba5e575b 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
@@ -11,8 +11,8 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 2 commands:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'First command'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Third 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 01ea3c48c..5c47fe18c 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
@@ -11,14 +11,14 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 4 commands:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Branch: test-nested-branch'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Worktree: [REPO].test-nested-branch'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Repo: test-repo'
-πŸ”„ post-create:
+βšͺ post-create:
  cd [REPO].test-nested-branch && pwd
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 78e0ee843..b26322c75 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
@@ -11,11 +11,11 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 3 commands:
-πŸ”„ post-create install:
+βšͺ post-create install:
  echo 'Installing dependencies...'
-πŸ”„ post-create build:
+βšͺ post-create build:
  echo 'Building project...'
-πŸ”„ post-create test:
+βšͺ post-create test:
  echo 'Running tests...'
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 7e700b9a5..c54f6f87a 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
@@ -11,5 +11,5 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ 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 2c2d170b7..dba5e575b 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
@@ -11,8 +11,8 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 2 commands:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'First command'
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'Third 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 252978cfb..9ab9c3cd2 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
@@ -11,5 +11,5 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ 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 dc23fbff9..4fd3a8218 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
@@ -11,5 +11,5 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-merge:
+βšͺ 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 deac852da..459cd7b79 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
@@ -11,5 +11,5 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ pre-merge:
+βšͺ pre-merge:
  echo 'Running pre-merge checks on main'
diff --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.snap
index deaf5c9da..f3be3a7a2 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
@@ -30,5 +30,5 @@ exit_code: 1
----- stderr -----
🟑 test-repo needs approval to execute 1 command:
-πŸ”„ post-create:
+βšͺ post-create:
  echo 'test'