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

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

@@ -122,6 +122,11 @@ async function collectTerminalResults(terminals, task, instantiationService, inv
             inputToolManualAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualAcceptCount ?? 0,
             inputToolManualRejectCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualRejectCount ?? 0,
             inputToolManualChars: outputMonitor.outputMonitorTelemetryCounters.inputToolManualChars ?? 0,
+            inputToolAutoAcceptCount: outputMonitor.outputMonitorTelemetryCounters.inputToolAutoAcceptCount ?? 0,
+            inputToolAutoChars: outputMonitor.outputMonitorTelemetryCounters.inputToolAutoChars ?? 0,
+            inputToolManualShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualShownCount ?? 0,
+            inputToolFreeFormInputShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount ?? 0,
+            inputToolFreeFormInputCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputCount ?? 0,
         });
     }
     return results;
@@ -150,9 +155,8 @@ async function taskProblemPollFn(execution, token, taskService) {
                         ))
                             : undefined
                     });
-                    const label = uri ? uri.path.split('/').pop() ?? ( uri.toString()) : '';
                     const message = marker.message ?? '';
-                    problemList.push(`Problem: ${message} in ${label} coming from ${owner}`);
+                    problemList.push(`Problem: ${message} in ${uri.fsPath} coming from ${owner} starting on line ${marker.startLineNumber}${marker.startColumn ? `, column ${marker.startColumn} and ending on line ${marker.endLineNumber}${marker.endColumn ? `, column ${marker.endColumn}` : ''}` : ''}`);
                 }
             }
             if (problemList.length === 0) {

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

@@ -36,7 +36,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         this._register(toolsService.registerTool(GetTerminalOutputToolData, getTerminalOutputTool));
         const runCommandsToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runCommands', 'runCommands', {
             icon: ThemeIcon.fromId(Codicon.terminal.id),
-            description: ( localize(11443, 'Runs commands in the terminal'))
+            description: ( localize(11543, 'Runs commands in the terminal'))
         }));
         runCommandsToolSet.addTool(RunInTerminalToolData);
         runCommandsToolSet.addTool(GetTerminalOutputToolData);
@@ -53,7 +53,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         const createAndRunTaskTool = instantiationService.createInstance(CreateAndRunTaskTool);
         this._register(toolsService.registerTool(CreateAndRunTaskToolData, createAndRunTaskTool));
         const runTasksToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runTasks', 'runTasks', {
-            description: ( localize(11444, 'Runs tasks and gets their output for your workspace')),
+            description: ( localize(11544, 'Runs tasks and gets their output for your workspace')),
         }));
         runTasksToolSet.addTool(RunTaskToolData);
         runTasksToolSet.addTool(GetTaskOutputToolData);
