@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -4,7 +4,8 @@ import { asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arra
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 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 { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { MarkdownString, createCommandUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { OS, OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -18,7 +19,10 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/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-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
+import { openTerminalSettingsLinkCommandId } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 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 { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
@@ -30,16 +34,13 @@ import { CommandSimplifier } from '../commandSimplifier.js';
 import { BasicExecuteStrategy } from '../executeStrategy/basicExecuteStrategy.js';
 import { NoneExecuteStrategy } from '../executeStrategy/noneExecuteStrategy.js';
 import { RichExecuteStrategy } from '../executeStrategy/richExecuteStrategy.js';
-import { OutputMonitor } from './monitoring/outputMonitor.js';
-import { isPowerShell, generateAutoApproveActions } from '../runInTerminalHelpers.js';
+import { getOutput } from '../outputHelpers.js';
+import { isPowerShell, generateAutoApproveActions, dedupeRules } from '../runInTerminalHelpers.js';
 import { RunInTerminalToolTelemetry } from '../runInTerminalToolTelemetry.js';
 import { splitCommandLineIntoSubCommands } from '../subCommands.js';
 import { ToolTerminalCreator, ShellIntegrationQuality } from '../toolTerminalCreator.js';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
+import { OutputMonitor } from './monitoring/outputMonitor.js';
 import { OutputMonitorState } from './monitoring/types.js';
-import { getOutput } from '../outputHelpers.js';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 var RunInTerminalTool_1;
 var TerminalToolStorageKeysInternal;
@@ -49,7 +50,7 @@ var TerminalToolStorageKeysInternal;
 const RunInTerminalToolData = {
     id: 'run_in_terminal',
     toolReferenceName: 'runInTerminal',
-    displayName: ( localize(11464, 'Run in Terminal')),
+    displayName: ( localize(11567, 'Run in Terminal')),
     modelDescription: [
         'This tool allows you to execute shell commands in a persistent terminal session, preserving environment variables, working directory, and other context across multiple commands.',
         '',
@@ -77,7 +78,7 @@ const RunInTerminalToolData = {
         '- Use targeted queries instead of broad scans',
         '- Consider using \'wc -l\' to count before listing many items'
     ].join('\n'),
-    userDescription: ( localize(11465, 'Tool for running commands in the terminal')),
+    userDescription: ( localize(11568, 'Tool for running commands in the terminal')),
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
     inputSchema: {
@@ -252,7 +253,7 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             if (!isAutoApproved && (( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLower.includes(command))) ||
                 (isPowerShell(shell, os) && ( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLowerPwshOnly.includes(command)))))) {
                 disclaimer = ( new MarkdownString(`$(${Codicon.info.id}) ` + ( localize(
-                    11466,
+                    11569,
                     'Web content may contain malicious code or attempt prompt injection attacks.'
                 )), { supportThemeIcons: true }));
             }
@@ -266,8 +267,8 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             }
             confirmationMessages = (isAutoApproved && isAutoApproveAllowed) ? undefined : {
                 title: args.isBackground
-                    ? ( localize(11467, "Run `{0}` command? (background terminal)", shellType))
-                    : ( localize(11468, "Run `{0}` command?", shellType)),
+                    ? ( localize(11570, "Run `{0}` command? (background terminal)", shellType))
+                    : ( localize(11571, "Run `{0}` command?", shellType)),
                 message: ( new MarkdownString(args.explanation)),
                 disclaimer,
                 terminalCustomActions: customActions,
@@ -363,12 +364,12 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 else if (pollingResult) {
                     resultText += `\n\ The command is still running, with output:\n${pollingResult.output}`;
                 }
-                let toolResultMessage;
-                if (toolSpecificData.autoApproveInfo) {
-                    toolResultMessage = toolSpecificData.autoApproveInfo.value;
-                }
+                const toolResultMessage = toolSpecificData.autoApproveInfo;
                 return {
-                    toolResultMessage: toolResultMessage ? ( new MarkdownString(toolResultMessage)) : undefined,
+                    toolResultMessage: toolResultMessage,
+                    toolMetadata: {
+                        exitCode: undefined
+                    },
                     content: [{
                             kind: 'text',
                             value: resultText,
@@ -406,6 +407,11 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                     inputToolManualAcceptCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualAcceptCount,
                     inputToolManualRejectCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualRejectCount,
                     inputToolManualChars: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualChars,
+                    inputToolAutoAcceptCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolAutoAcceptCount,
+                    inputToolAutoChars: outputMonitor?.outputMonitorTelemetryCounters.inputToolAutoChars,
+                    inputToolManualShownCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualShownCount,
+                    inputToolFreeFormInputCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolFreeFormInputCount,
+                    inputToolFreeFormInputShownCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount
                 });
             }
         }
@@ -433,7 +439,9 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 }
                 this._logService.debug(`RunInTerminalTool: Using \`${strategy.type}\` execute strategy for command \`${command}\``);
                 store.add(strategy.onDidCreateStartMarker(startMarker => {
-                    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));
+                    if (!outputMonitor) {
+                        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);
                 toolTerminal.receivedUserInput = false;
@@ -481,6 +489,11 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                     inputToolManualAcceptCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualAcceptCount,
                     inputToolManualRejectCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualRejectCount,
                     inputToolManualChars: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualChars,
+                    inputToolAutoAcceptCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolAutoAcceptCount,
+                    inputToolAutoChars: outputMonitor?.outputMonitorTelemetryCounters?.inputToolAutoChars,
+                    inputToolManualShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualShownCount,
+                    inputToolFreeFormInputCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputCount,
+                    inputToolFreeFormInputShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputShownCount
                 });
             }
             const resultText = [];
@@ -491,16 +504,23 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 resultText.push(`Note: The tool simplified the command to \`${command}\`, and this is the output of running that command instead:\n`);
             }
             resultText.push(terminalResult);
+            let resolvedToolResultMessage;
             if (toolSpecificData.autoApproveInfo) {
                 if (toolResultMessage) {
-                    toolResultMessage = `${toolSpecificData.autoApproveInfo.value}\n\n${toolResultMessage}`;
+                    resolvedToolResultMessage = ( new MarkdownString(
+                        `${toolSpecificData.autoApproveInfo.value}\n\n${toolResultMessage}`,
+                        toolSpecificData.autoApproveInfo
+                    ));
                 }
                 else {
-                    toolResultMessage = toolSpecificData.autoApproveInfo.value;
+                    resolvedToolResultMessage = toolSpecificData.autoApproveInfo;
                 }
             }
             return {
-                toolResultMessage: toolResultMessage ? ( new MarkdownString(toolResultMessage)) : undefined,
+                toolResultMessage: resolvedToolResultMessage,
+                toolMetadata: {
+                    exitCode: exitCode
+                },
                 content: [{
                         kind: 'text',
                         value: resultText.join(''),
@@ -508,9 +528,14 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             };
         }
     }
-    async _getCopilotShell() {
+    async _getCopilotShellOrProfile() {
+        const os = await this._osBackend;
+        const customChatAgentProfile = this._getChatTerminalProfile(os);
+        if (customChatAgentProfile) {
+            return customChatAgentProfile;
+        }
         const defaultShell = await this._terminalProfileResolverService.getDefaultShell({
-            os: await this._osBackend,
+            os,
             remoteAuthority: this._remoteAgentService.getConnection()?.remoteAuthority
         });
         if (basename(defaultShell) === 'cmd.exe') {
@@ -518,10 +543,46 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         }
         return defaultShell;
     }
+    async _getCopilotShell() {
+        const shellOrProfile = await this._getCopilotShellOrProfile();
+        if (typeof shellOrProfile === 'string') {
+            return shellOrProfile;
+        }
+        return shellOrProfile.path;
+    }
+    _getChatTerminalProfile(os) {
+        let profileSetting;
+        switch (os) {
+            case OperatingSystem.Windows:
+                profileSetting = TerminalChatAgentToolsSettingId.TerminalProfileWindows;
+                break;
+            case OperatingSystem.Macintosh:
+                profileSetting = TerminalChatAgentToolsSettingId.TerminalProfileMacOs;
+                break;
+            case OperatingSystem.Linux:
+            default:
+                profileSetting = TerminalChatAgentToolsSettingId.TerminalProfileLinux;
+                break;
+        }
+        const profile = this._configurationService.getValue(profileSetting);
+        if (this._isValidChatAgentTerminalProfile(profile)) {
+            return profile;
+        }
+        return undefined;
+    }
+    _isValidChatAgentTerminalProfile(profile) {
+        if (profile === null || profile === undefined || typeof profile !== 'object') {
+            return false;
+        }
+        if ('path' in profile && typeof profile.path === 'string') {
+            return true;
+        }
+        return false;
+    }
     async _initBackgroundTerminal(chatSessionId, termId, token) {
         this._logService.debug(`RunInTerminalTool: Creating background terminal with ID=${termId}`);
-        const shell = await this._getCopilotShell();
-        const toolTerminal = await this._terminalToolCreator.createTerminal(shell, token);
+        const shellOrProfile = await this._getCopilotShellOrProfile();
+        const toolTerminal = await this._terminalToolCreator.createTerminal(shellOrProfile, token);
         this._registerInputListener(toolTerminal);
         this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
         if (token.isCancellationRequested) {
@@ -538,8 +599,8 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
             this._terminalToolCreator.refreshShellIntegrationQuality(cachedTerminal);
             return cachedTerminal;
         }
-        const shell = await this._getCopilotShell();
-        const toolTerminal = await this._terminalToolCreator.createTerminal(shell, token);
+        const shellOrProfile = await this._getCopilotShellOrProfile();
+        const toolTerminal = await this._terminalToolCreator.createTerminal(shellOrProfile, token);
         this._registerInputListener(toolTerminal);
         this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
         if (token.isCancellationRequested) {
@@ -648,40 +709,50 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
         }
     }
     _createAutoApproveInfo(isAutoApproved, isDenied, autoApproveReason, subCommandResults, commandLineResult) {
-        function formatRuleLinks(result) {
+        const formatRuleLinks = (result) => {
             return ( asArray(result).map(e => {
-                return `[\`${e.rule.sourceText}\`](settings_${e.rule.sourceTarget} "${( localize(11469, 'View rule in settings'))}")`;
+                const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, e.rule.sourceTarget);
+                return `[\`${e.rule.sourceText}\`](${( settingsUri.toString())} "${( localize(11572, 'View rule in settings'))}")`;
             })).join(', ');
-        }
+        };
+        const mdTrustSettings = {
+            isTrusted: {
+                enabledCommands: [openTerminalSettingsLinkCommandId]
+            }
+        };
         const config = this._configurationService.inspect(ChatConfiguration.GlobalAutoApprove);
         const isGlobalAutoApproved = config?.value ?? config.defaultValue;
         if (isGlobalAutoApproved) {
+            const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, 'global');
             return (new MarkdownString(`_${( localize(
-                11470,
+                11573,
                 'Auto approved by setting {0}',
-                `[\`${ChatConfiguration.GlobalAutoApprove}\`](settings_global "${( localize(11471, 'View settings'))}")`
-            ))}_`));
+                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(11574, 'View settings'))}")`
+            ))}_`, mdTrustSettings));
         }
         if (isAutoApproved) {
             switch (autoApproveReason) {
                 case 'commandLine': {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(
-                            `_${( localize(11472, 'Auto approved by rule {0}', formatRuleLinks(commandLineResult)))}_`
+                            `_${( localize(11575, 'Auto approved by rule {0}', formatRuleLinks(commandLineResult)))}_`,
+                            mdTrustSettings
                         ));
                     }
                     break;
                 }
                 case 'subCommand': {
-                    const uniqueRules = Array.from(( new Set(subCommandResults)));
+                    const uniqueRules = dedupeRules(subCommandResults);
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            `_${( localize(11472, 'Auto approved by rule {0}', formatRuleLinks(uniqueRules)))}_`
+                            `_${( localize(11575, 'Auto approved by rule {0}', formatRuleLinks(uniqueRules)))}_`,
+                            mdTrustSettings
                         ));
                     }
                     else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            `_${( localize(11473, 'Auto approved by rules {0}', formatRuleLinks(uniqueRules)))}_`
+                            `_${( localize(11576, 'Auto approved by rules {0}', formatRuleLinks(uniqueRules)))}_`,
+                            mdTrustSettings
                         ));
                     }
                     break;
@@ -693,24 +764,23 @@ let RunInTerminalTool = class RunInTerminalTool extends Disposable {
                 case 'commandLine': {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(`_${( localize(
-                            11474,
+                            11577,
                             'Auto approval denied by rule {0}',
                             formatRuleLinks(commandLineResult)
-                        ))}_`));
+                        ))}_`, mdTrustSettings));
                     }
                     break;
                 }
                 case 'subCommand': {
-                    const deniedRules = subCommandResults.filter(e => e.result === 'denied');
-                    const uniqueRules = Array.from(( new Set(deniedRules)));
+                    const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === 'denied'));
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            `_${( localize(11474, 'Auto approval denied by rule {0}', formatRuleLinks(uniqueRules)))}_`
+                            `_${( localize(11577, 'Auto approval denied by rule {0}', formatRuleLinks(uniqueRules)))}_`
                         ));
                     }
                     else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            `_${( localize(11475, 'Auto approval denied by rules {0}', formatRuleLinks(uniqueRules)))}_`
