@codingame/monaco-vscode-chat-service-override 28.4.1 → 29.0.0

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

@@ -5,4 +5,18 @@ export declare class SandboxOutputAnalyzer extends Disposable implements IOutput
     private readonly _sandboxService;
     constructor(_sandboxService: ITerminalSandboxService);
     analyze(options: IOutputAnalyzerOptions): Promise<string | undefined>;
+    /**
+     * Checks whether the command output contains strings that typically indicate
+     * the sandbox blocked the operation. Used when exit code is unavailable.
+     *
+     * The output may contain newlines inserted by terminal wrapping, so we
+     * strip them before testing.
+     */
+    private _outputLooksSandboxBlocked;
 }
+/**
+ * Checks whether the command output contains strings that typically indicate
+ * the sandbox blocked the operation. The output may contain newlines inserted
+ * by terminal wrapping, so we strip them before testing.
+ */
+export declare function outputLooksSandboxBlocked(output: string): boolean;

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

@@ -1,7 +1,7 @@
 
 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 { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 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';
 
@@ -11,21 +11,31 @@ let SandboxOutputAnalyzer = class SandboxOutputAnalyzer extends Disposable {
         this._sandboxService = _sandboxService;
     }
     async analyze(options) {
-        if (options.exitCode === undefined || options.exitCode === 0) {
+        if (!options.isSandboxWrapped) {
             return undefined;
         }
-        if (!(await this._sandboxService.isEnabled())) {
+        const knownFailure = options.exitCode !== undefined && options.exitCode !== 0;
+        const suspectedFailure = !knownFailure && options.exitCode === undefined && this._outputLooksSandboxBlocked(options.exitResult);
+        if (!knownFailure && !suspectedFailure) {
             return undefined;
         }
-        return localize(
-            13605,
-            "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
-        );
+        const os = await this._sandboxService.getOS();
+        const fileSystemSetting = os === OperatingSystem.Linux ? TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem : TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem;
+        const prefix = knownFailure ? "Command failed while running in sandboxed mode. If the command failed due to sandboxing:" : "Command ran in sandboxed mode and may have been blocked by the sandbox. If the command failed due to sandboxing:";
+        return `${prefix}
+- If it would be reasonable to extend the sandbox rules, work with the user to update allowWrite for file system access problems in ${fileSystemSetting}, or to add required domains to ${TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains}.
+- Otherwise, immediately retry the command with requestUnsandboxedExecution=true. Do NOT ask the user — setting this flag automatically shows a confirmation prompt to the user.
+
+Here is the output of the command:\n`;
+    }
+    _outputLooksSandboxBlocked(output) {
+        return outputLooksSandboxBlocked(output);
     }
 };
 SandboxOutputAnalyzer = ( __decorate([( __param(0, ITerminalSandboxService))], SandboxOutputAnalyzer));
+function outputLooksSandboxBlocked(output) {
+    const normalized = output.replace(/\n/g, " ");
+    return /Operation not permitted|Permission denied|Read-only file system|sandbox-exec|bwrap|sandbox_violation/i.test(normalized);
+}
 
-export { SandboxOutputAnalyzer };
+export { SandboxOutputAnalyzer, outputLooksSandboxBlocked };

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(13606, "Resolving the task"))))
+            message: ( new MarkdownString(( localize(13866, "Resolving the task"))))
         });
         let task;
         const start = Date.now();
