Use braces for command wrapping instead of simple semicolon join #153
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a command times out, the system now preserves and returns any output that was collected before the timeout occurred. This improves the user experience by not losing potentially valuable partial output. Changes: - Add partial_output to CommandTimeoutError - Capture and return partial output in timeout scenarios - Update documentation to reflect new behavior Fixes SWE-agent#29 Co-Authored-By: Erkin Alp Güney <erkinalp9035@gmail.com>
When a command produces no output, it might be hanging or stuck. This change adds a separate timeout specifically for this case, allowing more granular control over command execution timeouts. Changes: - Add no_output_timeout field to BashAction - Implement no-output timeout handling in _run_normal - Update timeout logic to handle both timeouts - Improve error messages for timeout scenarios Fixes SWE-agent#9 Co-Authored-By: Erkin Alp Güney <erkinalp9035@gmail.com>
When running multiple commands, wrap each command in braces to maintain proper PS1 handling with pexpect. This prevents issues with PS1 variable interactions while still allowing multiple commands to be executed. Changes: - Modify _run_normal to wrap commands in braces - Maintain command isolation while preserving PS1 handling - Keep existing bashlex parsing for command splitting Fixes SWE-agent#26 Co-Authored-By: Erkin Alp Güney <erkinalp9035@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR modifies how multiple commands are wrapped to maintain proper PS1 handling with pexpect. Instead of just joining commands with semicolons, each command is wrapped in braces to ensure proper isolation and PS1 variable handling.
Changes:
This change ensures that PS1 variables work correctly with pexpect when running multiple commands, while still maintaining the ability to split and execute multiple commands properly.
Link to Devin run: https://app.devin.ai/sessions/e14f693390ed47ba87d12698d5834d08
Fixes #26