+                            `_${( localize(11578, 'Auto approval denied by rules {0}', formatRuleLinks(uniqueRules)))}_`
                         ));
                     }
                     break;

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

@@ -5,6 +5,7 @@ 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 { 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 { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
@@ -56,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(11476, 'Resolving the task')))) });
+        _progress.report({ message: ( new MarkdownString(( localize(11579, 'Resolving the task')))) });
         let task;
         const start = Date.now();
         while (Date.now() - start < 5000 && !token.isCancellationRequested) {
@@ -67,17 +68,17 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
             await timeout(100);
         }
         if (!task) {
-            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(11477, 'Task not found: `{0}`', args.task.label)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(11580, 'Task not found: `{0}`', args.task.label)))) };
         }
-        _progress.report({ message: ( new MarkdownString(( localize(11478, 'Running task `{0}`', args.task.label)))) });
-        const raceResult = await Promise.race([this._tasksService.run(task), timeout(3000)]);
+        _progress.report({ message: ( new MarkdownString(( localize(11581, 'Running task `{0}`', args.task.label)))) });
+        const raceResult = await Promise.race([this._tasksService.run(task, undefined, TaskRunSource.ChatAgent), timeout(3000)]);
         const result = raceResult && typeof raceResult === 'object' ? raceResult : undefined;
         const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
         const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
         const terminals = resources?.map(resource => this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme)).filter(Boolean);
         if (!terminals || terminals.length === 0) {
             return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${args.task.label}` }], toolResultMessage: ( new MarkdownString(( localize(
-                11479,
+                11582,
                 'Task started but no terminal was found for: `{0}`',
                 args.task.label
             )))) };
@@ -87,12 +88,15 @@ let CreateAndRunTaskTool = class CreateAndRunTaskTool {
         store.dispose();
         for (const r of terminalResults) {
             this._telemetryService.publicLog2?.('copilotChat.runTaskTool.createAndRunTask', {
-                taskLabel: args.task.label,
+                taskId: args.task.label,
                 bufferLength: r.output.length ?? 0,
                 pollDurationMs: r.pollDurationMs ?? 0,
                 inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
                 inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
                 inputToolManualChars: r.inputToolManualChars ?? 0,
+                inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+                inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0,
+                inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0
             });
         }
         const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
@@ -115,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(11480, 'Task `{0}` already exists.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11481, 'Task `{0}` already exists.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(11583, 'Task `{0}` already exists.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(11584, '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(11482, 'Task \`{0}\` is already running.', task.label)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11482, 'Task \`{0}\` is already running.', task.label)))),
+                invocationMessage: ( new MarkdownString(( localize(11585, 'Task \`{0}\` is already running.', task.label)))),
+                pastTenseMessage: ( new MarkdownString(( localize(11585, 'Task \`{0}\` is already running.', task.label)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11483, 'Created task \`{0}\`', task.label)))),
-            pastTenseMessage: ( new MarkdownString(( localize(11484, 'Created task \`{0}\`', task.label)))),
+            invocationMessage: ( new MarkdownString(( localize(11586, 'Created task \`{0}\`', task.label)))),
+            pastTenseMessage: ( new MarkdownString(( localize(11587, 'Created task \`{0}\`', task.label)))),
             confirmationMessages: {
-                title: ( localize(11485, 'Allow task creation and execution?')),
+                title: ( localize(11588, 'Allow task creation and execution?')),
                 message: ( new MarkdownString(( localize(
-                    11486,
+                    11589,
                     'Copilot will create the task \`{0}\` with command \`{1}\`{2}.',
                     task.label,
                     task.command,
@@ -155,12 +159,12 @@ CreateAndRunTaskTool = ( __decorate([
 const CreateAndRunTaskToolData = {
     id: 'create_and_run_task',
     toolReferenceName: 'createAndRunTask',
-    displayName: ( localize(11487, 'Create and run Task')),
+    displayName: ( localize(11590, 'Create and run Task')),
     modelDescription: ( localize(
-        11488,
+        11591,
         '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(11489, "Create and run a task in the workspace")),
+    userDescription: ( localize(11592, "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

@@ -16,7 +16,7 @@ import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './
 const GetTaskOutputToolData = {
     id: 'get_task_output',
     toolReferenceName: 'getTaskOutput',
-    displayName: ( localize(11490, 'Get Task Output')),
+    displayName: ( localize(11593, 'Get Task Output')),
     modelDescription: 'Get the output of a task',
     source: ToolDataSource.Internal,
     when: TasksAvailableContext,
@@ -52,16 +52,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(11491, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(11594, '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(11492, 'The task `{0}` is already running.', taskLabel)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(11595, 'The task `{0}` is already running.', taskLabel)))) };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11493, 'Checking output for task `{0}`', taskLabel)))),
-            pastTenseMessage: ( new MarkdownString(( localize(11494, 'Checked output for task `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(11596, 'Checking output for task `{0}`', taskLabel)))),
+            pastTenseMessage: ( new MarkdownString(( localize(11597, 'Checked output for task `{0}`', taskLabel)))),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -69,14 +69,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(11491, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(11594, '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(11495, 'Terminal not found for task `{0}`', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: ( new MarkdownString(( localize(11598, 'Terminal not found for task `{0}`', taskLabel)))) };
         }
         const store = ( new DisposableStore());
         const terminalResults = await collectTerminalResults(terminals, task, this._instantiationService, invocation.context, _progress, token, store, () => this._isTaskActive(task), dependencyTasks);
@@ -89,12 +89,15 @@ let GetTaskOutputTool = class GetTaskOutputTool extends Disposable {
                 inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
                 inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
                 inputToolManualChars: r.inputToolManualChars ?? 0,
+                inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+                inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0,
+                inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0
             });
         }
         const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
         const uniqueDetails = Array.from(( new Set(details))).join('\n\n');
         const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-        const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults);
