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

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

@@ -4,26 +4,29 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isObject, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatElicitationRequestPart } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/chat/browser/chatElicitationRequestPart';
 import { ChatModel } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
+import { detectsInputRequiredPattern } from '../../executeStrategy/executeStrategy.js';
 import { OutputMonitorState, PollingConsts } from './types.js';
 import { getTextResponseFromStream } from './utils.js';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { isObject, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { detectsInputRequiredPattern } from '../../executeStrategy/executeStrategy.js';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-a175bd1a-4858-5944-9ae5-fb73305dcb13-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 let OutputMonitor = class OutputMonitor extends Disposable {
     get state() { return this._state; }
     get pollingResult() { return this._pollingResult; }
     get outputMonitorTelemetryCounters() { return this._outputMonitorTelemetryCounters; }
-    constructor(_execution, _pollFn, invocationContext, token, command, _languageModelsService, _taskService, _chatService, _chatWidgetService) {
+    constructor(_execution, _pollFn, invocationContext, token, command, _languageModelsService, _taskService, _chatService, _chatWidgetService, _configurationService, _logService) {
         super();
         this._execution = _execution;
         this._pollFn = _pollFn;
@@ -31,11 +34,18 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         this._taskService = _taskService;
         this._chatService = _chatService;
         this._chatWidgetService = _chatWidgetService;
+        this._configurationService = _configurationService;
+        this._logService = _logService;
         this._state = OutputMonitorState.PollingForIdle;
         this._outputMonitorTelemetryCounters = {
             inputToolManualAcceptCount: 0,
             inputToolManualRejectCount: 0,
-            inputToolManualChars: 0
+            inputToolManualChars: 0,
+            inputToolAutoAcceptCount: 0,
+            inputToolAutoChars: 0,
+            inputToolManualShownCount: 0,
+            inputToolFreeFormInputShownCount: 0,
+            inputToolFreeFormInputCount: 0,
         };
         this._onDidFinishCommand = this._register(( new Emitter()));
         this.onDidFinishCommand = this._onDidFinishCommand.event;
@@ -47,6 +57,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         const pollStartTime = Date.now();
         let modelOutputEvalResponse;
         let resources;
+        let output;
         let extended = false;
         try {
             while (!token.isCancellationRequested) {
@@ -63,7 +74,6 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                         }
                         else {
                             this._promptPart?.hide();
-                            this._promptPart?.dispose();
                             this._promptPart = undefined;
                             break;
                         }
@@ -78,6 +88,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                         else {
                             resources = idleResult.resources;
                             modelOutputEvalResponse = idleResult.modelOutputEvalResponse;
+                            output = idleResult.output;
                         }
                         break;
                     }
@@ -93,22 +104,44 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         finally {
             this._pollingResult = {
                 state: this._state,
-                output: this._execution.getOutput(),
+                output: output ?? this._execution.getOutput(),
                 modelOutputEvalResponse: token.isCancellationRequested ? 'Cancelled' : modelOutputEvalResponse,
                 pollDurationMs: Date.now() - pollStartTime,
                 resources
             };
             this._promptPart?.hide();
-            this._promptPart?.dispose();
             this._promptPart = undefined;
             this._onDidFinishCommand.fire();
         }
     }
     async _handleIdleState(token) {
         const confirmationPrompt = await this._determineUserInputOptions(this._execution, token);
-        const suggestedOption = await this._selectAndHandleOption(confirmationPrompt, token);
+        if (confirmationPrompt?.detectedRequestForFreeFormInput) {
+            this._outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount++;
+            const focusedTerminal = await this._requestFreeFormTerminalInput(token, this._execution, confirmationPrompt);
+            if (focusedTerminal) {
+                await ( new Promise(resolve => {
+                    const disposable = this._execution.instance.onData(data => {
+                        if (data === '\r' || data === '\n' || data === '\r\n') {
+                            this._outputMonitorTelemetryCounters.inputToolFreeFormInputCount++;
+                            disposable.dispose();
+                            resolve();
+                        }
+                    });
+                }));
+                await timeout(200);
+                return { shouldContinuePollling: true };
+            }
+            else {
+                return { shouldContinuePollling: false };
+            }
+        }
         if (confirmationPrompt?.options.length) {
-            const confirmed = await this._confirmRunInTerminal(suggestedOption ?? confirmationPrompt.options[0], this._execution, confirmationPrompt);
+            const suggestedOptionResult = await this._selectAndHandleOption(confirmationPrompt, token);
+            if (suggestedOptionResult?.sentToTerminal) {
+                return { shouldContinuePollling: true };
+            }
+            const confirmed = await this._confirmRunInTerminal(token, suggestedOptionResult?.suggestedOption ?? confirmationPrompt.options[0], this._execution, confirmationPrompt);
             if (confirmed) {
                 return { shouldContinuePollling: true };
             }
@@ -120,7 +153,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         const custom = await this._pollFn?.(this._execution, token, this._taskService);
         const resources = custom?.resources;
         const modelOutputEvalResponse = await this._assessOutputForErrors(this._execution.getOutput(), token);
-        return { resources, modelOutputEvalResponse, shouldContinuePollling: false };
+        return { resources, modelOutputEvalResponse, shouldContinuePollling: false, output: custom?.output };
     }
     async _handleTimeoutState(command, invocationContext, extended, token) {
         let continuePollingPart;
@@ -145,7 +178,6 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (race.kind === 'decision') {
             try {
                 continuePollingPart?.hide();
-                continuePollingPart?.dispose?.();
             }
             catch {  }
             continuePollingPart = undefined;
@@ -161,7 +193,6 @@ let OutputMonitor = class OutputMonitor extends Disposable {
             if (r === OutputMonitorState.Idle || r === OutputMonitorState.Cancelled || r === OutputMonitorState.Timeout) {
                 try {
                     continuePollingPart?.hide();
-                    continuePollingPart?.dispose?.();
                 }
                 catch {  }
                 continuePollingPart = undefined;
@@ -207,6 +238,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                 }
                 const recentlyIdle = consecutiveIdleEvents >= PollingConsts.MinIdleEvents;
                 const isActive = execution.isActive ? await execution.isActive() : undefined;
+                this._logService.trace(`OutputMonitor: waitForIdle check: waited=${waited}ms, recentlyIdle=${recentlyIdle}, isActive=${isActive}`);
                 if (recentlyIdle && isActive === true) {
                     consecutiveIdleEvents = 0;
                     continue;
@@ -228,35 +260,11 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (token.isCancellationRequested || this._state === OutputMonitorState.Cancelled) {
             return { promise: Promise.resolve(false) };
         }
-        const chatModel = this._chatService.getSession(context.sessionId);
-        if (chatModel instanceof ChatModel) {
-            const request = chatModel.getRequests().at(-1);
-            if (request) {
-                let part = undefined;
-                const promise = ( new Promise(resolve => {
-                    const thePart = part = this._register(( new ChatElicitationRequestPart(( new MarkdownString(( localize(11456, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
-                        11457,
-                        "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes."
-                    )))), '', ( localize(11458, 'Yes')), ( localize(11459, 'No')), async () => {
-                        thePart.state = 'accepted';
-                        thePart.hide();
-                        thePart.dispose();
-                        this._promptPart = undefined;
-                        resolve(true);
-                    }, async () => {
-                        thePart.state = 'rejected';
-                        thePart.hide();
-                        this._state = OutputMonitorState.Cancelled;
-                        this._promptPart = undefined;
-                        resolve(false);
-                    })));
-                    chatModel.acceptResponseProgress(request, thePart);
-                    this._promptPart = thePart;
-                }));
-                return { promise, part };
-            }
-        }
-        return { promise: Promise.resolve(false) };
+        const result = this._createElicitationPart(token, context?.sessionId, ( new MarkdownString(( localize(11556, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
+            11557,
+            "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes."
+        )))), '', ( localize(11558, 'Yes')), ( localize(11559, 'No')), async () => true, async () => { this._state = OutputMonitorState.Cancelled; return false; });
+        return { promise: result.promise.then(p => p ?? false), part: result.part };
     }
     async _assessOutputForErrors(buffer, token) {
         const models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'gpt-4o-mini' });
@@ -282,32 +290,35 @@ let OutputMonitor = class OutputMonitor extends Disposable {
             return undefined;
         }
         const lastFiveLines = execution.getOutput(this._lastPromptMarker).trimEnd().split('\n').slice(-5).join('\n');
-        const promptText = `Analyze the following terminal output. If it contains a prompt requesting user input (such as a confirmation, selection, or yes/no question) and that prompt has NOT already been answered, extract the prompt text and the possible options as a JSON object with keys 'prompt' and 'options' (an array of strings or an object with option to description mappings). For example, if the options are "[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [C] Cancel", the option to description mappings would be {"Y": "Yes", "A": "Yes to All", "N": "No", "L": "No to All", "C": "Cancel"}. If there is no such prompt, return null.
+        const promptText = `Analyze the following terminal output. If it contains a prompt requesting user input (such as a confirmation, selection, or yes/no question) and that prompt has NOT already been answered, extract the prompt text. The prompt may ask to choose from a set. If so, extract the possible options as a JSON object with keys 'prompt', 'options' (an array of strings or an object with option to description mappings), and 'freeFormInput': false. If no options are provided, and free form input is requested, for example: Password:, return the word freeFormInput. For example, if the options are "[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [C] Cancel", the option to description mappings would be {"Y": "Yes", "A": "Yes to All", "N": "No", "L": "No to All", "C": "Cancel"}. If there is no such prompt, return null. If the option is ambiguous, like "any key", return null.
 			Examples:
 			1. Output: "Do you want to overwrite? (y/n)"
-				Response: {"prompt": "Do you want to overwrite?", "options": ["y", "n"]}
+				Response: {"prompt": "Do you want to overwrite?", "options": ["y", "n"], "freeFormInput": false}
 
 			2. Output: "Confirm: [Y] Yes  [A] Yes to All  [N] No  [L] No to All  [C] Cancel"
-				Response: {"prompt": "Confirm", "options": ["Y", "A", "N", "L", "C"]}
+				Response: {"prompt": "Confirm", "options": ["Y", "A", "N", "L", "C"], "freeFormInput": false}
 
 			3. Output: "Accept license terms? (yes/no)"
-				Response: {"prompt": "Accept license terms?", "options": ["yes", "no"]}
+				Response: {"prompt": "Accept license terms?", "options": ["yes", "no"], "freeFormInput": false}
 
 			4. Output: "Press Enter to continue"
-				Response: {"prompt": "Press Enter to continue", "options": ["Enter"]}
+				Response: {"prompt": "Press Enter to continue", "options": ["Enter"], "freeFormInput": false}
 
 			5. Output: "Type Yes to proceed"
-				Response: {"prompt": "Type Yes to proceed", "options": ["Yes"]}
+				Response: {"prompt": "Type Yes to proceed", "options": ["Yes"], "freeFormInput": false}
 
 			6. Output: "Continue [y/N]"
-				Response: {"prompt": "Continue", "options": ["y", "N"]}
+				Response: {"prompt": "Continue", "options": ["y", "N"], "freeFormInput": false}
 
+			Alternatively, the prompt may request free form input, for example:
+			1. Output: "Enter your username:"
+				Response: {"prompt": "Enter your username:", "freeFormInput": true, "options": []}
+			2. Output: "Password:"
+				Response: {"prompt": "Password:", "freeFormInput": true, "options": []}
 			Now, analyze this output:
 			${lastFiveLines}
 			`;
-        const response = await this._languageModelsService.sendChatRequest(models[0], ( new ExtensionIdentifier('core')), [
-            { role: ChatMessageRole.User, content: [{ type: 'text', value: promptText }] }
-        ], {}, token);
+        const response = await this._languageModelsService.sendChatRequest(models[0], ( new ExtensionIdentifier('core')), [{ role: ChatMessageRole.User, content: [{ type: 'text', value: promptText }] }], {}, token);
         const responseText = await getTextResponseFromStream(response);
         try {
             const match = responseText.match(/\{[\s\S]*\}/);
@@ -315,12 +326,17 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                 const obj = JSON.parse(match[0]);
                 if (isObject(obj) &&
                     'prompt' in obj && isString(obj.prompt) &&
-                    'options' in obj) {
+                    'options' in obj &&
+                    'options' in obj &&
+                    'freeFormInput' in obj && typeof obj.freeFormInput === 'boolean') {
+                    if (this._lastPrompt === obj.prompt) {
+                        return;
+                    }
                     if (Array.isArray(obj.options) && obj.options.every(isString)) {
-                        return { prompt: obj.prompt, options: obj.options };
+                        return { prompt: obj.prompt, options: obj.options, detectedRequestForFreeFormInput: obj.freeFormInput };
                     }
                     else if (isObject(obj.options) && ( Object.values(obj.options)).every(isString)) {
-                        return { prompt: obj.prompt, options: ( Object.keys(obj.options)), descriptions: ( Object.values(obj.options)) };
+                        return { prompt: obj.prompt, options: ( Object.keys(obj.options)), descriptions: ( Object.values(obj.options)), detectedRequestForFreeFormInput: obj.freeFormInput };
                     }
                 }
             }
@@ -334,7 +350,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (!confirmationPrompt?.options.length) {
             return undefined;
         }
-        const model = this._chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Panel)[0]?.input.currentLanguageModel;
+        const model = this._chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat)[0]?.input.currentLanguageModel;
         if (!model) {
             return undefined;
         }
@@ -348,9 +364,6 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (!currentMarker) {
             return undefined;
         }
-        if (this._lastPrompt === prompt) {
-            return;
-        }
         this._lastPromptMarker = currentMarker;
         this._lastPrompt = prompt;
         const promptText = `Given the following confirmation prompt and options from a terminal output, which option is the default?\nPrompt: "${prompt}"\nOptions: ${JSON.stringify(options)}\nRespond with only the option string.`;
@@ -358,76 +371,133 @@ let OutputMonitor = class OutputMonitor extends Disposable {
             { role: ChatMessageRole.User, content: [{ type: 'text', value: promptText }] }
         ], {}, token);
         const suggestedOption = (await getTextResponseFromStream(response)).trim();
-        if (suggestedOption) {
-            const index = confirmationPrompt.options.indexOf(suggestedOption);
-            const validOption = confirmationPrompt.options.find(opt => suggestedOption.replace(/['"`]/g, '').trim() === opt.replace(/['"`]/g, '').trim());
-            if (validOption && index > -1) {
-                const description = confirmationPrompt.descriptions?.[index];
-                return description ? { description, option: validOption } : validOption;
+        if (!suggestedOption) {
+            return;
+        }
+        const parsed = suggestedOption.replace(/['"`]/g, '').trim();
+        const index = confirmationPrompt.options.indexOf(parsed);
+        const validOption = confirmationPrompt.options.find(opt => parsed === opt.replace(/['"`]/g, '').trim());
+        if (!validOption || index === -1) {
+            return;
+        }
+        let sentToTerminal = false;
+        if (this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoReplyToPrompts)) {
+            await this._execution.instance.sendText(validOption, true);
+            this._outputMonitorTelemetryCounters.inputToolAutoAcceptCount++;
+            this._outputMonitorTelemetryCounters.inputToolAutoChars += validOption?.length || 0;
+            sentToTerminal = true;
+        }
+        const description = confirmationPrompt.descriptions?.[index];
+        return description ? { suggestedOption: { description, option: validOption }, sentToTerminal } : { suggestedOption: validOption, sentToTerminal };
+    }
+    async _requestFreeFormTerminalInput(token, execution, confirmationPrompt) {
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(11560, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            11561,
+            "{0}\nPlease provide the required input to the terminal.\n\n",
+            confirmationPrompt.prompt
+        )))), '', ( localize(11562, 'Focus terminal')), undefined, async () => { execution.instance.focus(true); return true; });
+        const inputPromise = ( new Promise(resolve => {
+            const inputDataDisposable = this._register(execution.instance.onDidInputData((data) => {
+                if (!data || data === '\r' || data === '\n' || data === '\r\n') {
+                    part.hide();
+                    inputDataDisposable.dispose();
+                    this._state = OutputMonitorState.PollingForIdle;
+                    resolve(true);
+                }
+            }));
+        }));
+        const result = await Promise.race([userPrompt, inputPromise]);
+        return !!result;
+    }
+    async _confirmRunInTerminal(token, suggestedOption, execution, confirmationPrompt) {
+        const suggestedOptionValue = typeof suggestedOption === 'string' ? suggestedOption : suggestedOption.option;
+        let inputDataDisposable = Disposable.None;
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(11563, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            11564,
+            "{0}\n Do you want to send `{1}`{2} followed by `Enter` to the terminal?",
+            confirmationPrompt.prompt,
+            suggestedOptionValue,
+            typeof suggestedOption === 'string' ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : ''
+        )))), '', ( localize(11565, 'Allow')), ( localize(11566, 'Focus Terminal')), async (value) => {
+            let option = undefined;
+            if (value === true) {
+                option = suggestedOptionValue;
+            }
+            else if (typeof value === 'object' && 'label' in value) {
+                option = value.label.split(' (')[0];
             }
+            this._outputMonitorTelemetryCounters.inputToolManualAcceptCount++;
+            this._outputMonitorTelemetryCounters.inputToolManualChars += option?.length || 0;
+            return option;
+        }, async () => {
+            this._state = OutputMonitorState.Cancelled;
+            this._outputMonitorTelemetryCounters.inputToolManualRejectCount++;
+            inputDataDisposable.dispose();
+            return undefined;
+        }, getMoreActions(suggestedOption, confirmationPrompt));
+        const inputPromise = ( new Promise(resolve => {
+            inputDataDisposable = this._register(execution.instance.onDidInputData(() => {
+                part.hide();
+                inputDataDisposable.dispose();
+                this._state = OutputMonitorState.PollingForIdle;
+                resolve(undefined);
+            }));
+        }));
+        const optionToRun = await Promise.race([userPrompt, inputPromise]);
+        if (optionToRun) {
+            await execution.instance.sendText(optionToRun, true);
         }
-        return undefined;
+        return optionToRun;
     }
-    async _confirmRunInTerminal(suggestedOption, execution, confirmationPrompt) {
-        const chatModel = this._chatService.getSession(execution.sessionId);
+    _createElicitationPart(token, sessionId, title, detail, subtitle, acceptLabel, rejectLabel, onAccept, onReject, moreActions) {
+        const chatModel = sessionId && this._chatService.getSession(sessionId);
         if (!(chatModel instanceof ChatModel)) {
-            return undefined;
+            throw ( new Error('No model'));
         }
         const request = chatModel.getRequests().at(-1);
         if (!request) {
-            return undefined;
+            throw ( new Error('No request'));
         }
-        const suggestedOptionValue = typeof suggestedOption === 'string' ? suggestedOption : suggestedOption.option;
-        const userPrompt = ( new Promise(resolve => {
-            const thePart = this._register(( new ChatElicitationRequestPart(( new MarkdownString(( localize(11460, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
-                11461,
-                "{0}\n Do you want to send `{1}`{2} followed by `Enter` to the terminal?",
-                confirmationPrompt.prompt,
-                suggestedOptionValue,
-                typeof suggestedOption === 'string' ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : ''
-            )))), '', ( localize(11462, 'Allow')), ( localize(11463, 'Focus Terminal')), async (value) => {
+        let part;
+        const promise = ( new Promise(resolve => {
+            const thePart = part = this._register(( new ChatElicitationRequestPart(title, detail, subtitle, acceptLabel, rejectLabel, async (value) => {
                 thePart.state = 'accepted';
                 thePart.hide();
-                thePart.dispose();
-                let option = undefined;
-                if (value === true) {
-                    option = suggestedOptionValue;
+                this._promptPart = undefined;
+                try {
+                    const r = await (onAccept ? onAccept(value) : undefined);
+                    resolve(r);
                 }
-                else if (typeof value === 'object' && 'label' in value) {
-                    option = value.label.split(' (')[0];
+                catch {
+                    resolve(undefined);
                 }
-                this._outputMonitorTelemetryCounters.inputToolManualAcceptCount++;
-                this._outputMonitorTelemetryCounters.inputToolManualChars += option?.length || 0;
-                resolve(option);
             }, async () => {
                 thePart.state = 'rejected';
                 thePart.hide();
-                this._state = OutputMonitorState.Cancelled;
-                this._outputMonitorTelemetryCounters.inputToolManualRejectCount++;
-                inputDataDisposable.dispose();
-                resolve(undefined);
-            }, undefined, getMoreActions(suggestedOption, confirmationPrompt))));
-            const inputDataDisposable = this._register(execution.instance.onDidInputData(() => {
-                thePart.hide();
-                thePart.dispose();
-                inputDataDisposable.dispose();
-                this._state = OutputMonitorState.PollingForIdle;
-                resolve(undefined);
-            }));
+                this._promptPart = undefined;
+                try {
+                    const r = await (onReject ? onReject() : undefined);
+                    resolve(r);
+                }
+                catch {
+                    resolve(undefined);
+                }
+            },
+            undefined, moreActions, () => this._outputMonitorTelemetryCounters.inputToolManualShownCount++)));
             chatModel.acceptResponseProgress(request, thePart);
+            this._promptPart = thePart;
         }));
-        const optionToRun = await userPrompt;
-        if (optionToRun) {
-            await execution.instance.sendText(optionToRun, true);
-        }
-        return optionToRun;
+        this._register(token.onCancellationRequested(() => part.hide()));
+        return { promise, part };
     }
 };
 OutputMonitor = ( __decorate([
     ( __param(5, ILanguageModelsService)),
     ( __param(6, ITaskService)),
     ( __param(7, IChatService)),
-    ( __param(8, IChatWidgetService))
+    ( __param(8, IChatWidgetService)),
+    ( __param(9, IConfigurationService)),
+    ( __param(10, ILogService))
 ], OutputMonitor));
 function getMoreActions(suggestedOption, confirmationPrompt) {
     const moreActions = [];

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

@@ -6,13 +6,14 @@ export interface IConfirmationPrompt {
     prompt: string;
     options: string[];
     descriptions?: string[];
+    detectedRequestForFreeFormInput: boolean;
 }
 export interface IExecution {
     getOutput: (marker?: XtermMarker) => string;
     isActive?: () => Promise<boolean>;
     task?: Task | Pick<Task, "configurationProperties">;
     instance: Pick<ITerminalInstance, "sendText" | "instanceId" | "onDidInputData" | "onData" | "focus" | "registerMarker">;
-    sessionId: string;
+    sessionId: string | undefined;
 }
 export interface IPollingResult {
     output: string;

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

@@ -4,6 +4,7 @@ import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 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 { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { ITerminalProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
 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 { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
@@ -40,7 +41,10 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     constructor(_instantiationService: IInstantiationService, _configurationService: IConfigurationService, _languageModelToolsService: ILanguageModelToolsService, _storageService: IStorageService, _logService: ITerminalLogService, _terminalProfileResolverService: ITerminalProfileResolverService, _terminalService: ITerminalService, _remoteAgentService: IRemoteAgentService, _chatService: IChatService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
+    protected _getCopilotShellOrProfile(): Promise<string | ITerminalProfile>;
     private _getCopilotShell;
+    private _getChatTerminalProfile;
+    private _isValidChatAgentTerminalProfile;
     private _initBackgroundTerminal;
     private _initForegroundTerminal;
     private _registerInputListener;