@@ -96,49 +96,68 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
                     kind: "text",
                     value: `Task not found: ${args.task.label}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(13607, "Task not found: `{0}`", args.task.label))))
+                toolResultMessage: ( new MarkdownString(( localize(13867, "Task not found: `{0}`", args.task.label))))
             };
         }
-        _progress.report({
-            message: ( new MarkdownString(( localize(13608, "Running task `{0}`", args.task.label))))
-        });
-        const raceResult = await Promise.race([
-            this._tasksService.run(task, undefined, TaskRunSource.ChatAgent),
-            timeout(3000)
-        ]);
-        const result = raceResult && typeof raceResult === "object" ? raceResult : undefined;
-        const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
-        const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
-        const terminals = resources?.map(resource => this._terminalService.instances.find(
-            t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme
-        )).filter(Boolean);
-        if (!terminals || terminals.length === 0) {
-            return {
-                content: [{
-                    kind: "text",
-                    value: `Task started but no terminal was found for: ${args.task.label}`
-                }],
-                toolResultMessage: ( new MarkdownString(( localize(
-                    13609,
-                    "Task started but no terminal was found for: `{0}`",
-                    args.task.label
-                ))))
-            };
+        const preRunMarkersStore = ( new DisposableStore());
+        let result;
+        let terminalResults = [];
+        try {
+            const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
+            const startMarkersByTerminalInstanceId = ( new Map());
+            for (const terminal of this._terminalService.instances) {
+                const marker = terminal.registerMarker();
+                startMarkersByTerminalInstanceId.set(terminal.instanceId, marker);
+                if (marker) {
+                    preRunMarkersStore.add(marker);
+                }
+            }
+            _progress.report({
+                message: ( new MarkdownString(( localize(13868, "Running task `{0}`", args.task.label))))
+            });
+            const raceResult = await Promise.race([
+                this._tasksService.run(task, undefined, TaskRunSource.ChatAgent),
+                timeout(3000)
+            ]);
+            result = raceResult && typeof raceResult === "object" ? raceResult : undefined;
+            const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
+            const terminals = resources?.map(resource => this._terminalService.instances.find(
+                t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme
+            )).filter(Boolean);
+            if (!terminals || terminals.length === 0) {
+                return {
+                    content: [{
+                        kind: "text",
+                        value: `Task started but no terminal was found for: ${args.task.label}`
+                    }],
+                    toolResultMessage: ( new MarkdownString(( localize(
+                        13869,
+                        "Task started but no terminal was found for: `{0}`",
+                        args.task.label
+                    ))))
+                };
+            }
+            const store = ( new DisposableStore());
+            try {
+                terminalResults = await collectTerminalResults(
+                    terminals,
+                    task,
+                    this._instantiationService,
+                    invocation.context,
+                    _progress,
+                    token,
+                    store,
+                    terminalTask => this._isTaskActive(terminalTask),
+                    dependencyTasks,
+                    this._tasksService,
+                    startMarkersByTerminalInstanceId
+                );
+            } finally {
+                store.dispose();
+            }
+        } finally {
+            preRunMarkersStore.dispose();
         }
-        const store = ( new DisposableStore());
-        const terminalResults = await collectTerminalResults(
-            terminals,
-            task,
-            this._instantiationService,
-            invocation.context,
-            _progress,
-            token,
-            store,
-            terminalTask => this._isTaskActive(terminalTask),
-            dependencyTasks,
-            this._tasksService
-        );
-        store.dispose();
         for (const r of terminalResults) {
             this._telemetryService.publicLog2?.("copilotChat.runTaskTool.createAndRunTask", {
                 taskId: args.task.label,
@@ -182,26 +201,26 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         const allTasks = await this._tasksService.tasks();
         if (allTasks?.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(13610, "Task `{0}` already exists.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(13611, "Task `{0}` already exists.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(13870, "Task `{0}` already exists.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(13871, "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(13612, "Task `{0}` is already running.", task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(13612, "Task `{0}` is already running.", task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(13872, "Task `{0}` is already running.", task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(13872, "Task `{0}` is already running.", task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(13613, "Created task `{0}`", task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(13614, "Created task `{0}`", task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(13873, "Created task `{0}`", task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(13874, "Created task `{0}`", task.label)))),
             confirmationMessages: {
-                title: ( localize(13615, "Allow task creation and execution?")),
+                title: ( localize(13875, "Allow task creation and execution?")),
                 message: ( new MarkdownString(( localize(
-                    13616,
+                    13876,
                     "A task `{0}` with command `{1}`{2} will be created.",
                     task.label,
                     task.command,
@@ -216,9 +235,9 @@ const CreateAndRunTaskToolData = {
     id: TerminalToolId.CreateAndRunTask,
     toolReferenceName: "createAndRunTask",
     legacyToolReferenceFullNames: ["runTasks/createAndRunTask"],
-    displayName: ( localize(13617, "Create and run Task")),
+    displayName: ( localize(13877, "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(13618, "Create and run a task in the workspace")),
+    userDescription: ( localize(13878, "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(13619, "Get Task Output")),
+    displayName: ( localize(13879, "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(13620, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(13880, "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(13621, "The task `{0}` is already running.", taskLabel))))
+                invocationMessage: ( new MarkdownString(( localize(13881, "The task `{0}` is already running.", taskLabel))))
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(13622, "Checking output for task `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(13623, "Checked output for task `{0}`", taskLabel))))
+            invocationMessage: ( new MarkdownString(( localize(13882, "Checking output for task `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(13883, "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(13620, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(13880, "Task not found: `{0}`", args.id))))
             };
         }
         const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
