feat: Improve terminal reuse logic to prevent proliferation #16
Conversation
This file contains hidden or 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
This change improves the terminal reuse logic to prevent the creation of unnecessary terminals. The previous implementation was too strict and would create new terminals even when idle ones were available. The new logic introduces a fallback mechanism to reuse idle terminals even if their current working directory has drifted. When a terminal with a drifted CWD is reused, a `cd` command is prepended to the command being executed to ensure it runs in the correct directory. This change also includes: - Updates to the `RooTerminal` interface and `BaseTerminal` class to support the new logic. - Comprehensive unit tests to validate the new terminal reuse behavior.
![roo-code-dan[bot]](https://avatars.githubusercontent.com/u/211522643?s=60&v=4){kind=small}
|
|
||
| if (this.requestedCwd && !arePathsEqual(this.requestedCwd, currentCwd)) { | ||
| // Wrap path in quotes to handle spaces | ||
| commandToRun = `cd "${this.requestedCwd}" && ${command}` |
There was a problem hiding this comment.
The path wrapping in double quotes doesn't escape special shell characters within the path itself. If requestedCwd contains characters like $, backticks (`), ", or \, they could be interpreted by the shell, potentially leading to command injection or unexpected behavior. Consider using single quotes instead (which prevent variable expansion) or properly escaping the path before wrapping it in double quotes.
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 change improves the terminal reuse logic to prevent the creation of unnecessary terminals. The previous implementation was too strict and would create new terminals even when idle ones were available.
The new logic introduces a fallback mechanism to reuse idle terminals even if their current working directory has drifted. When a terminal with a drifted CWD is reused, a
cdcommand is prepended to the command being executed to ensure it runs in the correct directory.This change also includes:
RooTerminalinterface andBaseTerminalclass to support the new logic.