@codingame/monaco-vscode-chat-service-override 26.2.2 → 27.0.0

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

@@ -2,11 +2,13 @@ import type { Task } from "@codingame/monaco-vscode-api/vscode/vs/workbench/cont
 import type { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import type { ILinkLocation } from "../../taskHelpers.js";
 import type { IMarker as XtermMarker } from "@xterm/xterm";
+import type { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 export interface IConfirmationPrompt {
     prompt: string;
     options: string[];
     descriptions?: string[];
     detectedRequestForFreeFormInput: boolean;
+    suggestedInput?: string;
 }
 export interface IExecution {
     getOutput: (marker?: XtermMarker) => string;
@@ -14,7 +16,7 @@ export interface IExecution {
     task?: Task | Pick<Task, "configurationProperties">;
     dependencyTasks?: Task[];
     instance: Pick<ITerminalInstance, "sendText" | "instanceId" | "onDidInputData" | "onDisposed" | "onData" | "focus" | "registerMarker">;
-    sessionId: string | undefined;
+    sessionResource: URI | undefined;
 }
 export interface IPollingResult {
     output: string;

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

@@ -0,0 +1,8 @@
+export interface IOutputAnalyzerOptions {
+    readonly exitCode: number | undefined;
+    readonly exitResult: string;
+    readonly commandLine: string;
+}
+export interface IOutputAnalyzer {
+    analyze(options: IOutputAnalyzerOptions): Promise<string | undefined>;
+}

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

@@ -1,6 +1,5 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 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';
@@ -8,7 +7,7 @@ import { TerminalToolId } from './toolIds.js';
 
 const ConfirmTerminalCommandToolData = {
     id: TerminalToolId.ConfirmTerminalCommand,
-    displayName: ( localize(12580, "Confirm Terminal Command")),
+    displayName: ( localize(13394, "Confirm Terminal Command")),
     modelDescription: [
         "This tool allows you to get explicit user confirmation for a terminal command without executing it.",
         "",
@@ -26,7 +25,7 @@ const ConfirmTerminalCommandToolData = {
         "",
         "After confirmation, use a tool to actually execute the command."
     ].join("\n"),
-    userDescription: ( localize(12581, "Tool for confirming terminal commands")),
+    userDescription: ( localize(13395, "Tool for confirming terminal commands")),
     source: ToolDataSource.Internal,
     icon: Codicon.shield,
     inputSchema: {
@@ -50,13 +49,6 @@ const ConfirmTerminalCommandToolData = {
 };
 class ConfirmTerminalCommandTool extends RunInTerminalTool {
     async prepareToolInvocation(context, token) {
-        try {
-            const sessionUri = context.chatSessionId ? ( URI.parse(context.chatSessionId)) : undefined;
-            const sessionId = sessionUri ? this._chatService.getSession(sessionUri)?.sessionId : undefined;
-            if (sessionId) {
-                context.chatSessionId = sessionId;
-            }
-        } catch {}
         const preparedInvocation = await super.prepareToolInvocation(context, token);
         if (preparedInvocation) {
             preparedInvocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;

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

@@ -69,6 +69,7 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     private readonly _commandLineRewriters;
     private readonly _commandLineAnalyzers;
     private readonly _commandLinePresenters;
+    private readonly _outputAnalyzers;
     protected readonly _sessionTerminalAssociations: ResourceMap<IToolTerminal>;
     protected readonly _osBackend: Promise<OperatingSystem>;
     private static readonly _activeExecutions;

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

@@ -61,6 +61,7 @@ import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { TerminalChatCommandId } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
+import { SandboxOutputAnalyzer } from './sandboxOutputAnalyzer.js';
 
 var RunInTerminalTool_1;
 const TOOL_REFERENCE_NAME = "runInTerminal";
@@ -193,9 +194,9 @@ async function createRunInTerminalToolData(accessor) {
         id: TerminalToolId.RunInTerminal,
         toolReferenceName: TOOL_REFERENCE_NAME,
         legacyToolReferenceFullNames: LEGACY_TOOL_REFERENCE_FULL_NAMES,
-        displayName: ( localize(12582, "Run in Terminal")),
+        displayName: ( localize(13396, "Run in Terminal")),
         modelDescription,
-        userDescription: ( localize(12583, "Run commands in the terminal")),
+        userDescription: ( localize(13397, "Run commands in the terminal")),
         source: ToolDataSource.Internal,
         icon: Codicon.terminal,
         inputSchema: {
@@ -233,7 +234,7 @@ var TerminalToolStorageKeysInternal;
 const telemetryIgnoredSequences = [
 "\u001b[I",
 "\u001b[O"];
-const altBufferMessage = ( localize(12584, "The command opened the alternate buffer."));
+const altBufferMessage = "\n" + ( localize(13398, "The command opened the alternate buffer."));
 let RunInTerminalTool = class RunInTerminalTool extends Disposable {
     static {
         RunInTerminalTool_1 = this;
@@ -322,6 +323,9 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             ( new PythonCommandLinePresenter()),
             ( new RubyCommandLinePresenter())
         ];
+        this._outputAnalyzers = [
+            this._register(this._instantiationService.createInstance(SandboxOutputAnalyzer))
+        ];
         this._register(
             Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
                 if (!e || e.affectsConfiguration(TerminalChatAgentToolsSettingId.EnableAutoApprove)) {
@@ -350,7 +354,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
     }
     async prepareToolInvocation(context, token) {
         const args = context.parameters;
-        const chatSessionResource = context.chatSessionResource ?? (context.chatSessionId ? LocalChatSessionUri.forSession(context.chatSessionId) : undefined);
+        const chatSessionResource = context.chatSessionResource;
         let instance;
         if (chatSessionResource) {
             const toolTerminal = this._sessionTerminalAssociations.get(chatSessionResource);
@@ -490,16 +494,16 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 cdPrefix
             };
             confirmationTitle = args.isBackground ? ( localize(
-                12585,
+                13399,
                 "Run `{0}` command in background within `{1}`?",
                 shellType,
                 directoryLabel
-            )) : ( localize(12586, "Run `{0}` command within `{1}`?", shellType, directoryLabel));
+            )) : ( localize(13400, "Run `{0}` command within `{1}`?", shellType, directoryLabel));
         } else {
             toolSpecificData.confirmation = {
                 commandLine: commandToDisplay
             };
-            confirmationTitle = args.isBackground ? ( localize(12587, "Run `{0}` command in background?", shellType)) : ( localize(12588, "Run `{0}` command?", shellType));
+            confirmationTitle = args.isBackground ? ( localize(13401, "Run `{0}` command in background?", shellType)) : ( localize(13402, "Run `{0}` command?", shellType));
         }
         const commandForPresenter = extractedCd?.command ?? commandToDisplay;
         let presenterInput = commandForPresenter;
@@ -519,13 +523,13 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 };
                 if (extractedCd && toolSpecificData.confirmation?.cwdLabel) {
                     confirmationTitle = args.isBackground ? ( localize(
-                        12589,
+                        13403,
                         "Run `{0}` command in `{1}` in background within `{2}`?",
                         presenterResult.languageDisplayName,
                         shellType,
                         toolSpecificData.confirmation.cwdLabel
                     )) : ( localize(
-                        12590,
+                        13404,
                         "Run `{0}` command in `{1}` within `{2}`?",
                         presenterResult.languageDisplayName,
                         shellType,
@@ -533,12 +537,12 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                     ));
                 } else {
                     confirmationTitle = args.isBackground ? ( localize(
-                        12591,
+                        13405,
                         "Run `{0}` command in `{1}` in background?",
                         presenterResult.languageDisplayName,
                         shellType
                     )) : ( localize(
-                        12592,
+                        13406,
                         "Run `{0}` command in `{1}`?",
                         presenterResult.languageDisplayName,
                         shellType
@@ -553,7 +557,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         const shouldShowConfirmation = !isFinalAutoApproved || context.forceConfirmationReason !== undefined;
         const confirmationMessages = shouldShowConfirmation ? {
             title: confirmationTitle,
-            message: ( new MarkdownString(( localize(12593, "Explanation: {0}\n\nGoal: {1}", args.explanation, args.goal)))),
+            message: ( new MarkdownString(( localize(13407, "Explanation: {0}\n\nGoal: {1}", args.explanation, args.goal)))),
             disclaimer,
             terminalCustomActions: customActions
         } : undefined;
@@ -567,6 +571,9 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         if (!toolSpecificData) {
             throw ( new Error("toolSpecificData must be provided for this tool"));
         }
+        if (!invocation.context) {
+            throw ( new Error("Invocation context must be provided for this tool"));
+        }
         const commandId = toolSpecificData.terminalCommandId;
         if (toolSpecificData.alternativeRecommendation) {
             return {
@@ -579,8 +586,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         const args = invocation.parameters;
         this._logService.debug(`RunInTerminalTool: Invoking with options ${JSON.stringify(args)}`);
         let toolResultMessage;
-        const chatSessionResource = invocation.context?.sessionResource ?? LocalChatSessionUri.forSession(invocation.context?.sessionId ?? "no-chat-session");
-        const chatSessionId = chatSessionResourceToId(chatSessionResource);
+        const chatSessionResource = invocation.context.sessionResource;
         const command = toolSpecificData.commandLine.userEdited ?? toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original;
         const didUserEditCommand = (toolSpecificData.commandLine.userEdited !== undefined && toolSpecificData.commandLine.userEdited !== toolSpecificData.commandLine.original);
         const didToolEditCommand = (!didUserEditCommand && toolSpecificData.commandLine.toolEdited !== undefined && toolSpecificData.commandLine.toolEdited !== toolSpecificData.commandLine.original);
@@ -594,7 +600,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         const terminalToolSessionId = toolSpecificData.terminalToolSessionId;
         const store = ( new DisposableStore());
         this._logService.debug(
-            `RunInTerminalTool: Creating ${args.isBackground ? "background" : "foreground"} terminal. termId=${termId}, chatSessionId=${chatSessionId}`
+            `RunInTerminalTool: Creating ${args.isBackground ? "background" : "foreground"} terminal. termId=${termId}, chatSessionResource=${chatSessionResource}`
         );
         const toolTerminal = await this._initTerminal(
             chatSessionResource,
@@ -661,7 +667,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         try {
             const execution = this._instantiationService.createInstance(
                 ActiveTerminalExecution,
-                chatSessionId,
+                chatSessionResource,
                 termId,
                 toolTerminal,
                 commandDetection,
@@ -680,7 +686,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 if (!outputMonitor) {
                     outputMonitor = store.add(this._instantiationService.createInstance(OutputMonitor, {
                         instance: toolTerminal.instance,
-                        sessionId: invocation.context?.sessionId,
+                        sessionResource: chatSessionResource,
                         getOutput: marker => execution.getOutput(marker ?? startMarker)
                     }, undefined, invocation.context, token, command));
                 }
@@ -794,6 +800,13 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 this._logService.debug(`RunInTerminalTool: Threw exception`);
                 if (e instanceof CancellationError) {
                     await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
+                    const state = toolSpecificData.terminalCommandState ?? {};
+                    if (state.exitCode === undefined) {
+                        state.exitCode = -1;
+                        state.timestamp = state.timestamp ?? timingStart;
+                        state.duration = state.duration ?? Math.max(0, Date.now() - state.timestamp);
+                    }
+                    toolSpecificData.terminalCommandState = state;
                 }
                 RunInTerminalTool_1._activeExecutions.get(termId)?.dispose();
                 RunInTerminalTool_1._activeExecutions.delete(termId);
@@ -859,6 +872,21 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 `Note: This terminal execution was moved to the background using the ID ${termId}\n`
             );
         }
+        let outputAnalyzerMessage;
+        for (const analyzer of this._outputAnalyzers) {
+            const message = await analyzer.analyze({
+                exitCode,
+                exitResult: terminalResult,
+                commandLine: command
+            });
+            if (message) {
+                outputAnalyzerMessage = message;
+                break;
+            }
+        }
+        if (outputAnalyzerMessage) {
+            resultText.push(`${outputAnalyzerMessage}\n`);
+        }
         resultText.push(terminalResult);
         const isError = exitCode !== undefined && exitCode !== 0;
         return {
@@ -1069,7 +1097,7 @@ let ActiveTerminalExecution = class ActiveTerminalExecution extends Disposable {
         return this._toolTerminal.instance;
     }
     constructor(
-        sessionId,
+        sessionResource,
         termId,
         toolTerminal,
         commandDetection,
@@ -1077,7 +1105,7 @@ let ActiveTerminalExecution = class ActiveTerminalExecution extends Disposable {
         _instantiationService
     ) {
         super();
-        this.sessionId = sessionId;
+        this.sessionResource = sessionResource;
         this.termId = termId;
         this._instantiationService = _instantiationService;
         this._toolTerminal = toolTerminal;

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

@@ -0,0 +1,8 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ITerminalSandboxService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service";
+import type { IOutputAnalyzer, IOutputAnalyzerOptions } from "./outputAnalyzer.js";
+export declare class SandboxOutputAnalyzer extends Disposable implements IOutputAnalyzer {
+    private readonly _sandboxService;
+    constructor(_sandboxService: ITerminalSandboxService);
+    analyze(options: IOutputAnalyzerOptions): Promise<string | undefined>;
+}

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

@@ -0,0 +1,31 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ITerminalSandboxService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+
+let SandboxOutputAnalyzer = class SandboxOutputAnalyzer extends Disposable {
+    constructor(_sandboxService) {
+        super();
+        this._sandboxService = _sandboxService;
+    }
+    async analyze(options) {
+        if (options.exitCode === undefined || options.exitCode === 0) {
+            return undefined;
+        }
+        if (!(await this._sandboxService.isEnabled())) {
+            return undefined;
+        }
+        return localize(
+            13408,
+            "Command failed while running in sandboxed mode. Use the command result to determine the scenario. If the issue is filesystem permissions, update allowWrite in {0} (Linux) or {1} (macOS). If the issue is domain/network related, add the required domains to {2}.allowedDomains.",
+            TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem,
+            TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem,
+            TerminalChatAgentToolsSettingId.TerminalSandboxNetwork
+        );
+    }
+};
+SandboxOutputAnalyzer = ( __decorate([( __param(0, ITerminalSandboxService))], SandboxOutputAnalyzer));
+
+export { SandboxOutputAnalyzer };

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

@@ -79,7 +79,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
             });
         }
         _progress.report({
-            message: ( new MarkdownString(( localize(12594, "Resolving the task"))))
+            message: ( new MarkdownString(( localize(13409, "Resolving the task"))))
         });
         let task;
         const start = Date.now();
@@ -96,11 +96,11 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
                     kind: "text",
                     value: `Task not found: ${args.task.label}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12595, "Task not found: `{0}`", args.task.label))))
+                toolResultMessage: ( new MarkdownString(( localize(13410, "Task not found: `{0}`", args.task.label))))
             };
         }
         _progress.report({
-            message: ( new MarkdownString(( localize(12596, "Running task `{0}`", args.task.label))))
+            message: ( new MarkdownString(( localize(13411, "Running task `{0}`", args.task.label))))
         });
         const raceResult = await Promise.race([
             this._tasksService.run(task, undefined, TaskRunSource.ChatAgent),
@@ -119,7 +119,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
                     value: `Task started but no terminal was found for: ${args.task.label}`
                 }],
                 toolResultMessage: ( new MarkdownString(( localize(
-                    12597,
+                    13412,
                     "Task started but no terminal was found for: `{0}`",
                     args.task.label
                 ))))
@@ -182,26 +182,26 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         const allTasks = await this._tasksService.tasks();
         if (allTasks?.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12598, "Task `{0}` already exists.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(12599, "Task `{0}` already exists.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(13413, "Task `{0}` already exists.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(13414, "Task `{0}` already exists.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         const activeTasks = await this._tasksService.getActiveTasks();
         if (activeTasks.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12600, "Task `{0}` is already running.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(12600, "Task `{0}` is already running.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(13415, "Task `{0}` is already running.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(13415, "Task `{0}` is already running.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(12601, "Created task `{0}`", task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(12602, "Created task `{0}`", task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(13416, "Created task `{0}`", task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(13417, "Created task `{0}`", task.label)))),
             confirmationMessages: {
-                title: ( localize(12603, "Allow task creation and execution?")),
+                title: ( localize(13418, "Allow task creation and execution?")),
                 message: ( new MarkdownString(( localize(
-                    12604,
+                    13419,
                     "A task `{0}` with command `{1}`{2} will be created.",
                     task.label,
                     task.command,
@@ -216,9 +216,9 @@ const CreateAndRunTaskToolData = {
     id: TerminalToolId.CreateAndRunTask,
     toolReferenceName: "createAndRunTask",
     legacyToolReferenceFullNames: ["runTasks/createAndRunTask"],
-    displayName: ( localize(12605, "Create and run Task")),
+    displayName: ( localize(13420, "Create and run Task")),
     modelDescription: "Creates and runs a build, run, or custom task for the workspace by generating or adding to a tasks.json file based on the project structure (such as package.json or README.md). If the user asks to build, run, launch and they have no tasks.json file, use this tool. If they ask to create or add a task, use this tool.",
-    userDescription: ( localize(12606, "Create and run a task in the workspace")),
+    userDescription: ( localize(13421, "Create and run a task in the workspace")),
     source: ToolDataSource.Internal,
     inputSchema: {
         "type": "object",

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

@@ -18,7 +18,7 @@ const GetTaskOutputToolData = {
     id: TerminalToolId.GetTaskOutput,
     toolReferenceName: "getTaskOutput",
     legacyToolReferenceFullNames: ["runTasks/getTaskOutput"],
-    displayName: ( localize(12607, "Get Task Output")),
+    displayName: ( localize(13422, "Get Task Output")),
     modelDescription: "Get the output of a task",
     source: ToolDataSource.Internal,
     when: TasksAvailableContext,
@@ -65,19 +65,19 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
         );
         if (!task) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12608, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(13423, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
         const activeTasks = await this._tasksService.getActiveTasks();
         if (activeTasks.includes(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12609, "The task `{0}` is already running.", taskLabel))))
+                invocationMessage: ( new MarkdownString(( localize(13424, "The task `{0}` is already running.", taskLabel))))
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(12610, "Checking output for task `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(12611, "Checked output for task `{0}`", taskLabel))))
+            invocationMessage: ( new MarkdownString(( localize(13425, "Checking output for task `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(13426, "Checked output for task `{0}`", taskLabel))))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -97,7 +97,7 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
                     kind: "text",
                     value: `Task not found: ${args.id}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12608, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(13423, "Task not found: `{0}`", args.id))))
             };
         }
         const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
@@ -112,7 +112,7 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
                     kind: "text",
                     value: `Terminal not found for task ${taskLabel}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12612, "Terminal not found for task `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(13427, "Terminal not found for task `{0}`", taskLabel))))
             };
         }
         const store = ( new DisposableStore());

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

@@ -57,7 +57,7 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `Task not found: ${args.id}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12613, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(13428, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
@@ -68,7 +68,7 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `The task ${taskLabel} is already running.`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12614, "The task `{0}` is already running.", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(13429, "The task `{0}` is already running.", taskLabel))))
             };
         }
         const raceResult = await Promise.race([
@@ -84,7 +84,7 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `Task started but no terminal was found for: ${taskLabel}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12615, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(13430, "Task started but no terminal was found for: `{0}`", taskLabel))))
             };
         }
         const terminals = this._terminalService.instances.filter(t => ( resources.some(r => r.path === t.resource.path && r.scheme === t.resource.scheme)));
@@ -94,7 +94,7 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `Task started but no terminal was found for: ${taskLabel}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(12615, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(13430, "Task started but no terminal was found for: `{0}`", taskLabel))))
             };
         }
         const store = ( new DisposableStore());
@@ -161,29 +161,29 @@ let RunTaskTool = class RunTaskTool {
         );
         if (!task) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12613, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(13428, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
         const activeTasks = await this._tasksService.getActiveTasks();
         if (task && activeTasks.includes(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12616, "The task is already running."))))
+                invocationMessage: ( new MarkdownString(( localize(13431, "The task is already running."))))
             };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12617, "`{0}` is already running.", taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(12618, "`{0}` was already running.", taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(13432, "`{0}` is already running.", taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(13433, "`{0}` was already running.", taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(12619, "Running `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(12620, "Started `{0}`", taskLabel)) : ( localize(12621, "Ran `{0}`", taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(13434, "Running `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(13435, "Started `{0}`", taskLabel)) : ( localize(13436, "Ran `{0}`", taskLabel)))),
             confirmationMessages: task ? {
-                title: ( localize(12622, "Allow task run?")),
-                message: ( localize(12623, "Allow to run the task `{0}`?", taskLabel))
+                title: ( localize(13437, "Allow task run?")),
+                message: ( localize(13438, "Allow to run the task `{0}`?", taskLabel))
             } : undefined
         };
     }
@@ -193,9 +193,9 @@ const RunTaskToolData = {
     id: TerminalToolId.RunTask,
     toolReferenceName: "runTask",
     legacyToolReferenceFullNames: ["runTasks/runTask"],
-    displayName: ( localize(12624, "Run Task")),
+    displayName: ( localize(13439, "Run Task")),
     modelDescription: `Runs a VS Code task.\n\n- If you see that an appropriate task exists for building or running code, prefer to use this tool to run the task instead of using the ${TerminalToolId.RunInTerminal} tool.\n- Make sure that any appropriate build or watch task is running before trying to run tests or execute code.\n- If the user asks to run a task, use this tool to do so.`,
-    userDescription: ( localize(12625, "Run tasks in the workspace")),
+    userDescription: ( localize(13440, "Run tasks in the workspace")),
     icon: Codicon.tools,
     source: ToolDataSource.Internal,
     when: TasksAvailableContext,

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

@@ -26,7 +26,7 @@ function toolResultMessageFromResponse(
 ) {
     let resultSummary = "";
     if (result?.exitCode) {
-        resultSummary = ( localize(12626, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
+        resultSummary = ( localize(13441, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
     } else {
         resultSummary += `\`${taskLabel}\` task `;
         const problemCount = toolResultDetails.length;

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.d.ts

@@ -5,6 +5,7 @@ import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { ITrustedDomainService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service";
 import { ITerminalSandboxService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service";
 export declare class TerminalSandboxService extends Disposable implements ITerminalSandboxService {
     private readonly _configurationService;
@@ -12,8 +13,10 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     private readonly _environmentService;
     private readonly _logService;
     private readonly _remoteAgentService;
+    private readonly _trustedDomainService;
     readonly _serviceBrand: undefined;
     private _srtPath;
+    private _rgPath;
     private _srtPathResolved;
     private _execPath?;
     private _sandboxConfigPath;
@@ -24,14 +27,16 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     private _remoteEnvDetails;
     private _appRoot;
     private _os;
-    constructor(_configurationService: IConfigurationService, _fileService: IFileService, _environmentService: IEnvironmentService, _logService: ILogService, _remoteAgentService: IRemoteAgentService);
+    constructor(_configurationService: IConfigurationService, _fileService: IFileService, _environmentService: IEnvironmentService, _logService: ILogService, _remoteAgentService: IRemoteAgentService, _trustedDomainService: ITrustedDomainService);
     isEnabled(): Promise<boolean>;
     wrapCommand(command: string): string;
     getTempDir(): URI | undefined;
     setNeedsForceUpdateConfigFile(): void;
     getSandboxConfigPath(forceRefresh?: boolean): Promise<string | undefined>;
+    private _quoteShellArgument;
     private _resolveSrtPath;
     private _createSandboxConfig;
     private _pathJoin;
     private _initTempDir;
+    private _addTrustedDomainsToAllowedDomains;
 }