@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.0

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

@@ -15,16 +15,16 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { TerminalCapability } from '@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
+import { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { ITerminalChatService, ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
-import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { getRecommendedToolsOverRunInTerminal } from '../alternativeRecommendation.js';
 import { BasicExecuteStrategy } from '../executeStrategy/basicExecuteStrategy.js';
 import { NoneExecuteStrategy } from '../executeStrategy/noneExecuteStrategy.js';
@@ -43,17 +43,21 @@ import { CommandLineCdPrefixRewriter } from './commandLineRewriter/commandLineCd
 import { CommandLinePwshChainOperatorRewriter } from './commandLineRewriter/commandLinePwshChainOperatorRewriter.js';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
+import { TerminalCommandArtifactCollector } from './terminalCommandArtifactCollector.js';
+import { isNumber, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 var RunInTerminalTool_1;
 const TOOL_REFERENCE_NAME = 'runInTerminal';
+const LEGACY_TOOL_REFERENCE_FULL_NAMES = ['runCommands/runInTerminal'];
 function createPowerShellModelDescription(shell) {
     const isWinPwsh = isWindowsPowerShell(shell);
     return [
         `This tool allows you to execute ${isWinPwsh ? 'Windows PowerShell 5.1' : 'PowerShell'} commands in a persistent terminal session, preserving environment variables, working directory, and other context across multiple commands.`,
         '',
         'Command Execution:',
-        '- Use semicolons ; to chain commands on one line, NEVER use && even when asked explicitly',
+        isWinPwsh ? '- Use semicolons ; to chain commands on one line, NEVER use && even when asked explicitly' : '- Prefer ; when chaining commands on one line',
         '- Prefer pipelines | for object-based data flow',
         '- Never create a sub-shell (eg. powershell -c "command") unless explicitly asked',
         '',
@@ -173,9 +177,10 @@ async function createRunInTerminalToolData(accessor) {
     return {
         id: 'run_in_terminal',
         toolReferenceName: TOOL_REFERENCE_NAME,
-        displayName: ( localize(11890, 'Run in Terminal')),
+        legacyToolReferenceFullNames: LEGACY_TOOL_REFERENCE_FULL_NAMES,
+        displayName: ( localize(12031, 'Run in Terminal')),
         modelDescription,
-        userDescription: ( localize(11891, 'Tool for running commands in the terminal')),
+        userDescription: ( localize(12032, 'Run commands in the terminal')),
         source: ToolDataSource.Internal,
         icon: Codicon.terminal,
         inputSchema: {
@@ -220,7 +225,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         }
         return backgroundExecution.getOutput();
     }
-    constructor(_chatService, _configurationService, _historyService, _instantiationService, _languageModelToolsService, _remoteAgentService, _storageService, _terminalChatService, _logService, _terminalService, _workspaceContextService) {
+    constructor(_chatService, _configurationService, _historyService, _instantiationService, _languageModelToolsService, _remoteAgentService, _storageService, _terminalChatService, _logService, _terminalService, _workspaceContextService, _chatWidgetService) {
         super();
         this._chatService = _chatService;
         this._configurationService = _configurationService;
@@ -233,11 +238,13 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         this._logService = _logService;
         this._terminalService = _terminalService;
         this._workspaceContextService = _workspaceContextService;
+        this._chatWidgetService = _chatWidgetService;
         this._sessionTerminalAssociations = ( new Map());
         this._osBackend = this._remoteAgentService.getEnvironment().then(remoteEnv => remoteEnv?.os ?? OS);
         this._terminalToolCreator = this._instantiationService.createInstance(ToolTerminalCreator);
         this._treeSitterCommandParser = this._register(this._instantiationService.createInstance(TreeSitterCommandParser));
         this._telemetry = this._instantiationService.createInstance(RunInTerminalToolTelemetry);
+        this._commandArtifactCollector = this._instantiationService.createInstance(TerminalCommandArtifactCollector);
         this._profileFetcher = this._instantiationService.createInstance(TerminalProfileFetcher);
         this._commandLineRewriters = [
             this._register(this._instantiationService.createInstance(CommandLineCdPrefixRewriter)),
@@ -321,10 +328,23 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             };
         }
         const commandLine = rewrittenCommand ?? args.command;
-        const isEligibleForAutoApproval = this._configurationService.getValue(ChatConfiguration.EligibleForAutoApproval)?.[TOOL_REFERENCE_NAME] ?? true;
+        const isEligibleForAutoApproval = () => {
+            const config = this._configurationService.getValue(ChatConfiguration.EligibleForAutoApproval);
+            if (config && typeof config === 'object') {
+                if (Object.prototype.hasOwnProperty.call(config, TOOL_REFERENCE_NAME)) {
+                    return config[TOOL_REFERENCE_NAME];
+                }
+                for (const legacyName of LEGACY_TOOL_REFERENCE_FULL_NAMES) {
+                    if (Object.prototype.hasOwnProperty.call(config, legacyName)) {
+                        return config[legacyName];
+                    }
+                }
+            }
+            return true;
+        };
         const isAutoApproveEnabled = this._configurationService.getValue(TerminalChatAgentToolsSettingId.EnableAutoApprove) === true;
         const isAutoApproveWarningAccepted = this._storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
-        const isAutoApproveAllowed = isEligibleForAutoApproval && isAutoApproveEnabled && isAutoApproveWarningAccepted;
+        const isAutoApproveAllowed = isEligibleForAutoApproval() && isAutoApproveEnabled && isAutoApproveWarningAccepted;
         const commandLineAnalyzerOptions = {
             commandLine,
             cwd,
@@ -332,6 +352,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             shell,
             treeSitterLanguage: isPowerShell(shell, os) ? TreeSitterCommandParserLanguage.PowerShell : TreeSitterCommandParserLanguage.Bash,
             terminalToolSessionId,
+            chatSessionId: context.chatSessionId,
         };
         const commandLineAnalyzerResults = await Promise.all(( this._commandLineAnalyzers.map(e => e.analyze(commandLineAnalyzerOptions))));
         const disclaimersRaw = commandLineAnalyzerResults.filter(e => e.disclaimers).flatMap(e => e.disclaimers);
@@ -342,17 +363,25 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 { supportThemeIcons: true }
             ));
         }
-        const customActions = isEligibleForAutoApproval ? ( commandLineAnalyzerResults.map(e => e.customActions ?? [])).flat() : undefined;
-        toolSpecificData.autoApproveInfo = commandLineAnalyzerResults.find(e => e.autoApproveInfo)?.autoApproveInfo;
+        const analyzersIsAutoApproveAllowed = commandLineAnalyzerResults.every(e => e.isAutoApproveAllowed);
+        const customActions = isEligibleForAutoApproval() && analyzersIsAutoApproveAllowed ? ( commandLineAnalyzerResults.map(e => e.customActions ?? [])).flat() : undefined;
         let shellType = basename(shell, '.exe');
         if (shellType === 'powershell') {
             shellType = 'pwsh';
         }
-        const isFinalAutoApproved = isAutoApproveAllowed && commandLineAnalyzerResults.every(e => e.isAutoApproveAllowed);
+        const isFinalAutoApproved = (
+        (isAutoApproveAllowed &&
+            (
+            commandLineAnalyzerResults.some(e => e.isAutoApproved)) &&
+            commandLineAnalyzerResults.every(e => e.isAutoApproved !== false) &&
+        analyzersIsAutoApproveAllowed));
+        if (isFinalAutoApproved) {
+            toolSpecificData.autoApproveInfo = commandLineAnalyzerResults.find(e => e.autoApproveInfo)?.autoApproveInfo;
+        }
         const confirmationMessages = isFinalAutoApproved ? undefined : {
             title: args.isBackground
-                ? ( localize(11892, "Run `{0}` command? (background terminal)", shellType))
-                : ( localize(11893, "Run `{0}` command?", shellType)),
+                ? ( localize(12033, "Run `{0}` command? (background terminal)", shellType))
+                : ( localize(12034, "Run `{0}` command?", shellType)),
             message: ( new MarkdownString(args.explanation)),
             disclaimer,
             terminalCustomActions: customActions,
@@ -367,6 +396,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         if (!toolSpecificData) {
             throw ( new Error('toolSpecificData must be provided for this tool'));
         }
+        const commandId = toolSpecificData.terminalCommandId;
         if (toolSpecificData.alternativeRecommendation) {
             return {
                 content: [{
@@ -398,7 +428,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         const toolTerminal = await (args.isBackground
             ? this._initBackgroundTerminal(chatSessionId, termId, terminalToolSessionId, token)
             : this._initForegroundTerminal(chatSessionId, termId, terminalToolSessionId, token));
-        this._handleTerminalVisibility(toolTerminal);
+        this._handleTerminalVisibility(toolTerminal, chatSessionId);
         const timingConnectMs = Date.now() - timingStart;
         const xterm = await toolTerminal.instance.xtermReadyPromise;
         if (!xterm) {
@@ -418,7 +448,6 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             let pollingResult;
             try {
                 this._logService.debug(`RunInTerminalTool: Starting background execution \`${command}\``);
-                const commandId = toolSpecificData.terminalCommandId;
                 const execution = ( new BackgroundTerminalExecution(toolTerminal.instance, xterm, command, chatSessionId, commandId));
                 RunInTerminalTool_1._backgroundExecutions.set(termId, execution);
                 outputMonitor = store.add(this._instantiationService.createInstance(OutputMonitor, execution, undefined, invocation.context, token, command));
@@ -427,6 +456,10 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 if (token.isCancellationRequested) {
                     throw ( new CancellationError());
                 }
+                await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
+                const state = toolSpecificData.terminalCommandState ?? {};
+                state.timestamp = state.timestamp ?? timingStart;
+                toolSpecificData.terminalCommandState = state;
                 let resultText = (didUserEditCommand
                     ? `Note: The user manually edited the command to \`${command}\`, and that command is now running in terminal with ID=${termId}`
                     : didToolEditCommand
@@ -514,12 +547,23 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                         outputMonitor = store.add(this._instantiationService.createInstance(OutputMonitor, { instance: toolTerminal.instance, sessionId: invocation.context?.sessionId, getOutput: (marker) => getOutput(toolTerminal.instance, marker ?? startMarker) }, undefined, invocation.context, token, command));
                     }
                 }));
-                const commandId = toolSpecificData.terminalCommandId;
                 const executeResult = await strategy.execute(command, token, commandId);
                 toolTerminal.receivedUserInput = false;
                 if (token.isCancellationRequested) {
                     throw ( new CancellationError());
                 }
+                await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
+                {
+                    const state = toolSpecificData.terminalCommandState ?? {};
+                    state.timestamp = state.timestamp ?? timingStart;
+                    if (executeResult.exitCode !== undefined) {
+                        state.exitCode = executeResult.exitCode;
+                        if (state.timestamp !== undefined) {
+                            state.duration = state.duration ?? Math.max(0, Date.now() - state.timestamp);
+                        }
+                    }
+                    toolSpecificData.terminalCommandState = state;
+                }
                 this._logService.debug(`RunInTerminalTool: Finished \`${strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
                 outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output.trim(), '\n') + 1;
                 exitCode = executeResult.exitCode;
@@ -588,8 +632,9 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             };
         }
     }
-    _handleTerminalVisibility(toolTerminal) {
-        if (this._configurationService.getValue(TerminalChatAgentToolsSettingId.OutputLocation) === 'terminal') {
+    _handleTerminalVisibility(toolTerminal, chatSessionId) {
+        const chatSessionOpenInWidget = !!this._chatWidgetService.getWidgetBySessionResource(LocalChatSessionUri.forSession(chatSessionId));
+        if (this._configurationService.getValue(TerminalChatAgentToolsSettingId.OutputLocation) === 'terminal' && chatSessionOpenInWidget) {
             this._terminalService.setActiveInstance(toolTerminal.instance);
             this._terminalService.revealTerminal(toolTerminal.instance, true);
         }
@@ -678,7 +723,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 terminal.processReady.then(() => terminal.processId),
                 timeout(5000).then(() => { throw ( new Error('Timeout')); })
             ]);
-            if (typeof pid === 'number') {
+            if (isNumber(pid)) {
                 const storedAssociations = this._storageService.get(TerminalToolStorageKeysInternal.TerminalSession, StorageScope.WORKSPACE, '{}');
                 const associations = JSON.parse(storedAssociations);
                 const existingAssociation = associations[pid] || {};
@@ -741,7 +786,8 @@ RunInTerminalTool = RunInTerminalTool_1 = ( __decorate([
     ( __param(7, ITerminalChatService)),
     ( __param(8, ITerminalLogService)),
     ( __param(9, ITerminalService)),
-    ( __param(10, IWorkspaceContextService))
+    ( __param(10, IWorkspaceContextService)),
+    ( __param(11, IChatWidgetService))
 ], RunInTerminalTool));
 class BackgroundTerminalExecution extends Disposable {
     constructor(instance, _xterm, _commandLine, sessionId, commandId) {
@@ -810,7 +856,7 @@ let TerminalProfileFetcher = class TerminalProfileFetcher {
         if (profile === null || profile === undefined || typeof profile !== 'object') {
             return false;
         }
-        if ('path' in profile && typeof profile.path === 'string') {
+        if ('path' in profile && isString(profile.path)) {
             return true;
         }
         return false;

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

@@ -7,7 +7,7 @@ import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { TaskRunSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { resolveDependencyTasks, collectTerminalResults } from '../../taskHelpers.js';
+import { resolveDependencyTasks, collectTerminalResults, tasksMatch } 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';
@@ -57,7 +57,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(11894, 'Resolving the task')))) });
+        _progress.report({ message: ( new MarkdownString(( localize(12035, 'Resolving the task')))) });
         let task;
         const start = Date.now();
         while (Date.now() - start < 5000 && !token.isCancellationRequested) {
@@ -68,9 +68,9 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
             await timeout(100);
         }
         if (!task) {
-            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(11895, 'Task not found: `{0}`', args.task.label)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(12036, 'Task not found: `{0}`', args.task.label)))) };
         }
-        _progress.report({ message: ( new MarkdownString(( localize(11896, 'Running task `{0}`', args.task.label)))) });
+        _progress.report({ message: ( new MarkdownString(( localize(12037, '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);
@@ -78,13 +78,13 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         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(
-                11897,
+                12038,
                 'Task started but no terminal was found for: `{0}`',
                 args.task.label
             )))) };
         }
         const store = ( new DisposableStore());
-        const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, (terminalTask) => this._isTaskActive(terminalTask), dependencyTasks);
+        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', {
@@ -110,8 +110,8 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         };
     }
     async _isTaskActive(task) {
-        const activeTasks = await this._tasksService.getActiveTasks();
-        return activeTasks?.some((t) => t._id === task._id);
+        const busyTasks = await this._tasksService.getBusyTasks();
+        return busyTasks?.some(t => tasksMatch(t, task)) ?? false;
     }
     async prepareToolInvocation(context, token) {
         const args = context.parameters;
@@ -119,26 +119,26 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         const allTasks = await this._tasksService.tasks();
         if (allTasks?.find(t => t._label === task.label)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(11898, 'Task `{0}` already exists.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11899, 'Task `{0}` already exists.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(12039, 'Task `{0}` already exists.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(12040, '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(11900, 'Task \`{0}\` is already running.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11900, 'Task \`{0}\` is already running.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(12041, 'Task \`{0}\` is already running.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(12041, 'Task \`{0}\` is already running.', task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11901, 'Created task \`{0}\`', task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(11902, 'Created task \`{0}\`', task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(12042, 'Created task \`{0}\`', task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(12043, 'Created task \`{0}\`', task.label)))),
             confirmationMessages: {
-                title: ( localize(11903, 'Allow task creation and execution?')),
+                title: ( localize(12044, 'Allow task creation and execution?')),
                 message: ( new MarkdownString(( localize(
-                    11904,
+                    12045,
                     'A task \`{0}\` with command \`{1}\`{2} will be created.',
                     task.label,
                     task.command,
@@ -159,12 +159,10 @@ CreateAndRunTaskTool = ( __decorate([
 const CreateAndRunTaskToolData = {
     id: 'create_and_run_task',
     toolReferenceName: 'createAndRunTask',
-    displayName: ( localize(11905, 'Create and run Task')),
-    modelDescription: ( localize(
-        11906,
-        '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(11907, "Create and run a task in the workspace")),
+    legacyToolReferenceFullNames: ['runTasks/createAndRunTask'],
+    displayName: ( localize(12046, '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(12047, "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

@@ -7,16 +7,17 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 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 { TasksAvailableContext } from '@codingame/monaco-vscode-api/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 { getTaskDefinition, getTaskForTool, resolveDependencyTasks, collectTerminalResults, tasksMatch } from '../../taskHelpers.js';
 import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './taskHelpers.js';
 
 const GetTaskOutputToolData = {
     id: 'get_task_output',
     toolReferenceName: 'getTaskOutput',
-    displayName: ( localize(11908, 'Get Task Output')),
+    legacyToolReferenceFullNames: ['runTasks/getTaskOutput'],
+    displayName: ( localize(12048, 'Get Task Output')),
     modelDescription: 'Get the output of a task',
     source: ToolDataSource.Internal,
     when: TasksAvailableContext,
@@ -52,16 +53,16 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
         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(11909, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12049, '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(11910, 'The task `{0}` is already running.', taskLabel)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12050, 'The task `{0}` is already running.', taskLabel)))) };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11911, 'Checking output for task `{0}`', taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(11912, 'Checked output for task `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(12051, 'Checking output for task `{0}`', taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(12052, 'Checked output for task `{0}`', taskLabel)))),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -69,17 +70,17 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
         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(11909, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(12049, '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(11913, 'Terminal not found for task `{0}`', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(12053, 'Terminal not found for task `{0}`', taskLabel)))) };
         }
         const store = ( new DisposableStore());
-        const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, (terminalTask) => this._isTaskActive(terminalTask), dependencyTasks);
+        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', {
@@ -105,8 +106,8 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
         };
     }
     async _isTaskActive(task) {
-        const activeTasks = await this._tasksService.getActiveTasks();
-        return activeTasks?.some((t) => t._id === task._id);
+        const busyTasks = await this._tasksService.getBusyTasks();
+        return busyTasks?.some(t => tasksMatch(t, task)) ?? false;
     }
 };
 GetTaskOutputTool = ( __decorate([

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

@@ -4,11 +4,11 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 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 { 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 { TasksAvailableContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService';
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { TaskRunSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { getTaskDefinition, getTaskForTool, resolveDependencyTasks, collectTerminalResults } from '../../taskHelpers.js';
+import { getTaskDefinition, getTaskForTool, resolveDependencyTasks, collectTerminalResults, tasksMatch } 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';
@@ -32,26 +32,26 @@ let RunTaskTool = class RunTaskTool {
         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(11914, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(12054, '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(11915, 'The task `{0}` is already running.', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: ( new MarkdownString(( localize(12055, '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(11916, 'Task started but no terminal was found for: `{0}`', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(12056, '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(11916, 'Task started but no terminal was found for: `{0}`', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(12056, 'Task started but no terminal was found for: `{0}`', taskLabel)))) };
         }
         const store = ( new DisposableStore());
-        const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, (terminalTask) => this._isTaskActive(terminalTask), dependencyTasks);
+        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', {
@@ -77,35 +77,35 @@ let RunTaskTool = class RunTaskTool {
         };
     }
     async _isTaskActive(task) {
-        const activeTasks = await this._tasksService.getActiveTasks();
-        return Promise.resolve(activeTasks?.some((t) => t._id === task._id));
+        const busyTasks = await this._tasksService.getBusyTasks();
+        return busyTasks?.some(t => tasksMatch(t, task)) ?? false;
     }
     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(11914, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12054, '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(11917, 'The task is already running.')))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12057, 'The task is already running.')))) };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(11918, '`{0}` is already running.', taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11919, '`{0}` was already running.', taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(12058, '`{0}` is already running.', taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(12059, '`{0}` was already running.', taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11920, 'Running `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(12060, 'Running `{0}`', taskLabel)))),
             pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground
-                ? ( localize(11921, 'Started `{0}`', taskLabel))
-                : ( localize(11922, 'Ran `{0}`', taskLabel)))),
+                ? ( localize(12061, 'Started `{0}`', taskLabel))
+                : ( localize(12062, 'Ran `{0}`', taskLabel)))),
             confirmationMessages: task
-                ? { title: ( localize(11923, 'Allow task run?')), message: ( localize(11924, 'Allow to run the task `{0}`?', taskLabel)) }
+                ? { title: ( localize(12063, 'Allow task run?')), message: ( localize(12064, 'Allow to run the task `{0}`?', taskLabel)) }
                 : undefined
         };
     }
@@ -120,9 +120,10 @@ RunTaskTool = ( __decorate([
 const RunTaskToolData = {
     id: 'run_task',
     toolReferenceName: 'runTask',
-    displayName: ( localize(11925, 'Run Task')),
+    legacyToolReferenceFullNames: ['runTasks/runTask'],
+    displayName: ( localize(12065, '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(11926, 'Tool for running tasks in the workspace')),
+    userDescription: ( localize(12066, '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.d.ts

@@ -1,7 +1,7 @@
 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 { ITaskSummary } from "@codingame/monaco-vscode-api/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: {

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

@@ -17,7 +17,7 @@ function toolResultDetailsFromResponse(terminalResults) {
 function toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, getOutputTool) {
     let resultSummary = '';
     if (result?.exitCode) {
-        resultSummary = ( localize(11927, 'Task `{0}` failed with exit code {1}.', taskLabel, result.exitCode));
+        resultSummary = ( localize(12067, 'Task `{0}` failed with exit code {1}.', taskLabel, result.exitCode));
     }
     else {
         resultSummary += `\`${taskLabel}\` task `;

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

@@ -0,0 +1,12 @@
+import { IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
+export declare class TerminalCommandArtifactCollector {
+    private readonly _logService;
+    constructor(_logService: ITerminalLogService);
+    capture(toolSpecificData: IChatTerminalToolInvocationData, instance: ITerminalInstance, commandId: string | undefined): Promise<void>;
+    private _captureCommandOutput;
+    private _applyTheme;
+    private _createTerminalCommandUri;
+    private _tryGetCommand;
+}