Skip to content

Fix sandbox terminal command display #309565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dileepyavan merged 1 commit into from
Apr 13, 2026
Merged

Fix sandbox terminal command display #309565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
});
if (rewriteResult) {
rewrittenCommand = rewriteResult.rewritten;
forDisplayCommand = rewriteResult.forDisplay ?? forDisplayCommand;
forDisplayCommand = forDisplayCommand ?? rewriteResult.forDisplay;
if (rewriteResult.isSandboxWrapped) {
isSandboxWrapped = true;
} else if (rewriteResult.isSandboxWrapped === false) {
Expand Down
24 changes: 24 additions & 0 deletions ...ch/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,30 @@ suite('RunInTerminalTool', () => {
const terminalData = preparedInvocation.toolSpecificData as IChatTerminalToolInvocationData;
strictEqual(terminalData.commandLine.isSandboxWrapped, true);
});

test('should not show sandbox wrapper in chat when sandboxed async command is detached', async () => {
runInTerminalTool.setBackendOs(OperatingSystem.Linux);
setConfig(TerminalChatAgentToolsSettingId.DetachBackgroundProcesses, true);
sandboxEnabled = true;
sandboxPrereqResult = {
enabled: true,
sandboxConfigPath: '/tmp/vscode-sandbox-settings.json',
failedCheck: undefined,
};
terminalSandboxService.wrapCommand = (command: string) => ({
command: `sandbox-runtime ${command}`,
isSandboxWrapped: true,
});

const preparedInvocation = await executeToolTest({ command: 'echo hello', mode: 'async' });

ok(preparedInvocation, 'Expected prepared invocation to be defined');
strictEqual((preparedInvocation.invocationMessage as IMarkdownString).value, 'Running `echo hello` in sandbox');

const terminalData = preparedInvocation.toolSpecificData as IChatTerminalToolInvocationData;
strictEqual(terminalData.commandLine.forDisplay, 'echo hello');
strictEqual(terminalData.commandLine.toolEdited, 'nohup sandbox-runtime echo hello &');
});
});

suite('automatic sandbox retry', () => {
Expand Down
Loading