Skip to content

Fix shellv2 macro requiring double enter#1946

Closed
KCarretto wants to merge 2 commits intomainfrom
fix-shellv2-macro-double-enter-10173748679199264469
Closed

Fix shellv2 macro requiring double enter#1946
KCarretto wants to merge 2 commits intomainfrom
fix-shellv2-macro-double-enter-10173748679199264469

Conversation

@KCarretto
Copy link
Collaborator

Fixes an issue where shell macros in ShellV2 (e.g., !ls) required pressing Enter twice to execute. This was caused by the macro expanding into a multi-line Python block, which the REPL interpreted as incomplete input. The fix changes the macro expansion to use a single-line format with semicolons, which the interpreter recognizes as a complete statement, triggering immediate execution.


PR created automatically by Jules for task 10173748679199264469 started by @KCarretto

Modified the `expand_macros` function in `implants/lib/eldritch/eldritch-wasm/src/headless.rs` to generate a single-line Python `for` loop using semicolons for shell macros (e.g., `!cmd`).
This change ensures that macros are executed immediately upon pressing Enter, eliminating the need for a second Enter press which was previously required due to the multi-line block expansion.

Updated `test_headless_repl_macro` to verify that the macro executes immediately.
Verified behavior with unit tests in `eldritch-wasm`.

Co-authored-by: KCarretto <16250309+KCarretto@users.noreply.github.com>
@google-labs-jules
Copy link
Contributor

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 27, 2026

Summary

Tests 📝 Passed ✅ Failed ❌ Skipped ⏭️ Other ❓ Flaky 🍂 Duration ⏱️
2725    ±0 2725    ±0 0    ±0 0    ±0 0    ±0 0    ±0 1ms    ±0

Previous Results

Build 🏗️ Result 🧪 Tests 📝 Passed ✅ Failed ❌ Skipped ⏭️ Other ❓ Flaky 🍂 Duration ⏱️
#1375 2725 2725 0 0 0 0 41.7s

Insights

Average Tests per Run Total Flaky Tests Total Failed Slowest Test (p95)
2725 0 0 5.9s

Slowest Tests

Test 📝 Results 📊 Duration (avg) ⏱️ Duration (p95) ⏱️
TestDockerExecutor_Build_ContextCancellation 1 5.9s 5.9s
eldritch-libsys: std::dll_inject_impl::tests::test_dll_inject_simple 1 5.1s 5.1s
TestInteractiveShell 1 5.0s 5.0s
TestOtherStreamOutput 1 5.0s 5.0s
imix::bin/imix: install::tests::test_install_execution 3 1.6s 4.7s
imix::bin/imix: install::tests::test_install_execution 3 1.6s 4.7s
imix::bin/imix: install::tests::test_install_execution 3 1.6s 4.7s
TestDockerExecutor_Build_SimpleEcho 1 3.1s 3.1s
imix::bin/imix: tests::task_tests::test_task_streaming_output 3 3.0s 3.0s
imix::bin/imix: tests::task_tests::test_task_streaming_output 3 3.0s 3.0s

🎉 No failed tests in this run. | 🍂 No flaky tests in this run.

Github Test Reporter by CTRF 💚

🔄 This comment has been updated

Modified the `expand_macros` function in `implants/lib/eldritch/eldritch-wasm/src/headless.rs` to generate a single-line Python `for` loop using semicolons for shell macros (e.g., `!cmd`).
This change ensures that macros are executed immediately upon pressing Enter, eliminating the need for a second Enter press which was previously required due to the multi-line block expansion.

Updated `truncateShellMacro` in `tavern/internal/http/shell/handler.go` to match the new macro format, while maintaining backward compatibility for old macros.

Verified behavior with unit tests in `eldritch-wasm` and locally verified `truncateShellMacro`.

Co-authored-by: KCarretto <16250309+KCarretto@users.noreply.github.com>
@KCarretto KCarretto closed this Mar 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant