Skip to content

Fall back to execa if VSCode terminal integration fails#3049

Merged
cte merged 11 commits intomainfrom
cte/execa-fallback
Apr 30, 2025
Merged

Fall back to execa if VSCode terminal integration fails#3049
cte merged 11 commits intomainfrom
cte/execa-fallback

Conversation

@cte
Copy link
Copy Markdown
Collaborator

@cte cte commented Apr 29, 2025

Context

If terminal shell integration fails then fall back to the execa terminal and automatically disable the terminal integration in the user's settings, and show a warning.

Screenshot 2025-04-29 at 5 11 59 PM

Implementation

Screenshots

before after

How to Test

Get in Touch


Important

Adds fallback to execa terminal if VSCode shell integration fails, updates UI and tests, and modifies localization files.

  • Behavior:
    • Adds fallback to execa terminal if VSCode shell integration fails in executeCommandTool() in executeCommandTool.ts.
    • Automatically disables terminal integration in user settings and shows a warning.
  • UI:
    • Adds CommandExecutionError component in CommandExecutionError.tsx to display shell integration warning.
    • Updates ChatRow.tsx to use CommandExecutionError for shell_integration_warning messages.
  • Tests:
    • Mocks getModels in glama.test.ts, openrouter.test.ts, requesty.test.ts, and unbound.test.ts to return predefined models.
  • Localization:
    • Updates shell integration warning messages in multiple language files under webview-ui/src/i18n/locales/.
  • Misc:
    • Renames getTerminalByVSCETerminal parameter from terminal to vsceTerminal in TerminalRegistry.ts and Terminal.ts.
    • Removes lint command from run-tests.js.

This description was created by Ellipsis for 7c010a2. You can customize this summary. It will automatically update as commits are pushed.

@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Apr 29, 2025

🦋 Changeset detected

Latest commit: 7c010a2

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
roo-cline Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@cte cte changed the title Cte/execa fallback Fall back to execa if VSCode terminal integration fails Apr 29, 2025
@cte cte marked this pull request as ready for review April 30, 2025 00:12
@cte cte requested a review from mrubens as a code owner April 30, 2025 00:12
@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Apr 30, 2025
@ellipsis-dev
Copy link
Copy Markdown
Contributor

ellipsis-dev bot commented Apr 30, 2025

Hello @cte,

Thank you for your contribution! After reviewing the pull request, it seems that the changes span across multiple components and localization files, including refactoring, feature additions, and test removals. To ensure clarity and ease of review, it might be beneficial to split this pull request into smaller, more focused ones.

Here are some suggestions on how you might consider splitting the changes:

  1. Refactoring Changes: Group all refactoring changes, such as those in esbuild.js, src/core/tools/attemptCompletionTool.ts, and src/core/tools/executeCommandTool.ts, into one pull request.

  2. Feature Additions: Create a separate pull request for new features, like the CommandExecutionError component in webview-ui/src/components/chat/CommandExecutionError.tsx.

  3. Localization Updates: Consider having a dedicated pull request for the removal of shell integration keys from various localization files.

This approach will help reviewers focus on specific areas and ensure a smoother review process. Let me know if you have any questions or need further assistance.

Best regards,
Ellipsis

@dosubot dosubot bot added the Enhancement New feature or request label Apr 30, 2025
Copy link
Copy Markdown
Collaborator

@mrubens mrubens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good aside from translations

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Apr 30, 2025
@dosubot dosubot bot added size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels Apr 30, 2025
@cte cte merged commit 7863303 into main Apr 30, 2025
12 checks passed
@cte cte deleted the cte/execa-fallback branch April 30, 2025 04:10
@github-project-automation github-project-automation bot moved this from New to Done in Roo Code Roadmap Apr 30, 2025
{
"slug": "test",
"name": "Test",
"name": "🧪 Test",
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, thank you for this!

SmartManoj pushed a commit to SmartManoj/Raa-Code that referenced this pull request May 6, 2025
* prompt

* changeset

* words
SmartManoj pushed a commit to SmartManoj/Raa-Code that referenced this pull request May 6, 2025
* restoreTask protobus

* changeset

* changeset correction

* type safety change

* Fix Non-UTF-8 File Handling: Improve Encoding Detection to Prevent Garbled Text and Binary Misclassification (RooCodeInc#2347)

* Fix Non-UTF-8 File Handling: Improve Encoding Detection to Prevent Garbled Text and Binary Misclassification

* update package-lock.json

* update

* update

* fix

* fix

* fix

* ENG 526/Fix: Versioned Auto Approve settings (RooCodeInc#3014)

* added verisoning for autoApprove settings

* removed lines from source branch

* rebase

* changeset

* one small change

* activating extension with evals.env (RooCodeInc#3041)

Co-authored-by: Cline Evaluation <cline@example.com>

* ripping out test build flag (RooCodeInc#3043)

Co-authored-by: Cline Evaluation <cline@example.com>

* cleaning up evals.env logic in extension.ts (RooCodeInc#3045)

Co-authored-by: Cline Evaluation <cline@example.com>

* ENG-516 Slash commands (RooCodeInc#3044)

* scroll

* menu

* changeset

* nit

* What's yer path? (#3047)

* update extension imports to use aliasing

* changeset

* ENG-484 Enhance fixWithCline command execution by focusing chat input  (RooCodeInc#3028)

* Enhance fixWithCline command execution by focusing chat input and adding a delay before processing the fixWithCline command.

* feat: add OpenRouter base URL and balance display component

* feat: add OpenRouter base URL and balance display component

* feat: add OpenRouter base URL and balance display component

* new_task prompt (RooCodeInc#3049)

* prompt

* changeset

* words

* prettier

* Added metadata

---------

Co-authored-by: yt3trees <57471763+yt3trees@users.noreply.github.com>
Co-authored-by: pashpashpash <nik@cline.bot>
Co-authored-by: Cline Evaluation <cline@example.com>
Co-authored-by: Toshii <94262432+0xToshii@users.noreply.github.com>
Co-authored-by: Evan <58194240+celestial-vault@users.noreply.github.com>
Co-authored-by: nomaven <arafat.da.khan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement New feature or request lgtm This PR has been approved by a maintainer size:XL This PR changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants