@codingame/monaco-vscode-chat-service-override 24.2.0 → 25.0.0

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

@@ -48,13 +48,14 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
                     if (e === nullDevice) {
                         return e;
                     }
+                    if (/^['"].*['"]$/.test(e)) {
+                        e = this._stripSurroundingQuotes(e);
+                    }
                     const isAbsolute = options.os === OperatingSystem.Windows ? win32.isAbsolute(e) : posix.isAbsolute(e);
                     if (isAbsolute) {
-                        return URI.file(e);
-                    }
-                    else {
-                        return URI.joinPath(cwd, e);
+                        return cwd.with({ path: e });
                     }
+                    return URI.joinPath(cwd, e);
                 }));
             }
             else {
@@ -65,6 +66,13 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
         this._log('File writes detected', ( fileWrites.map(e => ( e.toString()))));
         return fileWrites;
     }
+    _stripSurroundingQuotes(text) {
+        if ((text.startsWith('"') && text.endsWith('"')) ||
+            (text.startsWith('\'') && text.endsWith('\''))) {
+            return text.slice(1, -1);
+        }
+        return text;
+    }
     _mapNullDevice(options, rawFileWrite) {
         if (options.treeSitterLanguage === TreeSitterCommandParserLanguage.PowerShell) {
             return rawFileWrite === '$null'
@@ -102,9 +110,9 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
                                 }
                             }
                             const fileUri = URI.isUri(fileWrite) ? fileWrite : URI.file(fileWrite);
-                            if (fileUri.fsPath.match(/[$\(\){}]/)) {
+                            if (fileUri.fsPath.match(/[$\(\){}`]/)) {
                                 isAutoApproveAllowed = false;
-                                this._log('File write blocked due to likely containing a variable', ( fileUri.toString()));
+                                this._log('File write blocked due to likely containing a variable or sub-command', ( fileUri.toString()));
                                 break;
                             }
                             const isInsideWorkspace = ( workspaceFolders.some(folder => folder.uri.scheme === fileUri.scheme &&
@@ -134,13 +142,13 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
             )).join(', ');
             if (!isAutoApproveAllowed) {
                 disclaimers.push(( localize(
-                    12007,
+                    12033,
                     'File write operations detected that cannot be auto approved: {0}',
                     fileWritesList
                 )));
             }
             else {
-                disclaimers.push(( localize(12008, 'File write operations detected: {0}', fileWritesList)));
+                disclaimers.push(( localize(12034, 'File write operations detected: {0}', fileWritesList)));
             }
         }
         return {

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

@@ -0,0 +1,14 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import type { ICommandLineRewriter, ICommandLineRewriterOptions, ICommandLineRewriterResult } from "./commandLineRewriter.js";
+/**
+ * Rewriter that prepends a space to commands to prevent them from being added to shell history for
+ * certain shells. This depends on $VSCODE_PREVENT_SHELL_HISTORY being handled in shell integration
+ * scripts to set `HISTCONTROL=ignorespace` (bash) or `HIST_IGNORE_SPACE` (zsh) env vars. The
+ * prepended space is harmless so we don't try to remove it if shell integration isn't functional.
+ */
+export declare class CommandLinePreventHistoryRewriter extends Disposable implements ICommandLineRewriter {
+    private readonly _configurationService;
+    constructor(_configurationService: IConfigurationService);
+    rewrite(options: ICommandLineRewriterOptions): ICommandLineRewriterResult | undefined;
+}

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

@@ -0,0 +1,31 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { isBash, isZsh } from '../../runInTerminalHelpers.js';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+
+let CommandLinePreventHistoryRewriter = class CommandLinePreventHistoryRewriter extends Disposable {
+    constructor(_configurationService) {
+        super();
+        this._configurationService = _configurationService;
+    }
+    rewrite(options) {
+        const preventShellHistory = this._configurationService.getValue(TerminalChatAgentToolsSettingId.PreventShellHistory) === true;
+        if (!preventShellHistory) {
+            return undefined;
+        }
+        if (isBash(options.shell, options.os) || isZsh(options.shell, options.os)) {
+            return {
+                rewritten: ` ${options.commandLine}`,
+                reasoning: 'Prepended with a space to exclude from shell history'
+            };
+        }
+        return undefined;
+    }
+};
+CommandLinePreventHistoryRewriter = ( __decorate([
+    ( __param(0, IConfigurationService))
+], CommandLinePreventHistoryRewriter));
+
+export { CommandLinePreventHistoryRewriter };

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

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 export declare const GetTerminalLastCommandToolData: IToolData;
 export declare class GetTerminalLastCommandTool extends Disposable implements IToolImpl {

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

@@ -4,14 +4,14 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
-import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 
 const GetTerminalLastCommandToolData = {
     id: 'terminal_last_command',
     toolReferenceName: 'terminalLastCommand',
     legacyToolReferenceFullNames: ['runCommands/terminalLastCommand'],
-    displayName: ( localize(12009, 'Get Terminal Last Command')),
+    displayName: ( localize(12035, 'Get Terminal Last Command')),
     modelDescription: 'Get the last command run in the active terminal.',
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
@@ -23,8 +23,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(12010, "Getting last terminal command")),
-            pastTenseMessage: ( localize(12011, "Got last terminal command")),
+            invocationMessage: ( localize(12036, "Getting last terminal command")),
+            pastTenseMessage: ( localize(12037, "Got last terminal command")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 export declare const GetTerminalOutputToolData: IToolData;
 export interface IGetTerminalOutputInputParams {
     id: string;

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

@@ -2,14 +2,14 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { RunInTerminalTool } from './runInTerminalTool.js';
 
 const GetTerminalOutputToolData = {
     id: 'get_terminal_output',
     toolReferenceName: 'getTerminalOutput',
     legacyToolReferenceFullNames: ['runCommands/getTerminalOutput'],
-    displayName: ( localize(12012, 'Get Terminal Output')),
+    displayName: ( localize(12038, 'Get Terminal Output')),
     modelDescription: 'Get the output of a terminal command previously started with run_in_terminal',
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -29,8 +29,8 @@ const GetTerminalOutputToolData = {
 class GetTerminalOutputTool extends Disposable {
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(12013, "Checking background terminal output")),
-            pastTenseMessage: ( localize(12014, "Checked background terminal output")),
+            invocationMessage: ( localize(12039, "Checking background terminal output")),
+            pastTenseMessage: ( localize(12040, "Checked background terminal output")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 export declare const GetTerminalSelectionToolData: IToolData;
 export declare class GetTerminalSelectionTool extends Disposable implements IToolImpl {

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

@@ -3,14 +3,14 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 
 const GetTerminalSelectionToolData = {
     id: 'terminal_selection',
     toolReferenceName: 'terminalSelection',
     legacyToolReferenceFullNames: ['runCommands/terminalSelection'],
-    displayName: ( localize(12015, 'Get Terminal Selection')),
+    displayName: ( localize(12041, 'Get Terminal Selection')),
     modelDescription: 'Get the current selection in the active terminal.',
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
@@ -22,8 +22,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(12016, "Reading terminal selection")),
-            pastTenseMessage: ( localize(12017, "Read terminal selection")),
+            invocationMessage: ( localize(12042, "Reading terminal selection")),
+            pastTenseMessage: ( localize(12043, "Read terminal selection")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -2,9 +2,9 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
-import { IToolInvocationContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IToolInvocationContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { IExecution, IPollingResult, OutputMonitorState } from "./types.js";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -71,3 +71,4 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private _getLanguageModel;
 }
 export declare function detectsInputRequiredPattern(cursorLine: string): boolean;
+export declare function detectsNonInteractiveHelpPattern(cursorLine: string): boolean;

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

@@ -8,10 +8,10 @@ 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-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 { ChatElicitationRequestPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatElicitationRequestPart';
+import { ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/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';
@@ -22,7 +22,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 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';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 let OutputMonitor = class OutputMonitor extends Disposable {
     get state() { return this._state; }
@@ -113,12 +113,24 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                 pollDurationMs: Date.now() - pollStartTime,
                 resources
             };
-            this._promptPart?.hide();
+            const promptPart = this._promptPart;
             this._promptPart = undefined;
+            if (promptPart) {
+                try {
+                    promptPart.hide();
+                }
+                catch (err) {
+                    this._logService.error('OutputMonitor: Failed to hide prompt', err);
+                }
+            }
             this._onDidFinishCommand.fire();
         }
     }
     async _handleIdleState(token) {
+        const output = this._execution.getOutput(this._lastPromptMarker);
+        if (detectsNonInteractiveHelpPattern(output)) {
+            return { shouldContinuePollling: false, output };
+        }
         const confirmationPrompt = await this._determineUserInputOptions(this._execution, token);
         if (confirmationPrompt?.detectedRequestForFreeFormInput) {
             this._outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount++;
@@ -148,7 +160,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, output: custom?.output };
+        return { resources, modelOutputEvalResponse, shouldContinuePollling: false, output: custom?.output ?? output };
     }
     async _handleTimeoutState(command, invocationContext, extended, token) {
         let continuePollingPart;
@@ -216,6 +228,10 @@ let OutputMonitor = class OutputMonitor extends Disposable {
                 waited += waitTime;
                 currentInterval = Math.min(currentInterval * 2, maxInterval);
                 const currentOutput = execution.getOutput();
+                if (detectsNonInteractiveHelpPattern(currentOutput)) {
+                    this._state = OutputMonitorState.Idle;
+                    return this._state;
+                }
                 const promptResult = detectsInputRequiredPattern(currentOutput);
                 if (promptResult) {
                     this._state = OutputMonitorState.Idle;
@@ -249,10 +265,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(12018, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
-            12019,
+        const result = this._createElicitationPart(token, context?.sessionId, ( new MarkdownString(( localize(12044, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
+            12045,
             "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes."
-        )))), '', ( localize(12020, 'Yes')), ( localize(12021, 'No')), async () => true, async () => { this._state = OutputMonitorState.Cancelled; return false; });
+        )))), '', ( localize(12046, 'Yes')), ( localize(12047, '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) {
@@ -279,6 +295,9 @@ let OutputMonitor = class OutputMonitor extends Disposable {
             return undefined;
         }
         const lastLines = execution.getOutput(this._lastPromptMarker).trimEnd().split('\n').slice(-15).join('\n');
+        if (detectsNonInteractiveHelpPattern(lastLines)) {
+            return undefined;
+        }
         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)"
@@ -300,10 +319,10 @@ let OutputMonitor = class OutputMonitor extends Disposable {
 				Response: {"prompt": "Continue", "options": ["y", "N"], "freeFormInput": false}
 
 			7. Output: "Press any key to close the terminal."
-				Response: {"prompt": "Press any key to continue...", "options": ["a"], "freeFormInput": false}
+				Response: null
 
 			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}
+				Response: null
 
 			9. Output: "Password:"
 				Response: {"prompt": "Password:", "freeFormInput": true, "options": []}
@@ -384,7 +403,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 === 'any key' || parsed === opt.replace(/['"`]/g, '').trim());
+        const validOption = confirmationPrompt.options.find(opt => parsed === opt.replace(/['"`]/g, '').trim());
         if (!validOption || index === -1) {
             return;
         }
@@ -400,11 +419,11 @@ let OutputMonitor = class OutputMonitor extends Disposable {
     }
     async _requestFreeFormTerminalInput(token, execution, confirmationPrompt) {
         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,
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(12048, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            12049,
             "{0}\nPlease provide the required input to the terminal.\n\n",
             confirmationPrompt.prompt
-        )))), '', ( localize(12024, 'Focus terminal')), undefined, () => {
+        )))), '', ( localize(12050, 'Focus terminal')), undefined, () => {
             this._showInstance(execution.instance.instanceId);
             return focusTerminalSelection;
         });
