Fix sandbox terminal command display#309565
Merged
dileepyavan merged 1 commit intomainfrom Apr 13, 2026
Merged
Conversation
Contributor
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a terminal chat UX issue where internal sandbox wrapper commands could appear in the chat invocation text when additional execution-only command rewrites (eg. background detach) run after sandbox wrapping.
Changes:
- Make the first
forDisplayvalue produced during command rewriting “sticky” so later rewriters can’t overwrite it. - Add a regression test covering a sandboxed async command with background detach enabled, ensuring chat displays the clean command while execution uses the fully wrapped command.
Show a summary per file
| File | Description |
|---|---|
| src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts | Adjusts command rewrite aggregation so forDisplayCommand is only set once (first non-undefined). |
| src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts | Adds regression coverage ensuring sandbox wrapper details don’t leak into chat display for detached async commands. |
Copilot's findings
- Files reviewed: 2/2 changed files
- Comments generated: 0
roblourens
approved these changes
Apr 13, 2026
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
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.
Summary
Fixes #309430
This prevents internal sandbox wrapper commands from leaking into the chat view for terminal tool invocations while running background.
The terminal command pipeline can apply multiple command-line rewrites. The sandbox rewriter correctly sets a clean
forDisplaycommand while storing the wrapped command intoolEditedfor execution. However, later execution-only rewrites, such as background detach wrapping, could replaceforDisplaywith a command that already included sandbox details. The chat UI then used that overwritten display command and showed the sandbox wrapper to the user.This change makes the first explicit
forDisplayvalue sticky during command rewriting:toolEditedforDisplayTesting
npm run transpile-client./scripts/test.sh --run src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.tsAdded regression coverage for a sandboxed async command with background detach enabled, verifying that chat displays
echo hellowhile the executed command remainsnohup sandbox-runtime echo hello &.