@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -0,0 +1,133 @@
+
+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 { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+
+let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Disposable {
+    constructor(_treeSitterCommandParser, _log, _configurationService, _labelService, _workspaceContextService) {
+        super();
+        this._treeSitterCommandParser = _treeSitterCommandParser;
+        this._log = _log;
+        this._configurationService = _configurationService;
+        this._labelService = _labelService;
+        this._workspaceContextService = _workspaceContextService;
+    }
+    async analyze(options) {
+        let fileWrites;
+        try {
+            fileWrites = await this._getFileWrites(options);
+        }
+        catch (e) {
+            console.error(e);
+            this._log('Failed to get file writes via grammar', options.treeSitterLanguage);
+            return {
+                isAutoApproveAllowed: false
+            };
+        }
+        return this._getResult(options, fileWrites);
+    }
+    async _getFileWrites(options) {
+        let fileWrites = [];
+        const capturedFileWrites = await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine);
+        if (capturedFileWrites.length) {
+            const cwd = options.cwd;
+            if (cwd) {
+                this._log('Detected cwd', ( cwd.toString()));
+                fileWrites = ( capturedFileWrites.map(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);
+                    }
+                }));
+            }
+            else {
+                this._log('Cwd could not be detected');
+                fileWrites = capturedFileWrites;
+            }
+        }
+        this._log('File writes detected', ( fileWrites.map(e => ( e.toString()))));
+        return fileWrites;
+    }
+    _getResult(options, fileWrites) {
+        let isAutoApproveAllowed = true;
+        if (fileWrites.length > 0) {
+            const blockDetectedFileWrites = this._configurationService.getValue(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites);
+            switch (blockDetectedFileWrites) {
+                case 'all': {
+                    isAutoApproveAllowed = false;
+                    this._log('File writes blocked due to "all" setting');
+                    break;
+                }
+                case 'outsideWorkspace': {
+                    const workspaceFolders = this._workspaceContextService.getWorkspace().folders;
+                    if (workspaceFolders.length > 0) {
+                        for (const fileWrite of fileWrites) {
+                            if (isString(fileWrite)) {
+                                const isAbsolute = options.os === OperatingSystem.Windows ? win32.isAbsolute(fileWrite) : posix.isAbsolute(fileWrite);
+                                if (!isAbsolute) {
+                                    isAutoApproveAllowed = false;
+                                    this._log('File write blocked due to unknown terminal cwd', fileWrite);
+                                    break;
+                                }
+                            }
+                            const fileUri = URI.isUri(fileWrite) ? fileWrite : URI.file(fileWrite);
+                            if (fileUri.fsPath.match(/[$\(\){}]/)) {
+                                isAutoApproveAllowed = false;
+                                this._log('File write blocked due to likely containing a variable', ( fileUri.toString()));
+                                break;
+                            }
+                            const isInsideWorkspace = ( workspaceFolders.some(folder => folder.uri.scheme === fileUri.scheme &&
+                                (fileUri.path.startsWith(folder.uri.path + '/') || fileUri.path === folder.uri.path)));
+                            if (!isInsideWorkspace) {
+                                isAutoApproveAllowed = false;
+                                this._log('File write blocked outside workspace', ( fileUri.toString()));
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        isAutoApproveAllowed = false;
+                        this._log('File writes blocked - no workspace folders');
+                    }
+                    break;
+                }
+            }
+        }
+        const disclaimers = [];
+        if (fileWrites.length > 0) {
+            const fileWritesList = ( fileWrites.map(fw => `\`${URI.isUri(fw) ? this._labelService.getUriLabel(fw) : fw}\``)).join(', ');
+            if (!isAutoApproveAllowed) {
+                disclaimers.push(( localize(
+                    11843,
+                    'File write operations detected that cannot be auto approved: {0}',
+                    fileWritesList
+                )));
+            }
+            else {
+                disclaimers.push(( localize(11844, 'File write operations detected: {0}', fileWritesList)));
+            }
+        }
+        return {
+            isAutoApproveAllowed,
+            disclaimers,
+        };
+    }
+};
+CommandLineFileWriteAnalyzer = ( __decorate([
+    ( __param(2, IConfigurationService)),
+    ( __param(3, ILabelService)),
+    ( __param(4, IWorkspaceContextService))
+], CommandLineFileWriteAnalyzer));
+
+export { CommandLineFileWriteAnalyzer };

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

@@ -0,0 +1,5 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { ICommandLineRewriter, ICommandLineRewriterOptions, ICommandLineRewriterResult } from "./commandLineRewriter.js";
+export declare class CommandLineCdPrefixRewriter extends Disposable implements ICommandLineRewriter {
+    rewrite(options: ICommandLineRewriterOptions): ICommandLineRewriterResult | undefined;
+}

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

@@ -0,0 +1,36 @@
+
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { isPowerShell } from '../../runInTerminalHelpers.js';
+
+class CommandLineCdPrefixRewriter extends Disposable {
+    rewrite(options) {
+        if (!options.cwd) {
+            return undefined;
+        }
+        const isPwsh = isPowerShell(options.shell, options.os);
+        const cdPrefixMatch = options.commandLine.match(isPwsh
+            ? /^(?:cd(?: \/d)?|Set-Location(?: -Path)?) (?<dir>[^\s]+) ?(?:&&|;)\s+(?<suffix>.+)$/i
+            : /^cd (?<dir>[^\s]+) &&\s+(?<suffix>.+)$/);
+        const cdDir = cdPrefixMatch?.groups?.dir;
+        const cdSuffix = cdPrefixMatch?.groups?.suffix;
+        if (cdDir && cdSuffix) {
+            let cdDirPath = cdDir;
+            if (cdDirPath.startsWith('"') && cdDirPath.endsWith('"')) {
+                cdDirPath = cdDirPath.slice(1, -1);
+            }
+            cdDirPath = cdDirPath.replace(/(?:[\\\/])$/, '');
+            let cwdFsPath = options.cwd.fsPath.replace(/(?:[\\\/])$/, '');
+            if (options.os === OperatingSystem.Windows) {
+                cdDirPath = cdDirPath.toLowerCase();
+                cwdFsPath = cwdFsPath.toLowerCase();
+            }
+            if (cdDirPath === cwdFsPath) {
+                return { rewritten: cdSuffix, reasoning: 'Removed redundant cd command' };
+            }
+        }
+        return undefined;
+    }
+}
+
+export { CommandLineCdPrefixRewriter };

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

@@ -0,0 +1,8 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { TreeSitterCommandParser } from "../../treeSitterCommandParser.js";
+import type { ICommandLineRewriter, ICommandLineRewriterOptions, ICommandLineRewriterResult } from "./commandLineRewriter.js";
+export declare class CommandLinePwshChainOperatorRewriter extends Disposable implements ICommandLineRewriter {
+    private readonly _treeSitterCommandParser;
+    constructor(_treeSitterCommandParser: TreeSitterCommandParser);
+    rewrite(options: ICommandLineRewriterOptions): Promise<ICommandLineRewriterResult | undefined>;
+}

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

@@ -0,0 +1,33 @@
+
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isPowerShell } from '../../runInTerminalHelpers.js';
+
+class CommandLinePwshChainOperatorRewriter extends Disposable {
+    constructor(_treeSitterCommandParser) {
+        super();
+        this._treeSitterCommandParser = _treeSitterCommandParser;
+    }
+    async rewrite(options) {
+        if (isPowerShell(options.shell, options.os)) {
+            let doubleAmpersandCaptures;
+            try {
+                doubleAmpersandCaptures = await this._treeSitterCommandParser.extractPwshDoubleAmpersandChainOperators(options.commandLine);
+            }
+            catch {
+            }
+            if (doubleAmpersandCaptures && doubleAmpersandCaptures.length > 0) {
+                let rewritten = options.commandLine;
+                for (const capture of doubleAmpersandCaptures.reverse()) {
+                    rewritten = `${rewritten.substring(0, capture.node.startIndex)};${rewritten.substring(capture.node.endIndex)}`;
+                }
+                return {
+                    rewritten,
+                    reasoning: '&& re-written to ;'
+                };
+            }
+        }
+        return undefined;
+    }
+}
+
+export { CommandLinePwshChainOperatorRewriter };

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

