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

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

@@ -8,18 +8,18 @@ import { isObject, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/
 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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatElicitationRequestPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatElicitationRequestPart';
+import { ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 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 { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
@@ -86,6 +86,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                     case OutputMonitorState.Idle: {
                         const idleResult = await this._handleIdleState(token);
                         if (idleResult.shouldContinuePollling) {
+                            this._state = OutputMonitorState.PollingForIdle;
                             continue;
                         }
                         else {
@@ -121,17 +122,8 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         const confirmationPrompt = await this._determineUserInputOptions(this._execution, 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();
-                        }
-                    });
-                }));
+            const receivedTerminalInput = await this._requestFreeFormTerminalInput(token, this._execution, confirmationPrompt);
+            if (receivedTerminalInput) {
                 await timeout(200);
                 return { shouldContinuePollling: true };
             }
@@ -193,13 +185,15 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         }
         else {
             const r = race.r;
-            if (r === OutputMonitorState.Idle || r === OutputMonitorState.Cancelled || r === OutputMonitorState.Timeout) {
+            const state = (typeof r === 'object' && r !== null) ? r.state : r;
+            if (state === OutputMonitorState.Idle || state === OutputMonitorState.Cancelled || state === OutputMonitorState.Timeout) {
                 try {
                     continuePollingPart?.hide();
                 }
                 catch {  }
                 continuePollingPart = undefined;
                 continuePollingDecisionP = undefined;
+                this._promptPart = undefined;
                 return false;
             }
             return true;
@@ -237,7 +231,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 === false) {
+                if (recentlyIdle && isActive !== true) {
                     this._state = OutputMonitorState.Idle;
                     return this._state;
                 }
@@ -255,10 +249,10 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (token.isCancellationRequested || this._state === OutputMonitorState.Cancelled) {
             return { promise: Promise.resolve(false) };
         }
-        const result = this._createElicitationPart(token, context?.sessionId, ( new MarkdownString(( localize(11877, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
-            11878,
+        const result = this._createElicitationPart(token, context?.sessionId, ( new MarkdownString(( localize(12018, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
+            12019,
             "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes."
-        )))), '', ( localize(11879, 'Yes')), ( localize(11880, 'No')), async () => true, async () => { this._state = OutputMonitorState.Cancelled; return false; });
+        )))), '', ( localize(12020, 'Yes')), ( localize(12021, '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) {
@@ -284,8 +278,8 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (!model) {
             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. 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 or non-specific (like "any key" or "some key"), return null.
+        const lastLines = execution.getOutput(this._lastPromptMarker).trimEnd().split('\n').slice(-15).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. 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, return null.
 			Examples:
 			1. Output: "Do you want to overwrite? (y/n)"
 				Response: {"prompt": "Do you want to overwrite?", "options": ["y", "n"], "freeFormInput": false}
@@ -306,9 +300,14 @@ let OutputMonitor = class OutputMonitor extends Disposable {
 				Response: {"prompt": "Continue", "options": ["y", "N"], "freeFormInput": false}
 
 			7. Output: "Press any key to close the terminal."
-				Response: null
+				Response: {"prompt": "Press any key to continue...", "options": ["a"], "freeFormInput": false}
 
 			8. Output: "Terminal will be reused by tasks, press any key to close it."
+				Response: {"prompt": "Terminal will be reused by tasks, press any key to close it.", "options": ["a"], "freeFormInput": false}
+
+			9. Output: "Password:"
+				Response: {"prompt": "Password:", "freeFormInput": true, "options": []}
+			10. Output: "press ctrl-c to detach, ctrl-d to kill"
 				Response: null
 
 			Alternatively, the prompt may request free form input, for example:
@@ -317,7 +316,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
 			2. Output: "Password:"
 				Response: {"prompt": "Password:", "freeFormInput": true, "options": []}
 			Now, analyze this output:
-			${lastFiveLines}
+			${lastLines}
 			`;
         const response = await this._languageModelsService.sendChatRequest(model, ( new ExtensionIdentifier('core')), [{ role: ChatMessageRole.User, content: [{ type: 'text', value: promptText }] }], {}, token);
         const responseText = await getTextResponseFromStream(response);
@@ -333,20 +332,14 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                     if (this._lastPrompt === obj.prompt) {
                         return;
                     }
-                    const NON_SPECIFIC_OPTIONS = ( new Set(['any key', 'some key', 'a key']));
-                    const isNonSpecificOption = (option) => {
-                        const lowerOption = option.toLowerCase().trim();
-                        return ( NON_SPECIFIC_OPTIONS.has(lowerOption));
-                    };
+                    if (obj.freeFormInput === true) {
+                        return { prompt: obj.prompt, options: [], detectedRequestForFreeFormInput: true };
+                    }
                     if (Array.isArray(obj.options) && obj.options.every(isString)) {
-                        const filteredOptions = obj.options.filter(opt => !isNonSpecificOption(opt));
-                        if (filteredOptions.length === 0) {
-                            return undefined;
-                        }
-                        return { prompt: obj.prompt, options: filteredOptions, detectedRequestForFreeFormInput: obj.freeFormInput };
+                        return { prompt: obj.prompt, options: obj.options, detectedRequestForFreeFormInput: obj.freeFormInput };
                     }
                     else if (isObject(obj.options) && ( Object.values(obj.options)).every(isString)) {
-                        const keys = ( Object.keys(obj.options)).filter(key => !isNonSpecificOption(key));
+                        const keys = ( Object.keys(obj.options));
                         if (keys.length === 0) {
                             return undefined;
                         }
@@ -391,7 +384,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         }
         const parsed = suggestedOption.replace(/['"`]/g, '').trim();
         const index = confirmationPrompt.options.indexOf(parsed);
-        const validOption = confirmationPrompt.options.find(opt => parsed === opt.replace(/['"`]/g, '').trim());
+        const validOption = confirmationPrompt.options.find(opt => parsed === 'any key' || parsed === opt.replace(/['"`]/g, '').trim());
         if (!validOption || index === -1) {
             return;
         }
@@ -406,37 +399,71 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         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(11881, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
-            11882,
+        const focusTerminalSelection = Symbol('focusTerminalSelection');
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(12022, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            12023,
             "{0}\nPlease provide the required input to the terminal.\n\n",
             confirmationPrompt.prompt
-        )))), '', ( localize(11883, 'Focus terminal')), undefined, async () => {
+        )))), '', ( localize(12024, 'Focus terminal')), undefined, () => {
             this._showInstance(execution.instance.instanceId);
-            return true;
+            return focusTerminalSelection;
         });
+        let inputDataDisposable = Disposable.None;
+        let instanceDisposedDisposable = Disposable.None;
         const inputPromise = ( new Promise(resolve => {
-            const inputDataDisposable = this._register(execution.instance.onDidInputData((data) => {
+            let settled = false;
+            const settle = (value, state) => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                part.hide();
+                inputDataDisposable.dispose();
+                instanceDisposedDisposable.dispose();
+                this._state = state;
+                resolve(value);
+            };
+            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);
+                    this._outputMonitorTelemetryCounters.inputToolFreeFormInputCount++;
+                    settle(true, OutputMonitorState.PollingForIdle);
                 }
             }));
+            instanceDisposedDisposable = this._register(execution.instance.onDisposed(() => {
+                settle(false, OutputMonitorState.Cancelled);
+            }));
         }));
+        const disposeListeners = () => {
+            inputDataDisposable.dispose();
+            instanceDisposedDisposable.dispose();
+        };
         const result = await Promise.race([userPrompt, inputPromise]);
+        if (result === focusTerminalSelection) {
+            execution.instance.focus(true);
+            return await inputPromise;
+        }
+        if (result === undefined) {
+            disposeListeners();
+            return false;
+        }
+        disposeListeners();
         return !!result;
     }
     async _confirmRunInTerminal(token, suggestedOption, execution, confirmationPrompt) {
-        const suggestedOptionValue = typeof suggestedOption === 'string' ? suggestedOption : suggestedOption.option;
+        let suggestedOptionValue = isString(suggestedOption) ? suggestedOption : suggestedOption.option;
+        if (suggestedOptionValue === 'any key') {
+            suggestedOptionValue = 'a';
+        }
+        const focusTerminalSelection = Symbol('focusTerminalSelection');
         let inputDataDisposable = Disposable.None;
-        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(11884, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
-            11885,
+        let instanceDisposedDisposable = Disposable.None;
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(12025, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            12026,
             "{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(11886, 'Allow')), ( localize(11887, 'Focus Terminal')), async (value) => {
+            isString(suggestedOption) ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : ''
+        )))), '', ( localize(12027, 'Allow')), ( localize(12028, 'Focus Terminal')), async (value) => {
             let option = undefined;
             if (value === true) {
                 option = suggestedOptionValue;
@@ -447,25 +474,51 @@ let OutputMonitor = class OutputMonitor extends Disposable {
             this._outputMonitorTelemetryCounters.inputToolManualAcceptCount++;
             this._outputMonitorTelemetryCounters.inputToolManualChars += option?.length || 0;
             return option;
-        }, async () => {
+        }, () => {
             this._showInstance(execution.instance.instanceId);
-            this._state = OutputMonitorState.Cancelled;
             this._outputMonitorTelemetryCounters.inputToolManualRejectCount++;
-            inputDataDisposable.dispose();
-            return undefined;
+            return focusTerminalSelection;
         }, getMoreActions(suggestedOption, confirmationPrompt));
         const inputPromise = ( new Promise(resolve => {
-            inputDataDisposable = this._register(execution.instance.onDidInputData(() => {
+            let settled = false;
+            const settle = (value, state) => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
                 part.hide();
                 inputDataDisposable.dispose();
-                this._state = OutputMonitorState.PollingForIdle;
-                resolve(undefined);
+                instanceDisposedDisposable.dispose();
+                this._state = state;
+                resolve(value);
+            };
+            inputDataDisposable = this._register(execution.instance.onDidInputData(() => {
+                settle(true, OutputMonitorState.PollingForIdle);
+            }));
+            instanceDisposedDisposable = this._register(execution.instance.onDisposed(() => {
+                settle(false, OutputMonitorState.Cancelled);
             }));
         }));
+        const disposeListeners = () => {
+            inputDataDisposable.dispose();
+            instanceDisposedDisposable.dispose();
+        };
         const optionToRun = await Promise.race([userPrompt, inputPromise]);
-        if (optionToRun) {
+        if (optionToRun === focusTerminalSelection) {
+            execution.instance.focus(true);
+            return await inputPromise;
+        }
+        if (optionToRun === true) {
+            disposeListeners();
+            return true;
+        }
+        if (typeof optionToRun === 'string' && optionToRun.length) {
+            execution.instance.focus(true);
+            disposeListeners();
             await execution.instance.sendText(optionToRun, true);
+            return optionToRun;
         }
+        disposeListeners();
         return optionToRun;
     }
     _showInstance(instanceId) {
@@ -491,7 +544,6 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         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();
                 this._promptPart = undefined;
                 try {
@@ -501,8 +553,8 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                 catch {
                     resolve(undefined);
                 }
+                return ElicitationState.Accepted;
             }, async () => {
-                thePart.state = 'rejected';
                 thePart.hide();
                 this._promptPart = undefined;
                 try {
@@ -512,6 +564,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                 catch {
                     resolve(undefined);
                 }
+                return ElicitationState.Rejected;
             },
             undefined, moreActions, () => this._outputMonitorTelemetryCounters.inputToolManualShownCount++)));
             chatModel.acceptResponseProgress(request, thePart);
@@ -539,7 +592,7 @@ OutputMonitor = ( __decorate([
 ], OutputMonitor));
 function getMoreActions(suggestedOption, confirmationPrompt) {
     const moreActions = [];
-    const moreOptions = confirmationPrompt.options.filter(a => a !== (typeof suggestedOption === 'string' ? suggestedOption : suggestedOption.option));
+    const moreOptions = confirmationPrompt.options.filter(a => a !== (isString(suggestedOption) ? suggestedOption : suggestedOption.option));
     let i = 0;
     for (const option of moreOptions) {
         const label = option + (confirmationPrompt.descriptions ? ' (' + confirmationPrompt.descriptions[i] + ')' : '');
@@ -556,5 +609,18 @@ function getMoreActions(suggestedOption, confirmationPrompt) {
     }
     return moreActions.length ? moreActions : undefined;
 }
+function detectsInputRequiredPattern(cursorLine) {
+    return ([
+        /\s*(?:\[[^\]]\]\s+[^\[]+\s*)+(?:\(default is\s+"[^"]+"\):)?\s+$/,
+        /(?:\(|\[)\s*(?:y(?:es)?\s*\/\s*n(?:o)?|n(?:o)?\s*\/\s*y(?:es)?)\s*(?:\]|\))\s+$/i,
+        /[?:]\s*(?:\(|\[)?\s*y(?:es)?\s*\/\s*n(?:o)?\s*(?:\]|\))?\s+$/i,
+        /\(y\)\s*$/i,
+        /:\s*$/,
+        /\(END\)$/,
+        /password[:]?$/i,
+        /\?\s*(?:\([a-z\s]+\))?$/i,
+        /press a(?:ny)? key/i,
+    ].some(e => e.test(cursorLine)));
+}
 
-export { OutputMonitor };
+export { OutputMonitor, detectsInputRequiredPattern };

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

@@ -1,4 +1,4 @@
-import type { Task } from "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService";
+import type { Task } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService";
 import type { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import type { ILinkLocation } from "../../taskHelpers.js";
 import type { IMarker as XtermMarker } from "@xterm/xterm";
@@ -13,7 +13,7 @@ export interface IExecution {
     isActive?: () => Promise<boolean>;
     task?: Task | Pick<Task, "configurationProperties">;
     dependencyTasks?: Task[];
-    instance: Pick<ITerminalInstance, "sendText" | "instanceId" | "onDidInputData" | "onData" | "focus" | "registerMarker">;
+    instance: Pick<ITerminalInstance, "sendText" | "instanceId" | "onDidInputData" | "onDisposed" | "onData" | "focus" | "registerMarker">;
     sessionId: string | undefined;
 }
 export interface IPollingResult {

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

@@ -1,12 +1,13 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { RunInTerminalTool } from './runInTerminalTool.js';
 
 const ConfirmTerminalCommandToolData = {
     id: 'vscode_get_terminal_confirmation',
-    displayName: ( localize(11888, 'Confirm Terminal Command')),
+    displayName: ( localize(12029, 'Confirm Terminal Command')),
     modelDescription: [
         'This tool allows you to get explicit user confirmation for a terminal command without executing it.',
         '',
@@ -24,7 +25,7 @@ const ConfirmTerminalCommandToolData = {
         '',
         'After confirmation, use a tool to actually execute the command.'
     ].join('\n'),
-    userDescription: ( localize(11889, 'Tool for confirming terminal commands')),
+    userDescription: ( localize(12030, 'Tool for confirming terminal commands')),
     source: ToolDataSource.Internal,
     icon: Codicon.shield,
     inputSchema: {
@@ -52,6 +53,15 @@ const ConfirmTerminalCommandToolData = {
 };
 class ConfirmTerminalCommandTool extends RunInTerminalTool {
     async prepareToolInvocation(context, token) {
+        try {
+            const sessionUri = context.chatSessionId ? ( URI.parse(context.chatSessionId)) : undefined;
+            const sessionId = sessionUri ? this._chatService.getSession(sessionUri)?.sessionId : undefined;
+            if (sessionId) {
+                context.chatSessionId = sessionId;
+            }
+        }
+        catch {
+        }
         const preparedInvocation = await super.prepareToolInvocation(context, token);
         if (preparedInvocation) {
             preparedInvocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;

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

@@ -16,6 +16,7 @@ import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vs
 import { type IToolTerminal } from "../toolTerminalCreator.js";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare function createRunInTerminalToolData(accessor: ServicesAccessor): Promise<IToolData>;
 export interface IRunInTerminalInputParams {
     command: string;
@@ -23,7 +24,7 @@ export interface IRunInTerminalInputParams {
     isBackground: boolean;
 }
 export declare class RunInTerminalTool extends Disposable implements IToolImpl {
-    private readonly _chatService;
+    protected readonly _chatService: IChatService;
     private readonly _configurationService;
     private readonly _historyService;
     private readonly _instantiationService;
@@ -34,9 +35,11 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     private readonly _logService;
     private readonly _terminalService;
     private readonly _workspaceContextService;
+    private readonly _chatWidgetService;
     private readonly _terminalToolCreator;
     private readonly _treeSitterCommandParser;
     private readonly _telemetry;
+    private readonly _commandArtifactCollector;
     protected readonly _profileFetcher: TerminalProfileFetcher;
     private readonly _commandLineRewriters;
     private readonly _commandLineAnalyzers;
@@ -44,7 +47,7 @@ export declare class RunInTerminalTool extends Disposable implements IToolImpl {
     protected readonly _osBackend: Promise<OperatingSystem>;
     private static readonly _backgroundExecutions;
     static getBackgroundOutput(id: string): string;
-    constructor(_chatService: IChatService, _configurationService: IConfigurationService, _historyService: IHistoryService, _instantiationService: IInstantiationService, _languageModelToolsService: ILanguageModelToolsService, _remoteAgentService: IRemoteAgentService, _storageService: IStorageService, _terminalChatService: ITerminalChatService, _logService: ITerminalLogService, _terminalService: ITerminalService, _workspaceContextService: IWorkspaceContextService);
+    constructor(_chatService: IChatService, _configurationService: IConfigurationService, _historyService: IHistoryService, _instantiationService: IInstantiationService, _languageModelToolsService: ILanguageModelToolsService, _remoteAgentService: IRemoteAgentService, _storageService: IStorageService, _terminalChatService: ITerminalChatService, _logService: ITerminalLogService, _terminalService: ITerminalService, _workspaceContextService: IWorkspaceContextService, _chatWidgetService: IChatWidgetService);
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     private _handleTerminalVisibility;