@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/{task → tools/task}/createAndRunTaskTool.d.ts

@@ -1,19 +1,19 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare class CreateAndRunTaskTool implements IToolImpl {
     private readonly _tasksService;
     private readonly _telemetryService;
     private readonly _terminalService;
-    private readonly _languageModelsService;
-    private readonly _chatService;
     private readonly _fileService;
-    constructor(_tasksService: ITaskService, _telemetryService: ITelemetryService, _terminalService: ITerminalService, _languageModelsService: ILanguageModelsService, _chatService: IChatService, _fileService: IFileService);
+    private readonly _configurationService;
+    private readonly _instantiationService;
+    constructor(_tasksService: ITaskService, _telemetryService: ITelemetryService, _terminalService: ITerminalService, _fileService: IFileService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService);
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private _isTaskActive;
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;

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

@@ -3,26 +3,27 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { pollForOutputAndIdle, racePollingOrPrompt, promptForMorePolling } from '../bufferOutputPolling.js';
-import { getOutput } from '../outputHelpers.js';
+import { resolveDependencyTasks, collectTerminalResults } from '../../taskHelpers.js';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './taskHelpers.js';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
 let CreateAndRunTaskTool = class CreateAndRunTaskTool {
-    constructor(_tasksService, _telemetryService, _terminalService, _languageModelsService, _chatService, _fileService) {
+    constructor(_tasksService, _telemetryService, _terminalService, _fileService, _configurationService, _instantiationService) {
         this._tasksService = _tasksService;
         this._telemetryService = _telemetryService;
         this._terminalService = _terminalService;
-        this._languageModelsService = _languageModelsService;
-        this._chatService = _chatService;
         this._fileService = _fileService;
+        this._configurationService = _configurationService;
+        this._instantiationService = _instantiationService;
     }
     async invoke(invocation, _countTokens, _progress, token) {
         const args = invocation.parameters;
@@ -55,7 +56,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
             await this._fileService.writeFile(tasksJsonUri, VSBuffer.fromString(JSON.stringify(tasksJson, null, '\t')));
             _progress.report({ message: 'Updated tasks.json file' });
         }
-        _progress.report({ message: ( new MarkdownString(( localize(11269, 'Resolving the task')))) });
+        _progress.report({ message: ( new MarkdownString(( localize(11463, 'Resolving the task')))) });
         let task;
         const start = Date.now();
         while (Date.now() - start < 5000 && !token.isCancellationRequested) {
@@ -66,43 +67,43 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
             await timeout(100);
         }
         if (!task) {
-            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(11270, 'Task not found: `{0}`', args.task.label)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(11464, 'Task not found: `{0}`', args.task.label)))) };
         }
-        _progress.report({ message: ( new MarkdownString(( localize(11271, 'Running task `{0}`', args.task.label)))) });
+        _progress.report({ message: ( new MarkdownString(( localize(11465, 'Running task `{0}`', args.task.label)))) });
         const raceResult = await Promise.race([this._tasksService.run(task), timeout(3000)]);
         const result = raceResult && typeof raceResult === 'object' ? raceResult : undefined;
-        const resource = this._tasksService.getTerminalForTask(task);
-        const terminal = this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme);
-        if (!terminal) {
+        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(
-                11272,
+                11466,
                 'Task started but no terminal was found for: `{0}`',
                 args.task.label
             )))) };
         }
-        _progress.report({ message: ( new MarkdownString(( localize(11273, 'Checking output for `{0}`', args.task.label)))) });
-        let outputAndIdle = await pollForOutputAndIdle({ getOutput: () => getOutput(terminal), isActive: () => this._isTaskActive(task) }, false, token, this._languageModelsService);
-        if (!outputAndIdle.terminalExecutionIdleBeforeTimeout) {
-            outputAndIdle = await racePollingOrPrompt(() => pollForOutputAndIdle({ getOutput: () => getOutput(terminal), isActive: () => this._isTaskActive(task) }, true, token, this._languageModelsService), () => promptForMorePolling(args.task.label, token, invocation.context, this._chatService), outputAndIdle, token, this._languageModelsService, { getOutput: () => getOutput(terminal), isActive: () => this._isTaskActive(task) });
+        const store = ( new DisposableStore());
+        const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, () => this._isTaskActive(task), dependencyTasks);
+        store.dispose();
+        for (const r of terminalResults) {
+            this._telemetryService.publicLog2?.('copilotChat.runTaskTool.createAndRunTask', {
+                taskLabel: args.task.label,
+                bufferLength: r.output.length ?? 0,
+                pollDurationMs: r.pollDurationMs ?? 0,
+                inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
+                inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
+                inputToolManualChars: r.inputToolManualChars ?? 0,
+            });
         }