+        const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults, true);
         return {
             content: [{ kind: 'text', value: uniqueDetails }],
             toolResultMessage,

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

@@ -6,6 +6,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { TasksAvailableContext } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService';
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
+import { 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 { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
@@ -31,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(11496, 'Task not found: `{0}`', args.id)))) };
+            return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: ( new MarkdownString(( localize(11599, '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(11497, 'The task `{0}` is already running.', taskLabel)))) };
+            return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: ( new MarkdownString(( localize(11600, 'The task `{0}` is already running.', taskLabel)))) };
         }
-        const raceResult = await Promise.race([this._tasksService.run(task), timeout(3000)]);
+        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(11498, '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(11601, '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(11498, '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(11601, '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, () => this._isTaskActive(task), dependencyTasks);
@@ -60,6 +61,9 @@ let RunTaskTool = class RunTaskTool {
                 inputToolManualAcceptCount: r.inputToolManualAcceptCount ?? 0,
                 inputToolManualRejectCount: r.inputToolManualRejectCount ?? 0,
                 inputToolManualChars: r.inputToolManualChars ?? 0,
+                inputToolManualShownCount: r.inputToolManualShownCount ?? 0,
+                inputToolFreeFormInputShownCount: r.inputToolFreeFormInputShownCount ?? 0,
+                inputToolFreeFormInputCount: r.inputToolFreeFormInputCount ?? 0
             });
         }
         const details = ( terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`));
@@ -81,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(11496, 'Task not found: `{0}`', args.id)))) };
+            return { invocationMessage: ( new MarkdownString(( localize(11599, '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(11499, 'The task is already running.')))) };
+            return { invocationMessage: ( new MarkdownString(( localize(11602, 'The task is already running.')))) };
         }
         if (await this._isTaskActive(task)) {
             return {
-                invocationMessage: ( new MarkdownString(( localize(11500, '`{0}` is already running.', taskLabel)))),
-                pastTenseMessage: ( new MarkdownString(( localize(11501, '`{0}` was already running.', taskLabel)))),
+                invocationMessage: ( new MarkdownString(( localize(11603, '`{0}` is already running.', taskLabel)))),
+                pastTenseMessage: ( new MarkdownString(( localize(11604, '`{0}` was already running.', taskLabel)))),
                 confirmationMessages: undefined
             };
         }
         return {
-            invocationMessage: ( new MarkdownString(( localize(11502, 'Running `{0}`', taskLabel)))),
+            invocationMessage: ( new MarkdownString(( localize(11605, 'Running `{0}`', taskLabel)))),
             pastTenseMessage: ( new MarkdownString(task?.configurationProperties.isBackground
-                ? ( localize(11503, 'Started `{0}`', taskLabel))
-                : ( localize(11504, 'Ran `{0}`', taskLabel)))),
+                ? ( localize(11606, 'Started `{0}`', taskLabel))
+                : ( localize(11607, 'Ran `{0}`', taskLabel)))),
             confirmationMessages: task
-                ? { title: ( localize(11505, 'Allow task run?')), message: ( localize(11506, 'Allow Copilot to run the task `{0}`?', taskLabel)) }
+                ? { title: ( localize(11608, 'Allow task run?')), message: ( localize(11609, 'Allow Copilot to run the task `{0}`?', taskLabel)) }
                 : undefined
         };
     }
@@ -116,9 +120,9 @@ RunTaskTool = ( __decorate([
 const RunTaskToolData = {
     id: 'run_task',
     toolReferenceName: 'runTask',
-    displayName: ( localize(11507, 'Run Task')),
+    displayName: ( localize(11610, '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(11508, 'Tool for running tasks in the workspace')),
+    userDescription: ( localize(11611, 'Tool for running 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;
-}[]): MarkdownString;
+}[], getOutputTool?: boolean): MarkdownString;
 export interface ILinkLocation {
     uri: URI;
     range?: Range;