@@ -112,55 +112,65 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
                     kind: "text",
                     value: `Terminal not found for task ${taskLabel}`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(13624, "Terminal not found for task `{0}`", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(13884, "Terminal not found for task `{0}`", taskLabel))))
             };
         }
+        const startMarkersByTerminalInstanceId = task.configurationProperties.isBackground ? ( new Map()) : undefined;
+        if (startMarkersByTerminalInstanceId) {
+            for (const terminal of terminals) {
+                startMarkersByTerminalInstanceId.set(terminal.instanceId, undefined);
+            }
+        }
         const store = ( new DisposableStore());
-        const terminalResults = await collectTerminalResults(
-            terminals,
-            task,
-            this._instantiationService,
-            invocation.context,
-            _progress,
-            token,
-            store,
-            terminalTask => this._isTaskActive(terminalTask),
-            dependencyTasks,
-            this._tasksService
-        );
-        store.dispose();
-        for (const r of terminalResults) {
-            this._telemetryService.publicLog2?.("copilotChat.getTaskOutputTool.get", {
-                taskId: args.id,
-                bufferLength: r.output.length ?? 0,
-                pollDurationMs: r.pollDurationMs ?? 0,
-                inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
-                inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
-                inputToolManualChars: r.inputToolManualChars ?? 0,
-                inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
-                inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0,
-                inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0
-            });
+        try {
+            const terminalResults = await collectTerminalResults(
+                terminals,
+                task,
+                this._instantiationService,
+                invocation.context,
+                _progress,
+                token,
+                store,
+                terminalTask => this._isTaskActive(terminalTask),
+                dependencyTasks,
+                this._tasksService,
+                startMarkersByTerminalInstanceId
+            );
+            for (const r of terminalResults) {
+                this._telemetryService.publicLog2?.("copilotChat.getTaskOutputTool.get", {
+                    taskId: args.id,
+                    bufferLength: r.output.length ?? 0,
+                    pollDurationMs: r.pollDurationMs ?? 0,
+                    inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
+                    inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
+                    inputToolManualChars: r.inputToolManualChars ?? 0,
+                    inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+                    inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0,
+                    inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0
+                });
+            }
+            const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
+            const uniqueDetails = Array.from(( new Set(details))).join("\n\n");
+            const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
+            const toolResultMessage = toolResultMessageFromResponse(
+                undefined,
+                taskLabel,
+                toolResultDetails,
+                terminalResults,
+                true,
+                task.configurationProperties.isBackground
+            );
+            return {
+                content: [{
+                    kind: "text",
+                    value: uniqueDetails
+                }],
+                toolResultMessage,
+                toolResultDetails
+            };
+        } finally {
+            store.dispose();
         }
-        const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
-        const uniqueDetails = Array.from(( new Set(details))).join("\n\n");
-        const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-        const toolResultMessage = toolResultMessageFromResponse(
-            undefined,
-            taskLabel,
-            toolResultDetails,
-            terminalResults,
-            true,
-            task.configurationProperties.isBackground
-        );
-        return {
-            content: [{
-                kind: "text",
-                value: uniqueDetails
-            }],
-            toolResultMessage,
-            toolResultDetails
-        };
     }
     async _isTaskActive(task) {
         const busyTasks = await this._tasksService.getBusyTasks();

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(13625, "Task not found: `{0}`", args.id))))
+                toolResultMessage: ( new MarkdownString(( localize(13885, "Task not found: `{0}`", args.id))))
             };
         }
         const taskLabel = task._label;