-        let output = '';
-        if (result?.exitCode) {
-            output = `Task \`${args.task.label}\` failed with exit code ${result.exitCode}.`;
-        }
-        else {
-            if (outputAndIdle.terminalExecutionIdleBeforeTimeout) {
-                output += `Task \`${args.task.label}\` finished`;
-            }
-            else {
-                output += `Task \`${args.task.label}\` started and will continue to run in the background.`;
-            }
-        }
-        this._telemetryService.publicLog2?.('copilotChat.runTaskTool.createAndRunTask', {
-            taskLabel: args.task.label,
-            bufferLength: outputAndIdle.output.length,
-            pollDurationMs: outputAndIdle?.pollDurationMs ?? 0,
-        });
-        return { content: [{ kind: 'text', value: `The output was ${outputAndIdle.output}` }], toolResultMessage: output };
+        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, args.task.label, toolResultDetails, terminalResults);
+        return {
+            content: [{ kind: 'text', value: uniqueDetails }],
+            toolResultMessage,
+            toolResultDetails
+        };
     }
     async _isTaskActive(task) {
         const activeTasks = await this._tasksService.getActiveTasks();
@@ -114,26 +115,26 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         const allTasks = await this._tasksService.tasks();
         if (allTasks?.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(11274, 'Task `{0}` already exists.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11275, 'Task `{0}` already exists.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(11467, 'Task `{0}` already exists.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(11468, '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(11276, 'Task \`{0}\` is already running.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11276, 'Task \`{0}\` is already running.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(11469, 'Task \`{0}\` is already running.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(11469, 'Task \`{0}\` is already running.', task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11277, 'Created task \`{0}\`', task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(11278, 'Created task \`{0}\`', task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(11470, 'Created task \`{0}\`', task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(11471, 'Created task \`{0}\`', task.label)))),
             confirmationMessages: {
-                title: ( localize(11279, 'Allow task creation and execution?')),
+                title: ( localize(11472, 'Allow task creation and execution?')),
                 message: ( new MarkdownString(( localize(
-                    11280,
+                    11473,
                     'Copilot will create the task \`{0}\` with command \`{1}\`{2}.',
                     task.label,
                     task.command,
@@ -147,19 +148,19 @@ CreateAndRunTaskTool = ( __decorate([
     ( __param(0, ITaskService)),
     ( __param(1, ITelemetryService)),
     ( __param(2, ITerminalService)),
-    ( __param(3, ILanguageModelsService)),
-    ( __param(4, IChatService)),
-    ( __param(5, IFileService))
+    ( __param(3, IFileService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IInstantiationService))
 ], CreateAndRunTaskTool));
 const CreateAndRunTaskToolData = {
     id: 'create_and_run_task',
     toolReferenceName: 'createAndRunTask',
-    displayName: ( localize(11281, 'Create and run Task')),
+    displayName: ( localize(11474, 'Create and run Task')),
     modelDescription: ( localize(
-        11282,
+        11475,
         '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(11283, "Create and run a task in the workspace")),
+    userDescription: ( localize(11476, "Create and run a task in the workspace")),
     source: ToolDataSource.Internal,
     inputSchema: {
         'type': 'object',

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/{task → tools/task}/getTaskOutputTool.d.ts

@@ -1,6 +1,8 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
@@ -13,7 +15,10 @@ export declare class GetTaskOutputTool extends Disposable implements IToolImpl {
     private readonly _tasksService;
     private readonly _terminalService;
     private readonly _configurationService;
-    constructor(_tasksService: ITaskService, _terminalService: ITerminalService, _configurationService: IConfigurationService);
+    private readonly _instantiationService;
+    private readonly _telemetryService;
+    constructor(_tasksService: ITaskService, _terminalService: ITerminalService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _telemetryService: ITelemetryService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
+    private _isTaskActive;
 }

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

@@ -0,0 +1,117 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { TasksAvailableContext } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService';
+import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
+import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { getTaskDefinition, getTaskForTool, resolveDependencyTasks, collectTerminalResults } from '../../taskHelpers.js';
+import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './taskHelpers.js';
+
+const GetTaskOutputToolData = {
+    id: 'get_task_output',
+    toolReferenceName: 'getTaskOutput',
+    displayName: ( localize(11477, 'Get Task Output')),
+    modelDescription: 'Get the output of a task',
+    source: ToolDataSource.Internal,
+    when: TasksAvailableContext,
+    inputSchema: {
+        type: 'object',
+        properties: {
+            id: {
+                type: 'string',
+                description: 'The task ID for which to get the output.'
+            },
+            workspaceFolder: {
+                type: 'string',
+                description: 'The workspace folder path containing the task'
+            },
+        },
+        required: [
+            'id',
+            'workspaceFolder'
+        ]
+    }
+};
+let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
+    constructor(_tasksService, _terminalService, _configurationService, _instantiationService, _telemetryService) {
+        super();
+        this._tasksService = _tasksService;
+        this._terminalService = _terminalService;
+        this._configurationService = _configurationService;
+        this._instantiationService = _instantiationService;
+        this._telemetryService = _telemetryService;
+    }
+    async prepareToolInvocation(context, token) {
+        const args = context.parameters;
+        const taskDefinition = getTaskDefinition(args.id);
+        const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
+        if (!task) {
+            return { invocationMessage: ( new MarkdownString(( localize(11478, '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(11479, 'The task `{0}` is already running.', taskLabel)))) };
+        }
+        return {
+            invocationMessage: ( new MarkdownString(( localize(11480, 'Checking output for task `{0}`', taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(11481, 'Checked output for task `{0}`', taskLabel)))),
+        };
+    }
+    async invoke(invocation, _countTokens, _progress, token) {
+        const args = invocation.parameters;
+        const taskDefinition = getTaskDefinition(args.id);
+        const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
+        if (!task) {
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(11478, 'Task not found: `{0}`', args.id)))) };
+        }
+        const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
+        const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
+        const taskLabel = task._label;
+        const terminals = resources?.map(resource => this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme)).filter(t => !!t);
+        if (!terminals || terminals.length === 0) {
+            return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(11482, 'Terminal not found for task `{0}`', taskLabel)))) };
+        }
+        const store = ( new DisposableStore());
+        const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, () => this._isTaskActive(task), dependencyTasks);
+        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,
+            });
+        }
+        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);
+        return {
+            content: [{ kind: 'text', value: uniqueDetails }],
+            toolResultMessage,
+            toolResultDetails
+        };
+    }
+    async _isTaskActive(task) {
+        const activeTasks = await this._tasksService.getActiveTasks();
+        return activeTasks?.includes(task) ?? false;
+    }
+};
+GetTaskOutputTool = ( __decorate([
+    ( __param(0, ITaskService)),
+    ( __param(1, ITerminalService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, ITelemetryService))
+], GetTaskOutputTool));
+
+export { GetTaskOutputTool, GetTaskOutputToolData };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/{task → tools/task}/runTaskTool.d.ts

@@ -1,19 +1,17 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare class RunTaskTool implements IToolImpl {
     private readonly _tasksService;
     private readonly _telemetryService;
     private readonly _terminalService;
-    private readonly _languageModelsService;
-    private readonly _chatService;
     private readonly _configurationService;
-    constructor(_tasksService: ITaskService, _telemetryService: ITelemetryService, _terminalService: ITerminalService, _languageModelsService: ILanguageModelsService, _chatService: IChatService, _configurationService: IConfigurationService);
+    private readonly _instantiationService;
+    constructor(_tasksService: ITaskService, _telemetryService: ITelemetryService, _terminalService: ITerminalService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService);
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private _isTaskActive;
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;

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

@@ -3,25 +3,25 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { TasksAvailableContext } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService';
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { pollForOutputAndIdle, racePollingOrPrompt, promptForMorePolling } from '../bufferOutputPolling.js';
-import { getOutput } from '../outputHelpers.js';
-import { getTaskDefinition, getTaskForTool } from './taskHelpers.js';
+import { getTaskDefinition, getTaskForTool, resolveDependencyTasks, collectTerminalResults } from '../../taskHelpers.js';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './taskHelpers.js';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
 let RunTaskTool = class RunTaskTool {
-    constructor(_tasksService, _telemetryService, _terminalService, _languageModelsService, _chatService, _configurationService) {
+    constructor(_tasksService, _telemetryService, _terminalService, _configurationService, _instantiationService) {
         this._tasksService = _tasksService;
         this._telemetryService = _telemetryService;
         this._terminalService = _terminalService;
-        this._languageModelsService = _languageModelsService;
-        this._chatService = _chatService;
         this._configurationService = _configurationService;
+        this._instantiationService = _instantiationService;
     }
     async invoke(invocation, _countTokens, _progress, token) {
         const args = invocation.parameters;
@@ -29,45 +29,48 @@ let RunTaskTool = class RunTaskTool {
             return { content: [{ kind: 'text', value: `No invocation context` }], toolResultMessage: `No invocation context` };
         }
         const taskDefinition = getTaskDefinition(args.id);
-        const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService);
+        const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
         if (!task) {
-            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(11290, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(11483, 'Task not found: `{0}`', args.id)))) };
         }
         const taskLabel = task._label;
         const activeTasks = await this._tasksService.getActiveTasks();
         if (activeTasks.includes(task)) {
-            return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: ( new MarkdownString(( localize(11291, 'The task `{0}` is already running.', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: ( new MarkdownString(( localize(11484, 'The task `{0}` is already running.', taskLabel)))) };
         }
         const raceResult = await Promise.race([this._tasksService.run(task), timeout(3000)]);
         const result = raceResult && typeof raceResult === 'object' ? raceResult : undefined;
-        const resource = this._tasksService.getTerminalForTask(task);
-        const terminal = this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme);
-        if (!terminal) {
-            return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(11292, 'Task started but no terminal was found for: `{0}`', taskLabel)))) };
+        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(11485, 'Task started but no terminal was found for: `{0}`', taskLabel)))) };
         }
-        _progress.report({ message: ( new MarkdownString(( localize(11293, 'Checking output for `{0}`', taskLabel)))) });
-        let outputAndIdle = await pollForOutputAndIdle({ getOutput: () => getOutput(terminal), isActive: () => this._isTaskActive(task) }, false, token, this._languageModelsService);
-        if (!outputAndIdle.terminalExecutionIdleBeforeTimeout) {
-            outputAndIdle = await racePollingOrPrompt(() => pollForOutputAndIdle({ getOutput: () => getOutput(terminal), isActive: () => this._isTaskActive(task) }, true, token, this._languageModelsService), () => promptForMorePolling(taskLabel, token, invocation.context, this._chatService), outputAndIdle, token, this._languageModelsService, { getOutput: () => getOutput(terminal), isActive: () => this._isTaskActive(task) });
+        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(11485, 'Task started but no terminal was found for: `{0}`', taskLabel)))) };
         }
-        let output = '';
-        if (result?.exitCode) {
-            output = `Task \`${taskLabel}\` failed with exit code ${result.exitCode}.`;
+        const store = ( new DisposableStore());
+        const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, () => this._isTaskActive(task), dependencyTasks);
+        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,
+            });
         }
-        else {
-            if (outputAndIdle.terminalExecutionIdleBeforeTimeout) {
-                output += `Task \`${taskLabel}\` finished`;
-            }
-            else {
-                output += `Task \`${taskLabel}\` started and will continue to run in the background.`;
-            }
-        }
-        this._telemetryService.publicLog2?.('copilotChat.runTaskTool.run', {
-            taskId: args.id,
-            bufferLength: outputAndIdle.output.length,
-            pollDurationMs: outputAndIdle?.pollDurationMs ?? 0,
-        });
-        return { content: [{ kind: 'text', value: `The output was ${outputAndIdle.output}` }], toolResultMessage: output };
+        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);
+        return {
+            content: [{ kind: 'text', value: uniqueDetails }],
+            toolResultMessage,
+            toolResultDetails
+        };
     }
     async _isTaskActive(task) {
         const activeTasks = await this._tasksService.getActiveTasks();
@@ -76,29 +79,29 @@ let RunTaskTool = class RunTaskTool {
     async prepareToolInvocation(context, token) {
         const args = context.parameters;
         const taskDefinition = getTaskDefinition(args.id);
-        const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService);
+        const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
         if (!task) {
-            return { invocationMessage: ( new MarkdownString(( localize(11290, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(11483, '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(11294, 'The task is already running.')))) };
+            return { invocationMessage: ( new MarkdownString(( localize(11486, 'The task is already running.')))) };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(11295, '`{0}` is already running.', taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11296, '`{0}` was already running.', taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(11487, '`{0}` is already running.', taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(11488, '`{0}` was already running.', taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11297, 'Running `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(11489, 'Running `{0}`', taskLabel)))),
             pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground
-                ? ( localize(11298, 'Started `{0}`', taskLabel))
-                : ( localize(11299, 'Ran `{0}`', taskLabel)))),
+                ? ( localize(11490, 'Started `{0}`', taskLabel))
+                : ( localize(11491, 'Ran `{0}`', taskLabel)))),
             confirmationMessages: task
-                ? { title: ( localize(11300, 'Allow task run?')), message: ( localize(11301, 'Allow Copilot to run the task `{0}`?', taskLabel)) }
+                ? { title: ( localize(11492, 'Allow task run?')), message: ( localize(11493, 'Allow Copilot to run the task `{0}`?', taskLabel)) }
                 : undefined
         };
     }
@@ -107,17 +110,18 @@ RunTaskTool = ( __decorate([
     ( __param(0, ITaskService)),
     ( __param(1, ITelemetryService)),
     ( __param(2, ITerminalService)),
-    ( __param(3, ILanguageModelsService)),
-    ( __param(4, IChatService)),
-    ( __param(5, IConfigurationService))
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IInstantiationService))
 ], RunTaskTool));
 const RunTaskToolData = {
     id: 'run_task',
     toolReferenceName: 'runTask',
-    displayName: ( localize(11302, 'Run Task')),
+    displayName: ( localize(11494, '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 run_in_terminal 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(11303, 'Tool for running tasks in the workspace')),
+    userDescription: ( localize(11495, 'Tool for running tasks in the workspace')),
+    icon: Codicon.tools,
     source: ToolDataSource.Internal,
+    when: TasksAvailableContext,
     inputSchema: {
         'type': 'object',
         'properties': {

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

@@ -0,0 +1,19 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { ITaskSummary } from "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService";
+import { OutputMonitorState } from "../monitoring/types.js";
+import { MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
+export declare function toolResultDetailsFromResponse(terminalResults: {
+    output: string;
+    resources?: ILinkLocation[];
+}[]): (URI | Location)[];
+export declare function toolResultMessageFromResponse(result: ITaskSummary | undefined, taskLabel: string, toolResultDetails: (URI | Location)[], terminalResults: {
+    output: string;
+    resources?: ILinkLocation[];
+    state: OutputMonitorState;
+}[]): MarkdownString;
+export interface ILinkLocation {
+    uri: URI;
+    range?: Range;
+}

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

@@ -0,0 +1,36 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { OutputMonitorState } from '../monitoring/types.js';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+
+function toolResultDetailsFromResponse(terminalResults) {
+    return Array.from(( ( new Map(terminalResults
+        .flatMap(r => r.resources?.filter(res => res.uri).map(res => {
+        const range = res.range;
+        const item = range !== undefined ? { uri: res.uri, range } : res.uri;
+        const key = range !== undefined
+            ? `${( res.uri.toString())}-${( range.toString())}`
+            : `${( res.uri.toString())}`;
+        return [key, item];
+    }) ?? []))).values()));
+}
+function toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults) {
+    let resultSummary = '';
+    if (result?.exitCode) {
+        resultSummary = ( localize(11496, 'Task `{0}` failed with exit code {1}.', taskLabel, result.exitCode));
+    }
+    else {
+        resultSummary += `\`${taskLabel}\` task `;
+        const problemCount = toolResultDetails.length;
+        resultSummary += terminalResults.every(r => r.state === OutputMonitorState.Idle)
+            ? (problemCount
+                ? `finished with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
+                : 'finished')
+            : (problemCount
+                ? `started and will continue to run in the background with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
+                : 'started and will continue to run in the background');
+    }
+    return ( new MarkdownString(resultSummary));
+}
+
+export { toolResultDetailsFromResponse, toolResultMessageFromResponse };

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

@@ -0,0 +1,3 @@
+export declare enum TerminalChatAgentToolsCommandId {
+    ChatAddTerminalSelection = "workbench.action.terminal.chat.addTerminalSelection"
+}