@@ -450,20 +469,20 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         return !!result;
     }
     async _confirmRunInTerminal(token, suggestedOption, execution, confirmationPrompt) {
-        let suggestedOptionValue = isString(suggestedOption) ? suggestedOption : suggestedOption.option;
+        const suggestedOptionValue = isString(suggestedOption) ? suggestedOption : suggestedOption.option;
         if (suggestedOptionValue === 'any key') {
-            suggestedOptionValue = 'a';
+            return;
         }
         const focusTerminalSelection = Symbol('focusTerminalSelection');
         let inputDataDisposable = Disposable.None;
         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,
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(12051, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            12052,
             "{0}\n Do you want to send `{1}`{2} followed by `Enter` to the terminal?",
             confirmationPrompt.prompt,
             suggestedOptionValue,
             isString(suggestedOption) ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : ''
-        )))), '', ( localize(12027, 'Allow')), ( localize(12028, 'Focus Terminal')), async (value) => {
+        )))), '', ( localize(12053, 'Allow')), ( localize(12054, 'Focus Terminal')), async (value) => {
             let option = undefined;
             if (value === true) {
                 option = suggestedOptionValue;
@@ -611,7 +630,7 @@ function getMoreActions(suggestedOption, confirmationPrompt) {
 }
 function detectsInputRequiredPattern(cursorLine) {
     return ([
-        /\s*(?:\[[^\]]\]\s+[^\[]+\s*)+(?:\(default is\s+"[^"]+"\):)?\s+$/,
+        /\s*(?:\[[^\]]\]\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,
@@ -622,5 +641,18 @@ function detectsInputRequiredPattern(cursorLine) {
         /press a(?:ny)? key/i,
     ].some(e => e.test(cursorLine)));
 }
+function detectsNonInteractiveHelpPattern(cursorLine) {
+    return ([
+        /press [h?]\s*(?:\+\s*enter)?\s*to (?:show|open|display|get|see)\s*(?:available )?(?:help|commands|options)/i,
+        /press h\s*(?:or\s*\?)?\s*(?:\+\s*enter)?\s*for (?:help|commands|options)/i,
+        /press \?\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:help|commands|options|list)/i,
+        /type\s*[h?]\s*(?:\+\s*enter)?\s*(?:for|to see|to show)\s*(?:help|commands|options)/i,
+        /hit\s*[h?]\s*(?:\+\s*enter)?\s*(?:for|to see|to show)\s*(?:help|commands|options)/i,
+        /press o\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:open|launch)(?:\s*(?:the )?(?:app|application|browser)|\s+in\s+(?:the\s+)?browser)?/i,
+        /press r\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:restart|reload|refresh)(?:\s*(?:the )?(?:server|dev server|service))?/i,
+        /press q\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:quit|exit|stop)(?:\s*(?:the )?(?:server|app|process))?/i,
+        /press u\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:show|print|display)\s*(?:the )?(?:server )?urls?/i
+    ].some(e => e.test(cursorLine)));
+}
 