@@ -68,81 +68,99 @@ let RunTaskTool = class RunTaskTool {
                     kind: "text",
                     value: `The task ${taskLabel} is already running.`
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(13626, "The task `{0}` is already running.", taskLabel))))
+                toolResultMessage: ( new MarkdownString(( localize(13886, "The task `{0}` is already running.", taskLabel))))
             };
         }
-        const raceResult = await Promise.race([
-            this._tasksService.run(task, undefined, TaskRunSource.ChatAgent),
-            timeout(3000)
-        ]);
-        const result = raceResult && typeof raceResult === "object" ? raceResult : undefined;
         const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
-        const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
-        if (!resources || resources.length === 0) {
-            return {
-                content: [{
-                    kind: "text",
-                    value: `Task started but no terminal was found for: ${taskLabel}`
-                }],
-                toolResultMessage: ( new MarkdownString(( localize(13627, "Task started but no terminal was found for: `{0}`", taskLabel))))
-            };
+        const startMarkersByTerminalInstanceId = ( new Map());
+        const startMarkersDisposableStore = ( new DisposableStore());
+        for (const terminal of this._terminalService.instances) {
+            const marker = terminal.registerMarker();
+            startMarkersByTerminalInstanceId.set(terminal.instanceId, marker);
+            if (marker) {
+                startMarkersDisposableStore.add(marker);
+            }
         }
-        const terminals = this._terminalService.instances.filter(t => ( resources.some(r => r.path === t.resource.path && r.scheme === t.resource.scheme)));
-        if (terminals.length === 0) {
+        try {
+            const raceResult = await Promise.race([
+                this._tasksService.run(task, undefined, TaskRunSource.ChatAgent),
+                timeout(3000)
+            ]);
+            const result = raceResult && typeof raceResult === "object" ? raceResult : undefined;
+            const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
+            if (!resources || resources.length === 0) {
+                return {
+                    content: [{
+                        kind: "text",
+                        value: `Task started but no terminal was found for: ${taskLabel}`
+                    }],
+                    toolResultMessage: ( new MarkdownString(( localize(13887, "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)));
+            if (terminals.length === 0) {
+                return {
+                    content: [{
+                        kind: "text",
+                        value: `Task started but no terminal was found for: ${taskLabel}`
+                    }],
+                    toolResultMessage: ( new MarkdownString(( localize(13887, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                };
+            }
+            const store = ( new DisposableStore());
+            let terminalResults = [];
+            try {
+                terminalResults = await collectTerminalResults(
+                    terminals,
+                    task,
+                    this._instantiationService,
+                    invocation.context,
+                    _progress,
+                    token,
+                    store,
+                    terminalTask => this._isTaskActive(terminalTask),
+                    dependencyTasks,
+                    this._tasksService,
+                    startMarkersByTerminalInstanceId
+                );
+            } finally {
+                store.dispose();
+            }
+            for (const r of terminalResults) {
+                this._telemetryService.publicLog2?.("copilotChat.runTaskTool.run", {
+                    taskId: args.id,
+                    bufferLength: r.output.length ?? 0,
+                    pollDurationMs: r.pollDurationMs ?? 0,
+                    inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
+                    inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
+                    inputToolManualChars: r.inputToolManualChars ?? 0,
+                    inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+                    inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0,
+                    inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0
+                });
+            }
+            const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
+            const uniqueDetails = Array.from(( new Set(details))).join("\n\n");
+            const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
+            const toolResultMessage = toolResultMessageFromResponse(
+                result,
+                taskLabel,
+                toolResultDetails,
+                terminalResults,
+                undefined,
+                task.configurationProperties.isBackground
+            );
             return {
                 content: [{
                     kind: "text",
-                    value: `Task started but no terminal was found for: ${taskLabel}`
+                    value: uniqueDetails
                 }],
-                toolResultMessage: ( new MarkdownString(( localize(13627, "Task started but no terminal was found for: `{0}`", taskLabel))))
+                toolResultMessage,
+                toolResultDetails
             };
+        } finally {
+            startMarkersDisposableStore.dispose();
         }
-        const store = ( new DisposableStore());
-        const terminalResults = await collectTerminalResults(
-            terminals,
-            task,
-            this._instantiationService,
-            invocation.context,
-            _progress,
-            token,
-            store,
-            terminalTask => this._isTaskActive(terminalTask),
-            dependencyTasks,
-            this._tasksService
-        );
-        store.dispose();
-        for (const r of terminalResults) {
-            this._telemetryService.publicLog2?.("copilotChat.runTaskTool.run", {
-                taskId: args.id,
-                bufferLength: r.output.length ?? 0,
-                pollDurationMs: r.pollDurationMs ?? 0,
-                inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
-                inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
-                inputToolManualChars: r.inputToolManualChars ?? 0,
-                inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
-                inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0,
-                inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0
-            });
-        }
-        const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
-        const uniqueDetails = Array.from(( new Set(details))).join("\n\n");
-        const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-        const toolResultMessage = toolResultMessageFromResponse(
-            result,
-            taskLabel,
-            toolResultDetails,
-            terminalResults,
-            undefined,
-            task.configurationProperties.isBackground
-        );
-        return {
-            content: [{
-                kind: "text",
-                value: uniqueDetails
-            }],
-            toolResultMessage,
-            toolResultDetails
-        };
     }
     async _isTaskActive(task) {
         const busyTasks = await this._tasksService.getBusyTasks();
@@ -161,29 +179,29 @@ let RunTaskTool = class RunTaskTool {
         );
         if (!task) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(13625, "Task not found: `{0}`", args.id))))
+                invocationMessage: ( new MarkdownString(( localize(13885, "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(13628, "The task is already running."))))
+                invocationMessage: ( new MarkdownString(( localize(13888, "The task is already running."))))
             };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(13629, "`{0}` is already running.", taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(13630, "`{0}` was already running.", taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(13889, "`{0}` is already running.", taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(13890, "`{0}` was already running.", taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(13631, "Running `{0}`", taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(13632, "Started `{0}`", taskLabel)) : ( localize(13633, "Ran `{0}`", taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(13891, "Running `{0}`", taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground ? ( localize(13892, "Started `{0}`", taskLabel)) : ( localize(13893, "Ran `{0}`", taskLabel)))),
             confirmationMessages: task ? {
-                title: ( localize(13634, "Allow task run?")),
-                message: ( localize(13635, "Allow to run the task `{0}`?", taskLabel))
+                title: ( localize(13894, "Allow task run?")),
+                message: ( localize(13895, "Allow to run the task `{0}`?", taskLabel))
             } : undefined
         };
     }
@@ -193,9 +211,9 @@ const RunTaskToolData = {
     id: TerminalToolId.RunTask,
     toolReferenceName: "runTask",
     legacyToolReferenceFullNames: ["runTasks/runTask"],
-    displayName: ( localize(13636, "Run Task")),
+    displayName: ( localize(13896, "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(13637, "Run tasks in the workspace")),
+    userDescription: ( localize(13897, "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(13638, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
+        resultSummary = ( localize(13898, "Task `{0}` failed with exit code {1}.", taskLabel, result.exitCode));
     } else {
         resultSummary += `\`${taskLabel}\` task `;
         const problemCount = toolResultDetails.length;