@@ -67,7 +67,7 @@ ChatAgentToolsContribution = ( __decorate([
 registerWorkbenchContribution2(ChatAgentToolsContribution.ID, ChatAgentToolsContribution, WorkbenchPhase.AfterRestored);
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(11445, 'Add Terminal Selection to Chat')),
+    title: ( localize(11545, 'Add Terminal Selection to Chat')),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [
         {
@@ -91,8 +91,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: 'generic',
-            name: ( localize(11446, 'Terminal Selection')),
-            fullName: ( localize(11446, 'Terminal Selection')),
+            name: ( localize(11546, 'Terminal Selection')),
+            fullName: ( localize(11546, 'Terminal Selection')),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -1,5 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { ITerminalProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
 import { type ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
@@ -23,7 +24,7 @@ export declare class ToolTerminalCreator {
      */
     private static _lastSuccessfulShell;
     constructor(_configurationService: IConfigurationService, _logService: ITerminalLogService, _terminalService: ITerminalService);
-    createTerminal(shell: string, token: CancellationToken): Promise<IToolTerminal>;
+    createTerminal(shellOrProfile: string | ITerminalProfile, token: CancellationToken): Promise<IToolTerminal>;
     /**
      * Synchronously update shell integration quality based on the terminal instance's current
      * capabilities. This is a defensive change to avoid no shell integration being sticky

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

@@ -6,6 +6,7 @@ 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 { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { TerminalCapability } from '@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { PromptInputState } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
@@ -35,12 +36,19 @@ let ToolTerminalCreator = class ToolTerminalCreator {
         this._logService = _logService;
         this._terminalService = _terminalService;
     }
-    async createTerminal(shell, token) {
-        const instance = await this._createCopilotTerminal(shell);
+    async createTerminal(shellOrProfile, token) {
+        const instance = await this._createCopilotTerminal(shellOrProfile);
         const toolTerminal = {
             instance,
             shellIntegrationQuality: ShellIntegrationQuality.None,
         };
+        const initResult = await Promise.any([
+            instance.processReady,
+            Event.toPromise(instance.onExit),
+        ]);
+        if (!isNumber(initResult) && isObject(initResult) && 'message' in initResult) {
+            throw ( new Error(initResult.message));
+        }
         const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled);
         const configuredTimeout = this._configurationService.getValue(TerminalChatAgentToolsSettingId.ShellIntegrationTimeout);
         let waitTime;
@@ -86,17 +94,28 @@ let ToolTerminalCreator = class ToolTerminalCreator {
             }
         }
     }
-    _createCopilotTerminal(shell) {
-        return this._terminalService.createTerminal({
-            config: {
-                executable: shell,
-                icon: ThemeIcon.fromId(Codicon.chatSparkle.id),
-                hideFromUser: true,
-                env: {
-                    GIT_PAGER: 'cat',
-                },
-            },
-        });
+    _createCopilotTerminal(shellOrProfile) {
+        const config = {
+            icon: ThemeIcon.fromId(Codicon.chatSparkle.id),
+            hideFromUser: true,
+            env: {
+                GIT_PAGER: 'cat',
+            }
+        };
+        if (typeof shellOrProfile === 'string') {
+            config.executable = shellOrProfile;
+        }
+        else {
+            config.executable = shellOrProfile.path;
+            config.args = shellOrProfile.args;
+            config.icon = shellOrProfile.icon ?? config.icon;
+            config.color = shellOrProfile.color;
+            config.env = {
+                ...config.env,
+                ...shellOrProfile.env
+            };
+        }
+        return this._terminalService.createTerminal({ config });
     }
     _waitForShellIntegration(instance, timeoutMs) {
         const store = ( new DisposableStore());

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

@@ -10,7 +10,7 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 const GetTerminalLastCommandToolData = {
     id: 'terminal_last_command',
     toolReferenceName: 'terminalLastCommand',
-    displayName: ( localize(11447, 'Get Terminal Last Command')),
+    displayName: ( localize(11547, '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(11448, "Getting last terminal command")),
-            pastTenseMessage: ( localize(11449, "Got last terminal command")),
+            invocationMessage: ( localize(11548, "Getting last terminal command")),
+            pastTenseMessage: ( localize(11549, "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(11450, 'Get Terminal Output')),
+    displayName: ( localize(11550, '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(11451, "Checking background terminal output")),
-            pastTenseMessage: ( localize(11452, "Checked background terminal output")),
+            invocationMessage: ( localize(11551, "Checking background terminal output")),
+            pastTenseMessage: ( localize(11552, "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(11453, 'Get Terminal Selection')),
+    displayName: ( localize(11553, '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(11454, "Reading terminal selection")),
-            pastTenseMessage: ( localize(11455, "Read terminal selection")),
+            invocationMessage: ( localize(11554, "Reading terminal selection")),
+            pastTenseMessage: ( localize(11555, "Read terminal selection")),
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -1,12 +1,14 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 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 { 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 { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
-import { IPollingResult, OutputMonitorState, IExecution } from "./types.js";
-import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+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";
 export interface IOutputMonitor extends Disposable {
     readonly pollingResult: IPollingResult & {
         pollDurationMs: number;
@@ -18,6 +20,11 @@ export interface IOutputMonitorTelemetryCounters {
     inputToolManualAcceptCount: number;
     inputToolManualRejectCount: number;
     inputToolManualChars: number;
+    inputToolAutoAcceptCount: number;
+    inputToolAutoChars: number;
+    inputToolManualShownCount: number;
+    inputToolFreeFormInputShownCount: number;
+    inputToolFreeFormInputCount: number;
 }
 export declare class OutputMonitor extends Disposable implements IOutputMonitor {
     private readonly _execution;
@@ -26,6 +33,8 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private readonly _taskService;
     private readonly _chatService;
     private readonly _chatWidgetService;
+    private readonly _configurationService;
+    private readonly _logService;
     private _state;
     get state(): OutputMonitorState;
     private _lastPromptMarker;
@@ -39,7 +48,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, token: CancellationToken, command: string, _languageModelsService: ILanguageModelsService, _taskService: ITaskService, _chatService: IChatService, _chatWidgetService: IChatWidgetService);
+    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);
     private _startMonitoring;
     private _handleIdleState;
     private _handleTimeoutState;
@@ -53,5 +62,7 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private _assessOutputForErrors;
     private _determineUserInputOptions;
     private _selectAndHandleOption;
+    private _requestFreeFormTerminalInput;
     private _confirmRunInTerminal;
+    private _createElicitationPart;
 }