@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.1

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -18,10 +19,10 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 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-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 { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/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-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
@@ -38,8 +39,9 @@ import { CommandLineAutoApproveAnalyzer } from './commandLineAnalyzer/commandLin
 import { CommandLineFileWriteAnalyzer } from './commandLineAnalyzer/commandLineFileWriteAnalyzer.js';
 import { OutputMonitor } from './monitoring/outputMonitor.js';
 import { OutputMonitorState } from './monitoring/types.js';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { CommandLineCdPrefixRewriter } from './commandLineRewriter/commandLineCdPrefixRewriter.js';
+import { CommandLinePreventHistoryRewriter } from './commandLineRewriter/commandLinePreventHistoryRewriter.js';
 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';
@@ -47,6 +49,7 @@ import { TerminalCommandArtifactCollector } from './terminalCommandArtifactColle
 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';
+import { TerminalChatCommandId } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 
 var RunInTerminalTool_1;
 const TOOL_REFERENCE_NAME = 'runInTerminal';
@@ -88,7 +91,8 @@ function createPowerShellModelDescription(shell) {
         '- Prefer PowerShell cmdlets over external commands when available',
         '- Prefer idiomatic PowerShell like Get-ChildItem instead of dir or ls for file listings',
         '- Use Test-Path to check file/directory existence',
-        '- Be specific with Select-Object properties to avoid excessive output'
+        '- Be specific with Select-Object properties to avoid excessive output',
+        '- Avoid printing credentials unless absolutely required',
     ].join('\n');
 }
 const genericDescription = `
@@ -121,7 +125,8 @@ Output Management:
 Best Practices:
 - Quote variables: "$var" instead of $var to handle spaces
 - Use find with -exec or xargs for file operations
-- Be specific with commands to avoid excessive output`;
+- Be specific with commands to avoid excessive output
+- Avoid printing credentials unless absolutely required`;
 function createBashModelDescription() {
     return [
         'This tool allows you to execute shell commands in a persistent bash terminal session, preserving environment variables, working directory, and other context across multiple commands.',
@@ -178,9 +183,9 @@ async function createRunInTerminalToolData(accessor) {
         id: 'run_in_terminal',
         toolReferenceName: TOOL_REFERENCE_NAME,
         legacyToolReferenceFullNames: LEGACY_TOOL_REFERENCE_FULL_NAMES,
-        displayName: ( localize(12031, 'Run in Terminal')),
+        displayName: ( localize(12057, 'Run in Terminal')),
         modelDescription,
-        userDescription: ( localize(12032, 'Run commands in the terminal')),
+        userDescription: ( localize(12058, 'Run commands in the terminal')),
         source: ToolDataSource.Internal,
         icon: Codicon.terminal,
         inputSchema: {
@@ -215,6 +220,7 @@ const telemetryIgnoredSequences = [
     '\x1b[I',
     '\x1b[O',
 ];
+const altBufferMessage = ( localize(12059, "The command opened the alternate buffer."));
 let RunInTerminalTool = class RunInTerminalTool extends Disposable {
     static { RunInTerminalTool_1 = this; }
     static { this._backgroundExecutions = ( new Map()); }
@@ -249,6 +255,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         this._commandLineRewriters = [
             this._register(this._instantiationService.createInstance(CommandLineCdPrefixRewriter)),
             this._register(this._instantiationService.createInstance(CommandLinePwshChainOperatorRewriter, this._treeSitterCommandParser)),
+            this._register(this._instantiationService.createInstance(CommandLinePreventHistoryRewriter)),
         ];
         this._commandLineAnalyzers = [
             this._register(this._instantiationService.createInstance(CommandLineFileWriteAnalyzer, this._treeSitterCommandParser, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineFileWriteAnalyzer: ${message}`, args))),
@@ -270,9 +277,11 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             }
         }));
         this._register(this._chatService.onDidDisposeSession(e => {
-            const localSessionId = LocalChatSessionUri.parseLocalSessionId(e.sessionResource);
-            if (localSessionId) {
-                this._cleanupSessionTerminals(localSessionId);
+            for (const resource of e.sessionResource) {
+                const localSessionId = LocalChatSessionUri.parseLocalSessionId(resource);
+                if (localSessionId) {
+                    this._cleanupSessionTerminals(localSessionId);
+                }
             }
         }));
     }