@@ -0,0 +1,17 @@
+import type { MaybePromise } from "@codingame/monaco-vscode-api/vscode/vs/base/common/async";
+import type { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import type { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+export interface ICommandLineRewriter extends IDisposable {
+    rewrite(options: ICommandLineRewriterOptions): MaybePromise<ICommandLineRewriterResult | undefined>;
+}
+export interface ICommandLineRewriterOptions {
+    commandLine: string;
+    cwd: URI | undefined;
+    shell: string;
+    os: OperatingSystem;
+}
+export interface ICommandLineRewriterResult {
+    rewritten: string;
+    reasoning: string;
+}

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.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 { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { TerminalCapability } from '@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 
 const GetTerminalLastCommandToolData = {
     id: 'terminal_last_command',
     toolReferenceName: 'terminalLastCommand',
-    displayName: ( localize(11548, 'Get Terminal Last Command')),
+    displayName: ( localize(11845, 'Get Terminal Last Command')),
     modelDescription: 'Get the last command run in the active terminal.',
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
@@ -22,8 +22,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(11549, "Getting last terminal command")),
-            pastTenseMessage: ( localize(11550, "Got last terminal command")),
+            invocationMessage: ( localize(11846, "Getting last terminal command")),
+            pastTenseMessage: ( localize(11847, "Got last terminal command")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -8,7 +8,7 @@ import { RunInTerminalTool } from './runInTerminalTool.js';
 const GetTerminalOutputToolData = {
     id: 'get_terminal_output',
     toolReferenceName: 'getTerminalOutput',
-    displayName: ( localize(11551, 'Get Terminal Output')),
+    displayName: ( localize(11848, 'Get Terminal Output')),
     modelDescription: 'Get the output of a terminal command previously started with run_in_terminal',
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -28,8 +28,8 @@ const GetTerminalOutputToolData = {
 class GetTerminalOutputTool extends Disposable {
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(11552, "Checking background terminal output")),
-            pastTenseMessage: ( localize(11553, "Checked background terminal output")),
+            invocationMessage: ( localize(11849, "Checking background terminal output")),
+            pastTenseMessage: ( localize(11850, "Checked background terminal output")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -9,7 +9,7 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 const GetTerminalSelectionToolData = {
     id: 'terminal_selection',
     toolReferenceName: 'terminalSelection',
-    displayName: ( localize(11554, 'Get Terminal Selection')),
+    displayName: ( localize(11851, 'Get Terminal Selection')),
     modelDescription: 'Get the current selection in the active terminal.',
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
@@ -21,8 +21,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(11555, "Reading terminal selection")),
-            pastTenseMessage: ( localize(11556, "Read terminal selection")),
+            invocationMessage: ( localize(11852, "Reading terminal selection")),
+            pastTenseMessage: ( localize(11853, "Read terminal selection")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -9,6 +9,7 @@ import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IExecution, IPollingResult, OutputMonitorState } from "./types.js";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 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";
 export interface IOutputMonitor extends Disposable {
     readonly pollingResult: IPollingResult & {
         pollDurationMs: number;
@@ -35,6 +36,7 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private readonly _chatWidgetService;
     private readonly _configurationService;
     private readonly _logService;
+    private readonly _terminalService;
     private _state;
     get state(): OutputMonitorState;
     private _lastPromptMarker;
@@ -48,7 +50,7 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     get outputMonitorTelemetryCounters(): Readonly<IOutputMonitorTelemetryCounters>;
     private readonly _onDidFinishCommand;
     readonly onDidFinishCommand: Event<void>;
-    constructor(_execution: IExecution, _pollFn: ((execution: IExecution, token: CancellationToken, taskService: ITaskService) => Promise<IPollingResult | undefined>) | undefined, invocationContext: IToolInvocationContext | undefined, token: CancellationToken, command: string, _languageModelsService: ILanguageModelsService, _taskService: ITaskService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _configurationService: IConfigurationService, _logService: ILogService);
+    constructor(_execution: IExecution, _pollFn: ((execution: IExecution, token: CancellationToken, taskService: ITaskService) => Promise<IPollingResult | undefined>) | undefined, invocationContext: IToolInvocationContext | undefined, token: CancellationToken, command: string, _languageModelsService: ILanguageModelsService, _taskService: ITaskService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _configurationService: IConfigurationService, _logService: ILogService, _terminalService: ITerminalService);
     private _startMonitoring;
     private _handleIdleState;
     private _handleTimeoutState;
@@ -64,5 +66,7 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private _selectAndHandleOption;
     private _requestFreeFormTerminalInput;
     private _confirmRunInTerminal;
+    private _showInstance;
     private _createElicitationPart;
+    private _getLanguageModel;
 }

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

@@ -9,7 +9,7 @@ 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 { ChatModel } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-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';
@@ -19,14 +19,16 @@ import { detectsInputRequiredPattern } from '../../executeStrategy/executeStrate
 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-a175bd1a-4858-5944-9ae5-fb73305dcb13-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/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';
 
 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, _configurationService, _logService) {
+    constructor(_execution, _pollFn, invocationContext, token, command, _languageModelsService, _taskService, _chatService, _chatWidgetService, _configurationService, _logService, _terminalService) {
         super();
         this._execution = _execution;
         this._pollFn = _pollFn;
@@ -36,6 +38,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         this._chatWidgetService = _chatWidgetService;
         this._configurationService = _configurationService;
         this._logService = _logService;
+        this._terminalService = _terminalService;
         this._state = OutputMonitorState.PollingForIdle;
         this._outputMonitorTelemetryCounters = {
             inputToolManualAcceptCount: 0,
@@ -209,21 +212,16 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         let waited = 0;
         let consecutiveIdleEvents = 0;
         let hasReceivedData = false;
-        let currentOutput;
-        let onDataDisposable = Disposable.None;
+        const onDataDisposable = execution.instance.onData((_data) => {
+            hasReceivedData = true;
+        });
         try {
             while (!token.isCancellationRequested && waited < maxWaitMs) {
                 const waitTime = Math.min(currentInterval, maxWaitMs - waited);
                 await timeout(waitTime, token);
                 waited += waitTime;
                 currentInterval = Math.min(currentInterval * 2, maxInterval);
-                if (currentOutput === undefined) {
-                    currentOutput = execution.getOutput();
-                    onDataDisposable = execution.instance.onData((data) => {
-                        hasReceivedData = true;
-                        currentOutput += data;
-                    });
-                }
+                const currentOutput = execution.getOutput();
                 const promptResult = detectsInputRequiredPattern(currentOutput);
                 if (promptResult) {
                     this._state = OutputMonitorState.Idle;
@@ -239,12 +237,9 @@ 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;
-                }
                 if (recentlyIdle || isActive === false) {
-                    return OutputMonitorState.Idle;
+                    this._state = OutputMonitorState.Idle;
+                    return this._state;
                 }
             }
         }
@@ -260,18 +255,18 @@ 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(11557, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
-            11558,
+        const result = this._createElicitationPart(token, context?.sessionId, ( new MarkdownString(( localize(11854, "Continue waiting for `{0}`?", command)))), ( new MarkdownString(( localize(
+            11855,
             "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes."
-        )))), '', ( localize(11559, 'Yes')), ( localize(11560, 'No')), async () => true, async () => { this._state = OutputMonitorState.Cancelled; return false; });
+        )))), '', ( localize(11856, 'Yes')), ( localize(11857, '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' });
-        if (!models.length) {
+        const model = await this._getLanguageModel();
+        if (!model) {
             return 'No models available';
         }
-        const response = await this._languageModelsService.sendChatRequest(models[0], ( new ExtensionIdentifier('core')), [{ role: ChatMessageRole.User, content: [{ type: 'text', value: `Evaluate this terminal output to determine if there were errors. If there are errors, return them. Otherwise, return undefined: ${buffer}.` }] }], {}, token);
+        const response = await this._languageModelsService.sendChatRequest(model, ( new ExtensionIdentifier('core')), [{ role: ChatMessageRole.User, content: [{ type: 'text', value: `Evaluate this terminal output to determine if there were errors. If there are errors, return them. Otherwise, return undefined: ${buffer}.` }] }], {}, token);
         try {
             const responseFromStream = getTextResponseFromStream(response);
             await Promise.all([response.result, responseFromStream]);
@@ -285,12 +280,12 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         if (token.isCancellationRequested) {
             return;
         }
-        const models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'gpt-4o-mini' });
-        if (!models.length) {
+        const model = await this._getLanguageModel();
+        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, like "any key", 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 or non-specific (like "any key" or "some key"), return null.
 			Examples:
 			1. Output: "Do you want to overwrite? (y/n)"
 				Response: {"prompt": "Do you want to overwrite?", "options": ["y", "n"], "freeFormInput": false}
@@ -310,6 +305,12 @@ let OutputMonitor = class OutputMonitor extends Disposable {
 			6. Output: "Continue [y/N]"
 				Response: {"prompt": "Continue", "options": ["y", "N"], "freeFormInput": false}
 
+			7. Output: "Press any key to close the terminal."
+				Response: null
+
+			8. Output: "Terminal will be reused by tasks, press any key to close it."
+				Response: null
+
 			Alternatively, the prompt may request free form input, for example:
 			1. Output: "Enter your username:"
 				Response: {"prompt": "Enter your username:", "freeFormInput": true, "options": []}
@@ -318,7 +319,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
 			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(model, ( new ExtensionIdentifier('core')), [{ role: ChatMessageRole.User, content: [{ type: 'text', value: promptText }] }], {}, token);
         const responseText = await getTextResponseFromStream(response);
         try {
             const match = responseText.match(/\{[\s\S]*\}/);
@@ -332,11 +333,25 @@ 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 (Array.isArray(obj.options) && obj.options.every(isString)) {
-                        return { prompt: obj.prompt, options: obj.options, detectedRequestForFreeFormInput: obj.freeFormInput };
+                        const filteredOptions = obj.options.filter(opt => !isNonSpecificOption(opt));
+                        if (filteredOptions.length === 0) {
+                            return undefined;
+                        }
+                        return { prompt: obj.prompt, options: filteredOptions, 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)), detectedRequestForFreeFormInput: obj.freeFormInput };
+                        const keys = ( Object.keys(obj.options)).filter(key => !isNonSpecificOption(key));
+                        if (keys.length === 0) {
+                            return undefined;
+                        }
+                        const descriptions = ( keys.map(key => obj.options[key]));
+                        return { prompt: obj.prompt, options: keys, descriptions, detectedRequestForFreeFormInput: obj.freeFormInput };
                     }
                 }
             }
@@ -391,11 +406,14 @@ 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(11561, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
-            11562,
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(11858, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            11859,
             "{0}\nPlease provide the required input to the terminal.\n\n",
             confirmationPrompt.prompt
-        )))), '', ( localize(11563, 'Focus terminal')), undefined, async () => { execution.instance.focus(true); return true; });
+        )))), '', ( localize(11860, 'Focus terminal')), undefined, async () => {
+            this._showInstance(execution.instance.instanceId);
+            return true;
+        });
         const inputPromise = ( new Promise(resolve => {
             const inputDataDisposable = this._register(execution.instance.onDidInputData((data) => {
                 if (!data || data === '\r' || data === '\n' || data === '\r\n') {
@@ -412,13 +430,13 @@ let OutputMonitor = class OutputMonitor extends Disposable {
     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(11564, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
-            11565,
+        const { promise: userPrompt, part } = this._createElicitationPart(token, execution.sessionId, ( new MarkdownString(( localize(11861, "The terminal is awaiting input.")))), ( new MarkdownString(( localize(
+            11862,
             "{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(11566, 'Allow')), ( localize(11567, 'Focus Terminal')), async (value) => {
+        )))), '', ( localize(11863, 'Allow')), ( localize(11864, 'Focus Terminal')), async (value) => {
             let option = undefined;
             if (value === true) {
                 option = suggestedOptionValue;
@@ -430,6 +448,7 @@ let OutputMonitor = class OutputMonitor extends Disposable {
             this._outputMonitorTelemetryCounters.inputToolManualChars += option?.length || 0;
             return option;
         }, async () => {
+            this._showInstance(execution.instance.instanceId);
             this._state = OutputMonitorState.Cancelled;
             this._outputMonitorTelemetryCounters.inputToolManualRejectCount++;
             inputDataDisposable.dispose();
@@ -449,8 +468,19 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         }
         return optionToRun;
     }
+    _showInstance(instanceId) {
+        if (!instanceId) {
+            return;
+        }
+        const instance = this._terminalService.getInstanceFromId(instanceId);
+        if (!instance) {
+            return;
+        }
+        this._terminalService.setActiveInstance(instance);
+        this._terminalService.revealActiveTerminal(true);
+    }
     _createElicitationPart(token, sessionId, title, detail, subtitle, acceptLabel, rejectLabel, onAccept, onReject, moreActions) {
-        const chatModel = sessionId && this._chatService.getSession(sessionId);
+        const chatModel = sessionId && this._chatService.getSession(LocalChatSessionUri.forSession(sessionId));
         if (!(chatModel instanceof ChatModel)) {
             throw ( new Error('No model'));
         }
@@ -490,6 +520,13 @@ let OutputMonitor = class OutputMonitor extends Disposable {
         this._register(token.onCancellationRequested(() => part.hide()));
         return { promise, part };
     }
+    async _getLanguageModel() {
+        let models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', id: 'copilot-fast' });
+        if (!models.length) {
+            models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'gpt-4o-mini' });
+        }
+        return models.length ? models[0] : undefined;
+    }
 };
 OutputMonitor = ( __decorate([
     ( __param(5, ILanguageModelsService)),
@@ -497,7 +534,8 @@ OutputMonitor = ( __decorate([
     ( __param(7, IChatService)),
     ( __param(8, IChatWidgetService)),
     ( __param(9, IConfigurationService)),
-    ( __param(10, ILogService))
+    ( __param(10, ILogService)),
+    ( __param(11, ITerminalService))
 ], OutputMonitor));
 function getMoreActions(suggestedOption, confirmationPrompt) {
     const moreActions = [];

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

@@ -12,6 +12,7 @@ export interface IExecution {
     getOutput: (marker?: XtermMarker) => string;
     isActive?: () => Promise<boolean>;
     task?: Task | Pick<Task, "configurationProperties">;
+    dependencyTasks?: Task[];
     instance: Pick<ITerminalInstance, "sendText" | "instanceId" | "onDidInputData" | "onData" | "focus" | "registerMarker">;
     sessionId: string | undefined;
 }

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

@@ -0,0 +1,8 @@
+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 { RunInTerminalTool } from "./runInTerminalTool.js";
+export declare const ConfirmTerminalCommandToolData: IToolData;
+export declare class ConfirmTerminalCommandTool extends RunInTerminalTool {
+    prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
+    invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
+}