Skip to content

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

feat(switch): add a feedback link to the --execute deprecation warning (#2863)

Maximilian Roos6d59dfa99da3
diff --git a/src/commands/worktree/switch.rs b/src/commands/worktree/switch.rs
index 56c1c7bd9..b5e22a48a 100644
--- a/src/commands/worktree/switch.rs
+++ b/src/commands/worktree/switch.rs
@@ -1991,12 +1991,14 @@ fn is_clean_program_token(value: &str) -> bool {
/// here without the user's shell, so it is left to fail loudly at the cutover
/// rather than guessed at. Informational only — it never blocks the switch.
///
-/// The migration hint reconstructs the command line that runs today — the
-/// `-x` value with its trailing args appended, the way `run_switch` joins
-/// them — and wraps it for whichever shell the active wrapper evaluates the
-/// payload with (`sh` / `fish` / `pwsh`). That keeps the suggestion
-/// behavior-preserving on fish/PowerShell, not just POSIX sh, and complete
-/// when trailing args are present.
+/// The hint reconstructs the command line that runs today — the `-x` value
+/// with its trailing args appended, the way `run_switch` joins them — and
+/// wraps it for whichever shell the active wrapper evaluates the payload
+/// with (`sh` / `fish` / `pwsh`), so the suggestion is behavior-preserving
+/// on fish/PowerShell, not just POSIX sh, and complete when trailing args
+/// are present. It also links the tracking issue (#2860) so anyone whose
+/// workflow the argv model would regress can report the case before the
+/// cutover.
fn warn_if_execute_form_deprecated(cmd: &str, execute_args: &[String]) {
if is_clean_program_token(cmd) {
return;
@@ -2026,7 +2028,7 @@ fn warn_if_execute_form_deprecated(cmd: &str, execute_args: &[String]) {
eprintln!(
"{}",
hint_message(cformat!(
- "To run this command line unchanged, pass it to a shell: <underline>--execute {shell} -- {flag} {suggested}</>"
+ "Comment at <underline>https://github.com/max-sixty/worktrunk/issues/2860</> if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: <underline>--execute {shell} -- {flag} {suggested}</>"
))
);
}
diff --git a/tests/snapshots/integration__integration_tests__directives__switch_exec_scrubbed_warns.snap b/tests/snapshots/integration__integration_tests__directives__switch_exec_scrubbed_warns.snap
index bdf051606..41e1be372 100644
--- a/tests/snapshots/integration__integration_tests__directives__switch_exec_scrubbed_warns.snap
+++ b/tests/snapshots/integration__integration_tests__directives__switch_exec_scrubbed_warns.snap
@@ -61,7 +61,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo should-not-run'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo should-not-run'
✓ Created branch scrub-test from main and worktree @ _REPO_.scrub-test
↳ To customize worktree locations, run wt config create
▲ --execute disabled inside project alias / hook bodies for safety; skipping echo should-not-run
diff --git a/tests/snapshots/integration__integration_tests__directives__switch_legacy_directive_file_with_execute.snap b/tests/snapshots/integration__integration_tests__directives__switch_legacy_directive_file_with_execute.snap
index 94abc5858..a79a59bc1 100644
--- a/tests/snapshots/integration__integration_tests__directives__switch_legacy_directive_file_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__directives__switch_legacy_directive_file_with_execute.snap
@@ -61,7 +61,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo hello'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo hello'
✓ Created branch exec-legacy from main and worktree @ _REPO_.exec-legacy
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 67dddc252..c3697ecfd 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -60,7 +60,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''Execute flag'\'' > execute.txt'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''Execute flag'\'' > execute.txt'
✓ Created branch feature from main and worktree @ _REPO_.feature
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
index d18437555..390dda3ba 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__fish_multiline_command_execution.snap
@@ -4,7 +4,7 @@ expression: "&output.combined"
---
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute fish -- -c 'echo \'line 1\'; echo \'line 2\'; echo \'line 3\''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute fish -- -c 'echo \'line 1\'; echo \'line 2\'; echo \'line 3\''
✓ Created branch fish-multiline from main and worktree @ _REPO_.fish-multiline
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_through_wrapper.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_through_wrapper.snap
index cdca1d39c..28ff04ece 100644
--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_through_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__switch_with_execute_through_wrapper.snap
@@ -4,7 +4,7 @@ expression: "&output.combined"
---
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo executed'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo executed'
✓ Created branch test-exec from main and worktree @ _REPO_.test-exec
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index acc1eb447..dca4726ed 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -60,7 +60,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''test content'\'' > test.txt'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''test content'\'' > test.txt'
✓ Created branch file-test from main and worktree @ _REPO_.file-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_fish_wrapper.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_fish_wrapper.snap
index c56ed6d43..3efa581b7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_fish_wrapper.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_fish_wrapper.snap
@@ -63,7 +63,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute fish -- -c 'set -lx FOO bar; echo $FOO'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute fish -- -c 'set -lx FOO bar; echo $FOO'
✓ Created branch dep-fish from main and worktree @ _REPO_.dep-fish
◎ Executing (--execute):
  set -lx FOO bar; echo $FOO
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap
index 34037c9be..c130f427a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_shell_syntax.snap
@@ -62,7 +62,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo hi && ls'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo hi && ls'
✓ Created branch dep-shell from main and worktree @ _REPO_.dep-shell
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_trailing_args.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_trailing_args.snap
index bf6de2fe8..73522a90f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_trailing_args.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_deprecation_trailing_args.snap
@@ -64,7 +64,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'npm run test'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'npm run test'
✓ Created branch dep-args from main and worktree @ _REPO_.dep-args
◎ Executing (--execute):
  npm run test
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index a5c3edefd..cbd99cf03 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -59,7 +59,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''existing worktree'\'' > existing.txt'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''existing worktree'\'' > existing.txt'
▲ Worktree for existing-exec @ _REPO_.existing-exec, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.existing-exec:
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index a93111ddf..1e0dad0ba 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -60,7 +60,7 @@ exit_code: 1
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'exit 1'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'exit 1'
✓ Created branch fail-test from main and worktree @ _REPO_.fail-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index e0d58350a..ef5d434b2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -63,7 +63,7 @@ line3
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''line1'\''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''line1'\''
echo '\''line2'\''
echo '\''line3'\'''
✓ Created branch multiline-test from main and worktree @ _REPO_.multiline-test
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index b78c74e54..5894155e2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -61,7 +61,7 @@ test output
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''test output'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''test output'\'''
✓ Created branch exec-test from main and worktree @ _REPO_.exec-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap
index d1ef79cc0..500822d32 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base.snap
@@ -63,7 +63,7 @@ base=main
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''base={{ base }}'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''base={{ base }}'\'''
✓ Created branch from-main from main and worktree @ _REPO_.from-main
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap
index e849a937e..56956e079 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_base_without_create.snap
@@ -60,7 +60,7 @@ base=main
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''base={{ base }}'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''base={{ base }}'\'''
▲ Worktree for existing @ _REPO_.existing, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.existing:
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap
index be59b9fd7..b987c0cb2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_branch.snap
@@ -61,7 +61,7 @@ branch=template-test
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''branch={{ branch }}'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''branch={{ branch }}'\'''
✓ Created branch template-test from main and worktree @ _REPO_.template-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap
index ac6849690..0346aa477 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_shell_escape.snap
@@ -61,7 +61,7 @@ feat;id
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo {{ branch }}'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo {{ branch }}'
✓ Created branch feat;id from main and worktree @ '_REPO_.feat;id'
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap
index 059fbc36a..112619229 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_with_filter.snap
@@ -61,7 +61,7 @@ sanitized=feature-with-slash
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''sanitized={{ branch | sanitize }}'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''sanitized={{ branch | sanitize }}'\'''
✓ Created branch feature/with-slash from main and worktree @ _REPO_.feature-with-slash
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap
index 2353df985..75eb448fc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_template_worktree_path.snap
@@ -61,7 +61,7 @@ path=_REPO_.path-test
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''path={{ worktree_path }}'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''path={{ worktree_path }}'\'''
✓ Created branch path-test from main and worktree @ _REPO_.path-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap
index 643eecf6d..ccd0a9df3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_multiline_template.snap
@@ -67,7 +67,7 @@ repo=repo
  →
  _REPO_/../repo.multiline-test
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c '{% if branch %}
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c '{% if branch %}
echo '\''branch={{ branch }}'\''
echo '\''repo={{ repo }}'\''
{% endif %}'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap
index da7f6bae2..0235d16fd 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_verbose_template.snap
@@ -66,7 +66,7 @@ branch=verbose-test
  →
  _REPO_/../repo.verbose-test
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''branch={{ branch }}'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''branch={{ branch }}'\'''
✓ Created branch verbose-test from main and worktree @ _REPO_.verbose-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index 5ec7bad33..d0b12ffdd 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -62,7 +62,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'exit 42'
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'exit 42'
✓ Created branch exit-code-test from main and worktree @ _REPO_.exit-code-test
↳ To customize worktree locations, run wt config create
◎ Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index 017fbc3c3..7dbb8ca6f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -62,7 +62,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''doing work'\''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''doing work'\''
exit 7'
✓ Created branch output-exit-test from main and worktree @ _REPO_.output-exit-test
↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 96f688990..67e60c349 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -62,7 +62,7 @@ exit_code: 0
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''line1'\''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''line1'\''
echo '\''line2'\'''
✓ Created branch exec-internal from main and worktree @ _REPO_.exec-internal
↳ To customize worktree locations, run wt config create
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
index 083f3dfb1..2921da327 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
@@ -62,7 +62,7 @@ execute command runs
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''execute command runs'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''execute command runs'\'''
✓ Created branch no-hooks-test from main and worktree @ _REPO_.no-hooks-test
↳ To customize worktree locations, run wt config create
▲ Cannot change directory — shell integration not installed
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
index 3ff221ff3..48cdddcef 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
@@ -61,7 +61,7 @@ execute still runs
----- stderr -----
▲ --execute will change in a future release: it will run a single program, with arguments after --, not a shell command line
-↳ To run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''execute still runs'\'''
+↳ Comment at https://github.com/max-sixty/worktrunk/issues/2860 if the new single-program form would make a workflow worse; to run this command line unchanged, pass it to a shell: --execute sh -- -c 'echo '\''execute still runs'\'''
▲ Worktree for existing-no-hooks @ _REPO_.existing-no-hooks, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Executing (--execute) @ _REPO_.existing-no-hooks: