@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.js

@@ -1,5 +1,6 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { escapeMarkdownSyntaxTokens, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { RunInTerminalTool } from './runInTerminalTool.js';
@@ -7,7 +8,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 
 const ConfirmTerminalCommandToolData = {
     id: TerminalToolId.ConfirmTerminalCommand,
-    displayName: ( localize(14669, "Confirm Terminal Command")),
+    displayName: ( localize(15313, "Confirm Terminal Command")),
     modelDescription: [
         "This tool allows you to get explicit user confirmation for a terminal command without executing it.",
         "",
@@ -25,7 +26,7 @@ const ConfirmTerminalCommandToolData = {
         "",
         "After confirmation, use a tool to actually execute the command."
     ].join("\n"),
-    userDescription: ( localize(14670, "Tool for confirming terminal commands")),
+    userDescription: ( localize(15314, "Tool for confirming terminal commands")),
     source: ToolDataSource.Internal,
     icon: Codicon.shield,
     inputSchema: {
@@ -47,6 +48,14 @@ const ConfirmTerminalCommandToolData = {
                 type: "string",
                 enum: ["sync", "async"],
                 description: "Execution mode this command would use if run."
+            },
+            sandboxBypass: {
+                type: "boolean",
+                description: "Set to true when the command will run outside the sandbox. The confirmation makes the elevated risk clear to the user."
+            },
+            sandboxBypassReason: {
+                type: "string",
+                description: "A short explanation of why the command needs to run outside the sandbox. Only meaningful when sandboxBypass is true."
             }
         },
         required: ["command", "explanation", "goal", "mode"]
@@ -60,6 +69,21 @@ class ConfirmTerminalCommandTool extends RunInTerminalTool {
         const preparedInvocation = await super.prepareToolInvocation(context, token);
         if (preparedInvocation) {
             preparedInvocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
+            const params = context.parameters;
+            if (params.sandboxBypass === true) {
+                const title = ( localize(15315, "Run in terminal outside the sandbox?"));
+                const reason = typeof params.sandboxBypassReason === "string" ? escapeMarkdownSyntaxTokens(params.sandboxBypassReason.trim()) : "";
+                const message = ( new MarkdownString(reason ? ( localize(15316, "This command will run outside the sandbox.\n\nReason: {0}", reason)) : ( localize(15317, "This command will run outside the sandbox."))));
+                if (preparedInvocation.confirmationMessages) {
+                    preparedInvocation.confirmationMessages.title = title;
+                    preparedInvocation.confirmationMessages.message = message;
+                } else {
+                    preparedInvocation.confirmationMessages = {
+                        title,
+                        message
+                    };
+                }
+            }
         }
         return preparedInvocation;
     }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.d.ts

@@ -1,4 +1,5 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import type { IJSONSchemaMap } from "@codingame/monaco-vscode-api/vscode/vs/base/common/jsonSchema";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ResourceMap } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
 import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
@@ -21,9 +22,28 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 import { type ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { ITerminalChatService, ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
-import { ITerminalSandboxService } from "../../common/terminalSandboxService.js";
+import { ITerminalSandboxService, type ITerminalSandboxResolvedNetworkDomains } from "../../common/terminalSandboxService.js";
 import type { ITerminalExecuteStrategyResult } from "../executeStrategy/executeStrategy.js";
 import { type IToolTerminal } from "../toolTerminalCreator.js";
+export interface ISandboxingOnNetworkRestrictedOptions {
+    sandboxMode: "on-network-restricted";
+    allowToRunUnsandboxedCommands: boolean;
+    retryWithAllowNetworkRequests: boolean;
+    networkDomains?: ITerminalSandboxResolvedNetworkDomains;
+}
+export interface ISandboxingOnNetworkAvailableOptions {
+    sandboxMode: "on-network-available";
+    allowToRunUnsandboxedCommands: boolean;
+    retryWithAllowNetworkRequests: false;
+    networkDomains: undefined;
+}
+export type ISandboxingOnOptions = ISandboxingOnNetworkRestrictedOptions | ISandboxingOnNetworkAvailableOptions;
+export interface ISandboxingDisabledOptions {
+    sandboxMode: "off";
+}
+export type ISandboxingOptions = ISandboxingOnOptions | ISandboxingDisabledOptions;
+export declare function createSandboxLines(sandboxingOptions: ISandboxingOnOptions): string[];
+export declare function createSandboxProperties(sandboxingOptions: ISandboxingOnOptions): IJSONSchemaMap;
 export declare function createRunInTerminalToolData(accessor: ServicesAccessor): Promise<IToolData>;
 export interface IRunInTerminalInputParams {
     command: string;
@@ -39,6 +59,8 @@ export interface IRunInTerminalInputParams {
     requestUnsandboxedExecutionReason?: string;
     requestAllowNetwork?: boolean;
     requestAllowNetworkReason?: string;
+    requestFileValidationCheck?: string[];
+    requestFileValidationCheckReason?: string;
     allowToRunUnsandboxedCommands?: boolean;
 }
 export interface IAutomaticUnsandboxRetryOptions {
@@ -120,6 +142,7 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     private readonly _telemetry;
     private readonly _commandArtifactCollector;
     protected readonly _profileFetcher: TerminalProfileFetcher;
+    private readonly _largeOutputFileWriter;
     private readonly _commandLineRewriters;
     private readonly _commandLineAnalyzers;
     private readonly _commandLinePresenters;
@@ -182,7 +205,6 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     static markKilledByTool(id: string): void;
     private _resolveExecutionOptions;
     private get _allowUnsandboxedCommands();
-    private get _autoApproveUnsandboxedCommands();
     private get _retryWithAllowNetworkRequests();
     private get _allowSandboxAutoApprove();
     private _getAllowToRunUnsandboxedCommands;
@@ -190,6 +212,8 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     private _shouldRejectAllowNetworkRequest;
     private _getUnsandboxedExecutionDisabledMessage;
     private _getAllowNetworkRequestDisabledMessage;
+    private _getDeniedSandboxFileAccess;
+    private _buildSandboxFileAccessDeniedMessage;
     /**
      * Controls whether this tool wires up sandbox-specific command-line
      * behavior, including both the {@link CommandLineSandboxRewriter} and the
@@ -288,9 +312,14 @@ export declare class TerminalProfileFetcher {
     private readonly _configurationService;
     private readonly _terminalProfileResolverService;
     private readonly _remoteAgentService;
+    private readonly _fileService;
+    private readonly _logService;
+    private static readonly _posixShellFallbacks;
     readonly osBackend: Promise<OperatingSystem>;
-    constructor(_configurationService: IConfigurationService, _terminalProfileResolverService: ITerminalProfileResolverService, _remoteAgentService: IRemoteAgentService);
+    constructor(_configurationService: IConfigurationService, _terminalProfileResolverService: ITerminalProfileResolverService, _remoteAgentService: IRemoteAgentService, _fileService: IFileService, _logService: ITerminalLogService);
     getCopilotProfile(): Promise<ITerminalProfile>;
+    private _shellExists;
+    private _findFallbackShell;
     getCopilotShell(): Promise<string>;
     private _getChatTerminalProfile;
     private _isValidChatAgentTerminalProfile;