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

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

@@ -6,14 +6,14 @@ import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { isNumber, isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { isNumber, isObject, hasKey, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { TerminalCapability } from '@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
-import { PromptInputState } from '@codingame/monaco-vscode-45e04ac3-b807-5ae5-8818-7b9c40b6d31f-common/vscode/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
+import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { PromptInputState } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
 import { TerminalSettingId } 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 { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { getShellIntegrationTimeout } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
+import { getShellIntegrationTimeout } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
 
 var ToolTerminalCreator_1;
 var ShellLaunchType;
@@ -47,7 +47,7 @@ let ToolTerminalCreator = class ToolTerminalCreator {
             instance.processReady.then(() => processReadyTimestamp = Date.now()),
             Event.toPromise(instance.onExit),
         ]);
-        if (!isNumber(initResult) && isObject(initResult) && 'message' in initResult) {
+        if (!isNumber(initResult) && isObject(initResult) && hasKey(initResult, { message: true })) {
             throw ( new Error(initResult.message));
         }
         const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled) === true;
@@ -64,7 +64,10 @@ let ToolTerminalCreator = class ToolTerminalCreator {
                 const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
                 if (commandDetection?.promptInputModel.state === PromptInputState.Unknown) {
                     this._logService.info(`ToolTerminalCreator#createTerminal: Waiting up to 2s for PromptInputModel state to change`);
-                    await raceTimeout(Event.toPromise(commandDetection.onCommandStarted), 2000);
+                    const didStart = await raceTimeout(Event.toPromise(commandDetection.onCommandStarted), 2000);
+                    if (!didStart) {
+                        this._logService.info(`ToolTerminalCreator#createTerminal: PromptInputModel state did not change within timeout`);
+                    }
                 }
             }
             if (shellIntegrationQuality !== ShellIntegrationQuality.None) {
@@ -97,7 +100,7 @@ let ToolTerminalCreator = class ToolTerminalCreator {
                 GIT_PAGER: 'cat',
             }
         };
-        if (typeof shellOrProfile === 'string') {
+        if (isString(shellOrProfile)) {
             config.executable = shellOrProfile;
         }
         else {

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

@@ -14,9 +14,21 @@ export interface ICommandLineAnalyzerOptions {
     os: OperatingSystem;
     treeSitterLanguage: TreeSitterCommandParserLanguage;
     terminalToolSessionId: string;
+    chatSessionId: string | undefined;
 }
 export interface ICommandLineAnalyzerResult {
+    /**
+     * Whether auto approval is allowed based on the analysis, when false this
+     * will block auto approval.
+    */
     readonly isAutoApproveAllowed: boolean;
+    /**
+     * Whether the command line was explicitly auto approved by this analyzer.
+     * - `true`: This analyzer explicitly approves auto-execution
+     * - `false`: This analyzer explicitly denies auto-execution
+     * - `undefined`: This analyzer does not make an approval/denial decision
+     */
+    readonly isAutoApproved?: boolean;
     readonly disclaimers?: readonly string[];
     readonly autoApproveInfo?: IMarkdownString;
     readonly customActions?: ToolConfirmationAction[];

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

@@ -1,6 +1,7 @@
 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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import type { RunInTerminalToolTelemetry } from "../../runInTerminalToolTelemetry.js";
 import { type TreeSitterCommandParser } from "../../treeSitterCommandParser.js";
@@ -11,8 +12,9 @@ export declare class CommandLineAutoApproveAnalyzer extends Disposable implement
     private readonly _log;
     private readonly _configurationService;
     private readonly _storageService;
+    private readonly _terminalChatService;
     private readonly _commandLineAutoApprover;
-    constructor(_treeSitterCommandParser: TreeSitterCommandParser, _telemetry: RunInTerminalToolTelemetry, _log: (message: string, ...args: unknown[]) => void, _configurationService: IConfigurationService, instantiationService: IInstantiationService, _storageService: IStorageService);
+    constructor(_treeSitterCommandParser: TreeSitterCommandParser, _telemetry: RunInTerminalToolTelemetry, _log: (message: string, ...args: unknown[]) => void, _configurationService: IConfigurationService, instantiationService: IInstantiationService, _storageService: IStorageService, _terminalChatService: ITerminalChatService);
     analyze(options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult>;
     private _createAutoApproveInfo;
 }

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

@@ -6,14 +6,15 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
-import { openTerminalSettingsLinkCommandId } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart';
+import { TerminalToolConfirmationStorageKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-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 { CommandLineAutoApprover } from '../../commandLineAutoApprover.js';
 import { isPowerShell, generateAutoApproveActions, dedupeRules } from '../../runInTerminalHelpers.js';
+import { TerminalChatCommandId } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 
 const promptInjectionWarningCommandsLower = [
     'curl',
@@ -26,16 +27,32 @@ const promptInjectionWarningCommandsLowerPwshOnly = [
     'iwr',
 ];
 let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extends Disposable {
-    constructor(_treeSitterCommandParser, _telemetry, _log, _configurationService, instantiationService, _storageService) {
+    constructor(_treeSitterCommandParser, _telemetry, _log, _configurationService, instantiationService, _storageService, _terminalChatService) {
         super();
         this._treeSitterCommandParser = _treeSitterCommandParser;
         this._telemetry = _telemetry;
         this._log = _log;
         this._configurationService = _configurationService;
         this._storageService = _storageService;
+        this._terminalChatService = _terminalChatService;
         this._commandLineAutoApprover = this._register(instantiationService.createInstance(CommandLineAutoApprover));
     }
     async analyze(options) {
+        if (options.chatSessionId && this._terminalChatService.hasChatSessionAutoApproval(options.chatSessionId)) {
+            this._log('Session has auto approval enabled, auto approving command');
+            const disableUri = createCommandUri(TerminalChatCommandId.DisableSessionAutoApproval, options.chatSessionId);
+            const mdTrustSettings = {
+                isTrusted: {
+                    enabledCommands: [TerminalChatCommandId.DisableSessionAutoApproval]
+                }
+            };
+            return {
+                isAutoApproved: true,
+                isAutoApproveAllowed: true,
+                disclaimers: [],
+                autoApproveInfo: ( new MarkdownString(`${( localize(11997, 'Auto approved for this session'))} ([${( localize(11998, 'Disable'))}](${( disableUri.toString())}))`, mdTrustSettings)),
+            };
+        }
         let subCommands;
         try {
             subCommands = await this._treeSitterCommandParser.extractSubCommands(options.treeSitterLanguage, options.commandLine);
@@ -122,7 +139,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         if (!isAutoApproved && (( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLower.includes(command))) ||
             (isPowerShell(options.shell, options.os) && ( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLowerPwshOnly.includes(command)))))) {
             disclaimers.push(( localize(
-                11858,
+                11999,
                 'Web content may contain malicious code or attempt prompt injection attacks.'
             )));
         }
@@ -130,7 +147,8 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
             customActions = generateAutoApproveActions(options.commandLine, subCommands, { subCommandResults, commandLineResult });
         }
         return {
-            isAutoApproveAllowed: isAutoApproved,
+            isAutoApproved,
+            isAutoApproveAllowed: true,
             disclaimers,
             autoApproveInfo,
             customActions,
@@ -139,23 +157,23 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
     _createAutoApproveInfo(isAutoApproved, isDenied, autoApproveReason, subCommandResults, commandLineResult) {
         const formatRuleLinks = (result) => {
             return ( asArray(result).map(e => {
-                const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, e.rule.sourceTarget);
-                return `[\`${e.rule.sourceText}\`](${( settingsUri.toString())} "${( localize(11859, 'View rule in settings'))}")`;
+                const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, e.rule.sourceTarget);
+                return `[\`${e.rule.sourceText}\`](${( settingsUri.toString())} "${( localize(12000, 'View rule in settings'))}")`;
             })).join(', ');
         };
         const mdTrustSettings = {
             isTrusted: {
-                enabledCommands: [openTerminalSettingsLinkCommandId]
+                enabledCommands: [TerminalChatCommandId.OpenTerminalSettingsLink]
             }
         };
         const config = this._configurationService.inspect(ChatConfiguration.GlobalAutoApprove);
         const isGlobalAutoApproved = config?.value ?? config.defaultValue;
         if (isGlobalAutoApproved) {
-            const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, 'global');
+            const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, 'global');
             return (new MarkdownString(`${( localize(
-                11860,
+                12001,
                 'Auto approved by setting {0}',
-                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(11861, 'View settings'))}")`
+                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(12002, 'View settings'))}")`
             ))}`, mdTrustSettings));
         }
         if (isAutoApproved) {
@@ -163,7 +181,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 case 'commandLine': {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(
-                            localize(11862, 'Auto approved by rule {0}', formatRuleLinks(commandLineResult)),
+                            localize(12003, 'Auto approved by rule {0}', formatRuleLinks(commandLineResult)),
                             mdTrustSettings
                         ));
                     }
@@ -173,13 +191,13 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults);
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(11862, 'Auto approved by rule {0}', formatRuleLinks(uniqueRules)),
+                            localize(12003, 'Auto approved by rule {0}', formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }
                     else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(11863, 'Auto approved by rules {0}', formatRuleLinks(uniqueRules)),
+                            localize(12004, 'Auto approved by rules {0}', formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }
@@ -192,7 +210,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 case 'commandLine': {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(localize(
-                            11864,
+                            12005,
                             'Auto approval denied by rule {0}',
                             formatRuleLinks(commandLineResult)
                         ), mdTrustSettings));
@@ -203,12 +221,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === 'denied'));
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(11864, 'Auto approval denied by rule {0}', formatRuleLinks(uniqueRules))
+                            localize(12005, 'Auto approval denied by rule {0}', formatRuleLinks(uniqueRules))
                         ));
                     }
                     else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(11865, 'Auto approval denied by rules {0}', formatRuleLinks(uniqueRules))
+                            localize(12006, 'Auto approval denied by rules {0}', formatRuleLinks(uniqueRules))
                         ));
                     }
                     break;
@@ -221,7 +239,8 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
 CommandLineAutoApproveAnalyzer = ( __decorate([
     ( __param(3, IConfigurationService)),
     ( __param(4, IInstantiationService)),
-    ( __param(5, IStorageService))
+    ( __param(5, IStorageService)),
+    ( __param(6, ITerminalChatService))
 ], CommandLineAutoApproveAnalyzer));
 
 export { CommandLineAutoApproveAnalyzer };

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

@@ -13,5 +13,6 @@ export declare class CommandLineFileWriteAnalyzer extends Disposable implements
     constructor(_treeSitterCommandParser: TreeSitterCommandParser, _log: (message: string, ...args: unknown[]) => void, _configurationService: IConfigurationService, _labelService: ILabelService, _workspaceContextService: IWorkspaceContextService);
     analyze(options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult>;
     private _getFileWrites;
+    private _mapNullDevice;
     private _getResult;
 }

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

@@ -6,11 +6,13 @@ import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 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 { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TreeSitterCommandParserLanguage } from '../../treeSitterCommandParser.js';
 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';
 
+const nullDevice = Symbol('null device');
 let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Disposable {
     constructor(_treeSitterCommandParser, _log, _configurationService, _labelService, _workspaceContextService) {
         super();
@@ -36,12 +38,16 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
     }
     async _getFileWrites(options) {
         let fileWrites = [];
-        const capturedFileWrites = await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine);
+        const capturedFileWrites = ( (await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine))
+            .map(this._mapNullDevice.bind(this, options)));
         if (capturedFileWrites.length) {
             const cwd = options.cwd;
             if (cwd) {
                 this._log('Detected cwd', ( cwd.toString()));
                 fileWrites = ( capturedFileWrites.map(e => {
+                    if (e === nullDevice) {
+                        return e;
+                    }
                     const isAbsolute = options.os === OperatingSystem.Windows ? win32.isAbsolute(e) : posix.isAbsolute(e);
                     if (isAbsolute) {
                         return URI.file(e);
@@ -59,6 +65,16 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
         this._log('File writes detected', ( fileWrites.map(e => ( e.toString()))));
         return fileWrites;
     }
+    _mapNullDevice(options, rawFileWrite) {
+        if (options.treeSitterLanguage === TreeSitterCommandParserLanguage.PowerShell) {
+            return rawFileWrite === '$null'
+                ? nullDevice
+                : rawFileWrite;
+        }
+        return rawFileWrite === '/dev/null'
+            ? nullDevice
+            : rawFileWrite;
+    }
     _getResult(options, fileWrites) {
         let isAutoApproveAllowed = true;
         if (fileWrites.length > 0) {
@@ -73,6 +89,10 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
                     const workspaceFolders = this._workspaceContextService.getWorkspace().folders;
                     if (workspaceFolders.length > 0) {
                         for (const fileWrite of fileWrites) {
+                            if (fileWrite === nullDevice) {
+                                this._log('File write to null device allowed', URI.isUri(fileWrite) ? ( fileWrite.toString()) : fileWrite);
+                                continue;
+                            }
                             if (isString(fileWrite)) {
                                 const isAbsolute = options.os === OperatingSystem.Windows ? win32.isAbsolute(fileWrite) : posix.isAbsolute(fileWrite);
                                 if (!isAbsolute) {
@@ -97,8 +117,11 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
                         }
                     }
                     else {
-                        isAutoApproveAllowed = false;
-                        this._log('File writes blocked - no workspace folders');
+                        const hasOnlyNullDevices = fileWrites.every(fw => fw === nullDevice);
+                        if (!hasOnlyNullDevices) {
+                            isAutoApproveAllowed = false;
+                            this._log('File writes blocked - no workspace folders');
+                        }
                     }
                     break;
                 }
@@ -106,16 +129,18 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
         }
         const disclaimers = [];
         if (fileWrites.length > 0) {
-            const fileWritesList = ( fileWrites.map(fw => `\`${URI.isUri(fw) ? this._labelService.getUriLabel(fw) : fw}\``)).join(', ');
+            const fileWritesList = ( fileWrites.map(
+                fw => `\`${URI.isUri(fw) ? this._labelService.getUriLabel(fw) : fw === nullDevice ? '/dev/null' : ( fw.toString())}\``
+            )).join(', ');
             if (!isAutoApproveAllowed) {
                 disclaimers.push(( localize(
-                    11866,
+                    12007,
                     'File write operations detected that cannot be auto approved: {0}',
                     fileWritesList
                 )));
             }
             else {
-                disclaimers.push(( localize(11867, 'File write operations detected: {0}', fileWritesList)));
+                disclaimers.push(( localize(12008, 'File write operations detected: {0}', fileWritesList)));
             }
         }
         return {

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

@@ -3,14 +3,15 @@ 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-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
+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 { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 
 const GetTerminalLastCommandToolData = {
     id: 'terminal_last_command',
     toolReferenceName: 'terminalLastCommand',
-    displayName: ( localize(11868, 'Get Terminal Last Command')),
+    legacyToolReferenceFullNames: ['runCommands/terminalLastCommand'],
+    displayName: ( localize(12009, 'Get Terminal Last Command')),
     modelDescription: 'Get the last command run in the active terminal.',
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
@@ -22,8 +23,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(11869, "Getting last terminal command")),
-            pastTenseMessage: ( localize(11870, "Got last terminal command")),
+            invocationMessage: ( localize(12010, "Getting last terminal command")),
+            pastTenseMessage: ( localize(12011, "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,8 @@ import { RunInTerminalTool } from './runInTerminalTool.js';
 const GetTerminalOutputToolData = {
     id: 'get_terminal_output',
     toolReferenceName: 'getTerminalOutput',
-    displayName: ( localize(11871, 'Get Terminal Output')),
+    legacyToolReferenceFullNames: ['runCommands/getTerminalOutput'],
+    displayName: ( localize(12012, '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 +29,8 @@ const GetTerminalOutputToolData = {
 class GetTerminalOutputTool extends Disposable {
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(11872, "Checking background terminal output")),
-            pastTenseMessage: ( localize(11873, "Checked background terminal output")),
+            invocationMessage: ( localize(12013, "Checking background terminal output")),
+            pastTenseMessage: ( localize(12014, "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,8 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 const GetTerminalSelectionToolData = {
     id: 'terminal_selection',
     toolReferenceName: 'terminalSelection',
-    displayName: ( localize(11874, 'Get Terminal Selection')),
+    legacyToolReferenceFullNames: ['runCommands/terminalSelection'],
+    displayName: ( localize(12015, 'Get Terminal Selection')),
     modelDescription: 'Get the current selection in the active terminal.',
     source: ToolDataSource.Internal,
     icon: Codicon.terminal,
@@ -21,8 +22,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(11875, "Reading terminal selection")),
-            pastTenseMessage: ( localize(11876, "Read terminal selection")),
+            invocationMessage: ( localize(12016, "Reading terminal selection")),
+            pastTenseMessage: ( localize(12017, "Read terminal selection")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -70,3 +70,4 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private _createElicitationPart;
     private _getLanguageModel;
 }
+export declare function detectsInputRequiredPattern(cursorLine: string): boolean;