@@ -355,13 +364,15 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             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);
+        const disclaimersRaw = ( commandLineAnalyzerResults.map(e => e.disclaimers)).filter(e => !!e).flatMap(e => e);
         let disclaimer;
         if (disclaimersRaw.length > 0) {
-            disclaimer = ( new MarkdownString(
-                `$(${Codicon.info.id}) ` + disclaimersRaw.join(' '),
-                { supportThemeIcons: true }
-            ));
+            const disclaimerTexts = ( disclaimersRaw.map(d => typeof d === 'string' ? d : d.value));
+            const hasMarkdownDisclaimer = ( disclaimersRaw.some(d => typeof d !== 'string'));
+            const mdOptions = hasMarkdownDisclaimer
+                ? { supportThemeIcons: true, isTrusted: { enabledCommands: [TerminalChatCommandId.OpenTerminalSettingsLink] } }
+                : { supportThemeIcons: true };
+            disclaimer = ( new MarkdownString(`$(${Codicon.info.id}) ` + disclaimerTexts.join(' '), mdOptions));
         }
         const analyzersIsAutoApproveAllowed = commandLineAnalyzerResults.every(e => e.isAutoApproveAllowed);
         const customActions = isEligibleForAutoApproval() && analyzersIsAutoApproveAllowed ? ( commandLineAnalyzerResults.map(e => e.customActions ?? [])).flat() : undefined;
@@ -369,19 +380,20 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         if (shellType === 'powershell') {
             shellType = 'pwsh';
         }
-        const isFinalAutoApproved = (
-        (isAutoApproveAllowed &&
-            (
-            commandLineAnalyzerResults.some(e => e.isAutoApproved)) &&
+        const wouldBeAutoApproved = (
+        (( commandLineAnalyzerResults.some(e => e.isAutoApproved)) &&
             commandLineAnalyzerResults.every(e => e.isAutoApproved !== false) &&
         analyzersIsAutoApproveAllowed));
-        if (isFinalAutoApproved) {
+        const isFinalAutoApproved = (
+        (isAutoApproveAllowed &&
+        wouldBeAutoApproved));
+        if (isFinalAutoApproved || (isAutoApproveEnabled && ( commandLineAnalyzerResults.some(e => e.autoApproveInfo)))) {
             toolSpecificData.autoApproveInfo = commandLineAnalyzerResults.find(e => e.autoApproveInfo)?.autoApproveInfo;
         }
         const confirmationMessages = isFinalAutoApproved ? undefined : {
             title: args.isBackground
-                ? ( localize(12033, "Run `{0}` command? (background terminal)", shellType))
-                : ( localize(12034, "Run `{0}` command?", shellType)),
+                ? ( localize(12060, "Run `{0}` command? (background terminal)", shellType))
+                : ( localize(12061, "Run `{0}` command?", shellType)),
             message: ( new MarkdownString(args.explanation)),
             disclaimer,
             terminalCustomActions: customActions,
@@ -524,6 +536,8 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             let terminalResult = '';
             let outputLineCount = -1;
             let exitCode;
+            let altBufferResult;
+            const executeCancellation = store.add(( new CancellationTokenSource(token)));
             try {
                 let strategy;
                 switch (toolTerminal.shellIntegrationQuality) {
@@ -547,35 +561,55 @@ 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 executeResult = await strategy.execute(command, token, commandId);
+                const executeResult = await strategy.execute(command, executeCancellation.token, commandId);
                 toolTerminal.receivedUserInput = false;
                 if (token.isCancellationRequested) {
                     throw ( new CancellationError());
                 }
-                await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
-                {
+                if (executeResult.didEnterAltBuffer) {
                     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;
+                    toolResultMessage = altBufferMessage;
+                    outputLineCount = 0;
+                    error = executeResult.error ?? 'alternateBuffer';
+                    altBufferResult = {
+                        toolResultMessage,
+                        toolMetadata: {
+                            exitCode: undefined
+                        },
+                        content: [{
+                                kind: 'text',
+                                value: altBufferMessage,
+                            }]
+                    };
                 }
-                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;
-                error = executeResult.error;
-                const resultArr = [];
-                if (executeResult.output !== undefined) {
-                    resultArr.push(executeResult.output);
-                }
-                if (executeResult.additionalInformation) {
-                    resultArr.push(executeResult.additionalInformation);
+                else {
+                    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;
+                    error = executeResult.error;
+                    const resultArr = [];
+                    if (executeResult.output !== undefined) {
+                        resultArr.push(executeResult.output);
+                    }
+                    if (executeResult.additionalInformation) {
+                        resultArr.push(executeResult.additionalInformation);
+                    }
+                    terminalResult = resultArr.join('\n\n');
                 }
-                terminalResult = resultArr.join('\n\n');
             }
             catch (e) {
                 this._logService.debug(`RunInTerminalTool: Threw exception`);
@@ -612,6 +646,9 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                     inputToolFreeFormInputShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputShownCount
                 });
             }
+            if (altBufferResult) {
+                return altBufferResult;
+            }
             const resultText = [];
             if (didUserEditCommand) {
                 resultText.push(`Note: The user manually edited the command to \`${command}\`, and this is the output of running that command instead:\n`);
@@ -642,7 +679,8 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
     async _initBackgroundTerminal(chatSessionId, termId, terminalToolSessionId, token) {
         this._logService.debug(`RunInTerminalTool: Creating background terminal with ID=${termId}`);
         const profile = await this._profileFetcher.getCopilotProfile();
-        const toolTerminal = await this._terminalToolCreator.createTerminal(profile, token);
+        const os = await this._osBackend;
+        const toolTerminal = await this._terminalToolCreator.createTerminal(profile, os, token);
         this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, toolTerminal.instance);
         this._terminalChatService.registerTerminalInstanceWithChatSession(chatSessionId, toolTerminal.instance);
         this._registerInputListener(toolTerminal);
@@ -663,7 +701,8 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             return cachedTerminal;
         }
         const profile = await this._profileFetcher.getCopilotProfile();
-        const toolTerminal = await this._terminalToolCreator.createTerminal(profile, token);
+        const os = await this._osBackend;
+        const toolTerminal = await this._terminalToolCreator.createTerminal(profile, os, token);
         this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, toolTerminal.instance);
         this._terminalChatService.registerTerminalInstanceWithChatSession(chatSessionId, toolTerminal.instance);
         this._registerInputListener(toolTerminal);

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

@@ -1,6 +1,6 @@
 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 { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/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";

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

@@ -3,7 +3,7 @@ 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 { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 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';
@@ -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(12035, 'Resolving the task')))) });
+        _progress.report({ message: ( new MarkdownString(( localize(12062, '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(12036, 'Task not found: `{0}`', args.task.label)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(12063, 'Task not found: `{0}`', args.task.label)))) };
         }
-        _progress.report({ message: ( new MarkdownString(( localize(12037, 'Running task `{0}`', args.task.label)))) });
+        _progress.report({ message: ( new MarkdownString(( localize(12064, '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,7 +78,7 @@ 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(
-                12038,
+                12065,
                 'Task started but no terminal was found for: `{0}`',
                 args.task.label
             )))) };
@@ -102,7 +102,7 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         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);
+        const toolResultMessage = toolResultMessageFromResponse(result, args.task.label, toolResultDetails, terminalResults, undefined, task.configurationProperties.isBackground);
         return {
             content: [{ kind: 'text', value: uniqueDetails }],
             toolResultMessage,
@@ -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(12039, 'Task `{0}` already exists.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(12040, 'Task `{0}` already exists.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(12066, 'Task `{0}` already exists.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(12067, '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(12041, 'Task \`{0}\` is already running.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(12041, 'Task \`{0}\` is already running.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(12068, 'Task \`{0}\` is already running.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(12068, 'Task \`{0}\` is already running.', task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(12042, 'Created task \`{0}\`', task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(12043, 'Created task \`{0}\`', task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(12069, 'Created task \`{0}\`', task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(12070, 'Created task \`{0}\`', task.label)))),
             confirmationMessages: {
-                title: ( localize(12044, 'Allow task creation and execution?')),
+                title: ( localize(12071, 'Allow task creation and execution?')),
                 message: ( new MarkdownString(( localize(
-                    12045,
+                    12072,
                     'A task \`{0}\` with command \`{1}\`{2} will be created.',
                     task.label,
                     task.command,
@@ -160,9 +160,9 @@ const CreateAndRunTaskToolData = {
     id: 'create_and_run_task',
     toolReferenceName: 'createAndRunTask',
     legacyToolReferenceFullNames: ['runTasks/createAndRunTask'],
-    displayName: ( localize(12046, 'Create and run Task')),
+    displayName: ( localize(12073, '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")),
+    userDescription: ( localize(12074, "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.d.ts

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { 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/tools/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";
 export declare const GetTaskOutputToolData: IToolData;

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

@@ -6,7 +6,7 @@ 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 { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 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';
@@ -17,7 +17,7 @@ const GetTaskOutputToolData = {
     id: 'get_task_output',
     toolReferenceName: 'getTaskOutput',
     legacyToolReferenceFullNames: ['runTasks/getTaskOutput'],
-    displayName: ( localize(12048, 'Get Task Output')),
+    displayName: ( localize(12075, 'Get Task Output')),
     modelDescription: 'Get the output of a task',
     source: ToolDataSource.Internal,
     when: TasksAvailableContext,
@@ -53,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(12049, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12076, '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(12050, 'The task `{0}` is already running.', taskLabel)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12077, 'The task `{0}` is already running.', taskLabel)))) };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(12051, 'Checking output for task `{0}`', taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(12052, 'Checked output for task `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(12078, 'Checking output for task `{0}`', taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(12079, 'Checked output for task `{0}`', taskLabel)))),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -70,14 +70,14 @@ 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(12049, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(12076, '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(12053, 'Terminal not found for task `{0}`', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(12080, '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, this._tasksService);
@@ -98,7 +98,7 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
         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);
+        const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults, true, task.configurationProperties.isBackground);
         return {
             content: [{ kind: 'text', value: uniqueDetails }],
             toolResultMessage,

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

@@ -1,6 +1,6 @@
 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 { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/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";

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

@@ -3,7 +3,7 @@ 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 { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 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';
@@ -32,23 +32,23 @@ 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(12054, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(12081, '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(12055, 'The task `{0}` is already running.', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: ( new MarkdownString(( localize(12082, '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(12056, '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(12083, '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(12056, '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(12083, '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, this._tasksService);
@@ -69,7 +69,7 @@ let RunTaskTool = class RunTaskTool {
         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);
+        const toolResultMessage = toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, undefined, task.configurationProperties.isBackground);
         return {
             content: [{ kind: 'text', value: uniqueDetails }],
             toolResultMessage,
@@ -85,27 +85,27 @@ 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 { invocationMessage: ( new MarkdownString(( localize(12054, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12081, '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(12057, 'The task is already running.')))) };
+            return { invocationMessage: ( new MarkdownString(( localize(12084, 'The task is already running.')))) };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(12058, '`{0}` is already running.', taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(12059, '`{0}` was already running.', taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(12085, '`{0}` is already running.', taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(12086, '`{0}` was already running.', taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(12060, 'Running `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(12087, 'Running `{0}`', taskLabel)))),
             pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground
-                ? ( localize(12061, 'Started `{0}`', taskLabel))
-                : ( localize(12062, 'Ran `{0}`', taskLabel)))),
+                ? ( localize(12088, 'Started `{0}`', taskLabel))
+                : ( localize(12089, 'Ran `{0}`', taskLabel)))),
             confirmationMessages: task
-                ? { title: ( localize(12063, 'Allow task run?')), message: ( localize(12064, 'Allow to run the task `{0}`?', taskLabel)) }
+                ? { title: ( localize(12090, 'Allow task run?')), message: ( localize(12091, 'Allow to run the task `{0}`?', taskLabel)) }
                 : undefined
         };
     }
@@ -121,9 +121,9 @@ const RunTaskToolData = {
     id: 'run_task',
     toolReferenceName: 'runTask',
     legacyToolReferenceFullNames: ['runTasks/runTask'],
-    displayName: ( localize(12065, 'Run Task')),
+    displayName: ( localize(12092, '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(12066, 'Run tasks in the workspace')),
+    userDescription: ( localize(12093, '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

@@ -12,7 +12,7 @@ export declare function toolResultMessageFromResponse(result: ITaskSummary | und
     output: string;
     resources?: ILinkLocation[];
     state: OutputMonitorState;
-}[], getOutputTool?: boolean): MarkdownString;
+}[], getOutputTool?: boolean, isBackground?: boolean): MarkdownString;
 export interface ILinkLocation {
     uri: URI;
     range?: Range;

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

@@ -14,10 +14,10 @@ function toolResultDetailsFromResponse(terminalResults) {
         return [key, item];
     }) ?? []))).values()));
 }
-function toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, getOutputTool) {
+function toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, getOutputTool, isBackground) {
     let resultSummary = '';
     if (result?.exitCode) {
-        resultSummary = ( localize(12067, 'Task `{0}` failed with exit code {1}.', taskLabel, result.exitCode));
+        resultSummary = ( localize(12094, 'Task `{0}` failed with exit code {1}.', taskLabel, result.exitCode));
     }
     else {
         resultSummary += `\`${taskLabel}\` task `;
@@ -33,9 +33,13 @@ function toolResultMessageFromResponse(result, taskLabel, toolResultDetails, ter
                 ? (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');
+                : (isBackground
+                    ? (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')
+                    : (problemCount
+                        ? `started with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
+                        : 'started'));
         }
     }
     return ( new MarkdownString(resultSummary));

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

@@ -1,4 +1,4 @@
-import { IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/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 {