-export { OutputMonitor, detectsInputRequiredPattern };
+export { OutputMonitor, detectsInputRequiredPattern, detectsNonInteractiveHelpPattern };

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

@@ -1,5 +1,5 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { RunInTerminalTool } from "./runInTerminalTool.js";
 export declare const ConfirmTerminalCommandToolData: IToolData;
 export declare class ConfirmTerminalCommandTool extends RunInTerminalTool {

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

@@ -2,12 +2,12 @@
 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 { ToolDataSource, ToolInvocationPresentation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { RunInTerminalTool } from './runInTerminalTool.js';
 
 const ConfirmTerminalCommandToolData = {
     id: 'vscode_get_terminal_confirmation',
-    displayName: ( localize(12029, 'Confirm Terminal Command')),
+    displayName: ( localize(12055, 'Confirm Terminal Command')),
     modelDescription: [
         'This tool allows you to get explicit user confirmation for a terminal command without executing it.',
         '',
@@ -25,7 +25,7 @@ const ConfirmTerminalCommandToolData = {
         '',
         'After confirmation, use a tool to actually execute the command.'
     ].join('\n'),
-    userDescription: ( localize(12030, 'Tool for confirming terminal commands')),
+    userDescription: ( localize(12056, 'Tool for confirming terminal commands')),
     source: ToolDataSource.Internal,
     icon: Codicon.shield,
     inputSchema: {

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

@@ -7,9 +7,9 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 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";
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } 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 { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";