Handle interactive ssh -t shell overrides in warpify detection#10142
Handle interactive ssh -t shell overrides in warpify detection#10142cesaryuan wants to merge 1 commit intowarpdotdev:masterfrom
Conversation
Add ssh parsing support for interactive -t remote shell overrides so Warp can detect and offer warpification for commands like ssh host -t 'fish --login'. Also add integration-test scaffolding and regression coverage for the override flow. Co-Authored-By: Warp <agent@warp.dev>
|
Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have the users @cesaryuan on file. In order for us to review and merge your code, each contributor must visit https://cla.warp.dev to read and agree to our CLA. Once you have done so, please comment |
github-actions
Bot
added
the
external-contributor
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I completed the review and no human review was requested for this pull request. Comment Powered by Oz |
There was a problem hiding this comment.
Pull request overview
This PR extends Warp’s SSH interaction detection so ssh ... -t '<shell> [--login|-l]' can be recognized as an interactive session and adds test scaffolding around that flow. It fits into the SSH warpification path by broadening which SSH invocations are eligible for remote-session detection.
Changes:
- Updated SSH command parsing to allow
-tremote shell overrides for a small allowlist of shells. - Added parser regression tests for interactive vs non-interactive remote commands.
- Registered a new integration test path for remote shell override warpification.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
app/src/terminal/ssh/util.rs |
Extends interactive SSH parsing for -t remote shell overrides and adds unit tests. |
app/src/integration_testing/subshell/util.rs |
Adds helper to build SSH commands with a remote shell override. |
app/src/integration_testing/subshell/step.rs |
Adds integration test step for entering the new SSH command shape. |
crates/integration/src/test/ssh.rs |
Adds an integration test covering remote shell override detection and warpification flow. |
crates/integration/src/bin/integration.rs |
Registers the new integration test in the binary runner. |
crates/integration/tests/integration/shell_integration_tests.rs |
Includes the new test in the integration test list. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
|
||
| /// Returns `true` when Warp knows how to treat the shell as an interactive remote target. | ||
| fn is_supported_remote_shell(shell: &str) -> bool { | ||
| matches!(shell, "bash" | "zsh" | "fish" | "sh" | "ash") |
| new_builder() | ||
| // TODO(CORE-2333) PowerShell has no SSH wrapper. | ||
| .set_should_run_test(|| { | ||
| let (starter, _) = current_shell_starter_and_version(); | ||
| starter.shell_type() != ShellType::PowerShell | ||
| }) | ||
| .with_step(wait_until_bootstrapped_single_pane_for_tab(0)) | ||
| .with_step(setup_gcloud_sdk()) | ||
| .with_step(enter_ssh_command_with_remote_shell_override( | ||
| "bash", | ||
| "zsh --login", | ||
| )) | ||
| .with_step(wait_for_password_prompt(0, "bash")) | ||
| .with_step(enter_ssh_password()) | ||
| .with_step(assert_subshell_banner_is_showing()) | ||
| .with_step(trigger_subshell_bootstrap()) |
![oz-for-oss[bot]](https://avatars.githubusercontent.com/in/3450139?s=60&v=4){kind=small}
There was a problem hiding this comment.
Overview
This PR extends SSH warpify detection for ssh ... -t '<shell --login>' and adds parser/integration coverage for the new flow.
Concerns
- The parser can still drop dash-prefixed remote command arguments after the remote command starts, which lets non-interactive commands be classified as supported interactive shells.
Verdict
Found: 0 critical, 1 important, 0 suggestions
Request changes
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
| if host.is_none() { | ||
| host = Some(pos_arg.to_string()); | ||
| } else { | ||
| remote_command_tokens.push(pos_arg.to_string()); |
There was a problem hiding this comment.
ssh user@host -t zsh -c 'echo hi' is reduced to zsh and accepted as interactive. Track all tokens after the remote command begins and validate the complete remote command.
Description
This PR teaches Warp's SSH warpify detection to treat
ssh <host> -t '<shell> [--login|-l]'as an interactive SSH session.What:
-tremote shell overrides such asssh minipc -t 'fish --login'Why:
ssh minipc, but it missed interactive sessions that explicitly override the remote shell with-tssh minipc -t 'fish --login'How:
parse_interactive_ssh_commandto keep treating non-interactive SSH invocations as unsupported, while allowing-tsessions that launch a known interactive shellLinked Issue
ready-to-specorready-to-implement.No linked Linear issue for this change.
Testing
cargo clippy -p warp --lib --tests -- -D warningscargo test -p warp ssh_interactive_shell_parsing -- --nocapturetest_ssh_with_remote_shell_command_override)Agent Mode
Co-Authored-By: Warp agent@warp.dev