@codingame/monaco-vscode-chat-service-override 26.2.2 → 27.0.0

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

@@ -152,7 +152,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         const firstSubcommandFirstWord = unapprovedSubCommands.length > 0 ? unapprovedSubCommands[0].split(" ")[0] : "";
         if (firstSubcommandFirstWord !== commandLine && !( commandsWithSubcommands.has(commandLine)) && !( commandsWithSubSubCommands.has(commandLine))) {
             actions.push({
-                label: ( localize(12532, "Allow Exact Command Line in this Session")),
+                label: ( localize(13346, "Allow Exact Command Line in this Session")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -166,7 +166,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(12533, "Allow Exact Command Line in this Workspace")),
+                label: ( localize(13347, "Allow Exact Command Line in this Workspace")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -180,7 +180,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(12534, "Always Allow Exact Command Line")),
+                label: ( localize(13348, "Always Allow Exact Command Line")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -199,15 +199,15 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(12535, "Allow All Commands in this Session")),
-        tooltip: ( localize(12536, "Allow this tool to run in this session without confirmation.")),
+        label: ( localize(13349, "Allow All Commands in this Session")),
+        tooltip: ( localize(13350, "Allow this tool to run in this session without confirmation.")),
         data: {
             type: "sessionApproval"
         }
     });
     actions.push(( new Separator()));
     actions.push({
-        label: ( localize(12537, "Configure Auto Approve...")),
+        label: ( localize(13351, "Configure Auto Approve...")),
         data: {
             type: "configure"
         }

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

@@ -37,11 +37,14 @@ export interface IConfiguredTask {
     label?: string;
     type?: string;
     script?: string;
-    command?: string;
+    command?: string | {
+        name?: string;
+    };
     args?: string[];
     isBackground?: boolean;
     problemMatcher?: string[];
     group?: string;
+    hide?: boolean;
 }
 export declare function resolveDependencyTasks(parentTask: Task, workspaceFolder: string, configurationService: IConfigurationService, taskService: ITaskService): Promise<Task[] | undefined>;
 /**

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

@@ -22,12 +22,13 @@ function getTaskDefinition(id) {
     };
 }
 function getTaskRepresentation(task) {
-    if ("label" in task && task.label) {
+    if (Object.hasOwn(task, "label") && task.label) {
         return task.label;
-    } else if ("script" in task && task.script) {
+    } else if (Object.hasOwn(task, "script") && task.script) {
         return task.script;
-    } else if ("command" in task && task.command) {
-        return isString(task.command) ? task.command : task.command.name?.toString() || "";
+    } else if (Object.hasOwn(task, "command") && task.command) {
+        const command = task.command;
+        return isString(command) ? command : command.name?.toString() || "";
     }
     return "";
 }
@@ -67,7 +68,7 @@ async function getTaskForTool(
         }
     }
     for (const configTask of configTasks) {
-        if ((!allowParentTask && !configTask.type) || ("hide" in configTask && configTask.hide)) {
+        if ((!allowParentTask && !configTask.type) || (Object.hasOwn(configTask, "hide") && configTask.hide)) {
             continue;
         }
         if ((configTask.type && taskDefinition.taskType ? configTask.type === taskDefinition.taskType : true) && ((getTaskRepresentation(configTask) === taskDefinition?.taskLabel) || (id === configTask.label))) {
@@ -155,15 +156,15 @@ async function collectTerminalResults(
         if (dependencyTasks?.length) {
             const reconnectionData = instance.reconnectionProperties?.data;
             if (reconnectionData) {
-                if (reconnectionData.lastTask in commonTaskIdToTaskMap) {
+                if (Object.hasOwn(commonTaskIdToTaskMap, reconnectionData.lastTask)) {
                     terminalTask = commonTaskIdToTaskMap[reconnectionData.lastTask];
-                } else if (reconnectionData.id in taskIdToTaskMap) {
+                } else if (Object.hasOwn(taskIdToTaskMap, reconnectionData.id)) {
                     terminalTask = taskIdToTaskMap[reconnectionData.id];
                 }
             } else {
-                if (instance.shellLaunchConfig.name && instance.shellLaunchConfig.name in taskLabelToTaskMap) {
+                if (instance.shellLaunchConfig.name && Object.hasOwn(taskLabelToTaskMap, instance.shellLaunchConfig.name)) {
                     terminalTask = taskLabelToTaskMap[instance.shellLaunchConfig.name];
-                } else if (instance.title in taskLabelToTaskMap) {
+                } else if (Object.hasOwn(taskLabelToTaskMap, instance.title)) {
                     terminalTask = taskLabelToTaskMap[instance.title];
                 }
             }
@@ -174,7 +175,7 @@ async function collectTerminalResults(
             isActive: isActive ? () => isActive(terminalTask) : undefined,
             instance,
             dependencyTasks,
-            sessionId: invocationContext.sessionId
+            sessionResource: invocationContext.sessionResource
         };
         if (terminalTask.configurationProperties.problemMatchers && terminalTask.configurationProperties.problemMatchers.length > 0 && taskService) {
             const maxWaitTime = 1000;
@@ -187,10 +188,11 @@ async function collectTerminalResults(
                 await timeout(100);
             }
         }
+        const hasProblemMatchers = terminalTask.configurationProperties.problemMatchers && terminalTask.configurationProperties.problemMatchers.length > 0;
         const outputMonitor = disposableStore.add(instantiationService.createInstance(
             OutputMonitor,
             execution,
-            taskProblemPollFn,
+            hasProblemMatchers ? taskProblemPollFn : undefined,
             invocationContext,
             token,
             task._label

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

@@ -126,7 +126,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(12538, "Add Terminal Selection to Chat")),
+    title: ( localize(13352, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -147,8 +147,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(12539, "Terminal Selection")),
-            fullName: ( localize(12539, "Terminal Selection")),
+            name: ( localize(13353, "Terminal Selection")),
+            fullName: ( localize(13353, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -112,7 +112,9 @@ let ToolTerminalCreator = class ToolTerminalCreator {
     _createCopilotTerminal(shellOrProfile, os) {
         const shellPath = isString(shellOrProfile) ? shellOrProfile : shellOrProfile.path;
         const env = {
-            GIT_PAGER: "cat"
+            GIT_PAGER: "cat",
+            GIT_MERGE_AUTOEDIT: "no",
+            GIT_EDITOR: ":"
         };
         const preventShellHistory = this._configurationService.getValue(TerminalChatAgentToolsSettingId.PreventShellHistory) === true;
         if (preventShellHistory) {

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

@@ -11,7 +11,7 @@ import { timeout, raceCancellationError } from '@codingame/monaco-vscode-api/vsc
 const AwaitTerminalToolData = {
     id: TerminalToolId.AwaitTerminal,
     toolReferenceName: "awaitTerminal",
-    displayName: ( localize(12540, "Await Terminal")),
+    displayName: ( localize(13354, "Await Terminal")),
     modelDescription: "Wait for a background terminal command to complete. Returns the output, exit code, or timeout status.",
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -33,8 +33,8 @@ const AwaitTerminalToolData = {
 class AwaitTerminalTool extends Disposable {
     async prepareToolInvocation(_context, _token) {
         return {
-            invocationMessage: ( localize(12541, "Awaiting terminal completion")),
-            pastTenseMessage: ( localize(12542, "Awaited terminal completion"))
+            invocationMessage: ( localize(13355, "Awaiting terminal completion")),
+            pastTenseMessage: ( localize(13356, "Awaited terminal completion"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -154,7 +154,7 @@ let NpmScriptAutoApprover = class NpmScriptAutoApprover extends Disposable {
             isAutoApproved: true,
             scriptName,
             autoApproveInfo: ( new MarkdownString(( localize(
-                12543,
+                13357,
                 "Auto approved as {0} is defined in package.json",
                 `\`${scriptName}\``
             ))))

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

@@ -55,7 +55,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 isAutoApproved: true,
                 isAutoApproveAllowed: true,
                 disclaimers: [],
-                autoApproveInfo: ( new MarkdownString(`${( localize(12544, "Auto approved for this session"))} ([${( localize(12545, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
+                autoApproveInfo: ( new MarkdownString(`${( localize(13358, "Auto approved for this session"))} ([${( localize(13359, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
             };
         }
         const trimmedCommandLine = options.commandLine.trimStart();
@@ -148,7 +148,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         const subCommandsLowerFirstWordOnly = ( subCommands.map(command => command.split(" ")[0].toLowerCase()));
         if (!isAutoApproved && (( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLower.includes(command))) || (isPowerShell(options.shell, options.os) && ( subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLowerPwshOnly.includes(command)))))) {
             disclaimers.push(( localize(
-                12546,
+                13360,
                 "Web content may contain malicious code or attempt prompt injection attacks."
             )));
         }
@@ -189,10 +189,10 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
             return ( asArray(result).filter(e => isAutoApproveRule(e.rule)).map(e => {
                 const escapedSourceText = e.rule.sourceText.replaceAll("$", "\\$");
                 if (e.rule.sourceTarget === "session") {
-                    return localize(12547, "{0} (session)", `\`${escapedSourceText}\``);
+                    return localize(13361, "{0} (session)", `\`${escapedSourceText}\``);
                 }
                 const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, e.rule.sourceTarget);
-                const tooltip = ( localize(12548, "View rule in settings"));
+                const tooltip = ( localize(13362, "View rule in settings"));
                 let label = escapedSourceText;
                 switch (e.rule?.sourceTarget) {
                 case ConfigurationTarget.DEFAULT:
@@ -223,9 +223,9 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         if (isGlobalAutoApproved) {
             const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, "global");
             return (new MarkdownString(`${( localize(
-                12549,
+                13363,
                 "Auto approved by setting {0}",
-                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(12550, "View settings"))}")`
+                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(13364, "View settings"))}")`
             ))}`, mdTrustSettings));
         }
         if (isAutoApproved) {
@@ -234,7 +234,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (isAutoApproveRule(commandLineResult.rule)) {
                         return (new MarkdownString(
-                            localize(12551, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
+                            localize(13365, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
                             mdTrustSettings
                         ));
                     }
@@ -249,12 +249,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults);
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(12551, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(13365, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(12552, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(13366, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }
@@ -267,7 +267,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(localize(
-                            12553,
+                            13367,
                             "Auto approval denied by rule {0}",
                             formatRuleLinks(commandLineResult)
                         ), mdTrustSettings));
@@ -279,12 +279,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === "denied"));
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(12553, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(13367, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(12554, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(13368, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }

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

@@ -149,12 +149,12 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
             )).join(", ");
             if (!isAutoApproveAllowed) {
                 disclaimers.push(( localize(
-                    12555,
+                    13369,
                     "File write operations detected that cannot be auto approved: {0}",
                     fileWritesList
                 )));
             } else {
-                disclaimers.push(( localize(12556, "File write operations detected: {0}", fileWritesList)));
+                disclaimers.push(( localize(13370, "File write operations detected: {0}", fileWritesList)));
             }
         }
         return {

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

@@ -12,7 +12,7 @@ const GetTerminalLastCommandToolData = {
     id: TerminalToolId.TerminalLastCommand,
     toolReferenceName: "terminalLastCommand",
     legacyToolReferenceFullNames: ["runCommands/terminalLastCommand"],
-    displayName: ( localize(12557, "Get Terminal Last Command")),
+    displayName: ( localize(13371, "Get Terminal Last Command")),
     modelDescription: "Get the last command run in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -24,8 +24,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(12558, "Getting last terminal command")),
-            pastTenseMessage: ( localize(12559, "Got last terminal command"))
+            invocationMessage: ( localize(13372, "Getting last terminal command")),
+            pastTenseMessage: ( localize(13373, "Got last terminal command"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -10,7 +10,7 @@ const GetTerminalOutputToolData = {
     id: TerminalToolId.GetTerminalOutput,
     toolReferenceName: "getTerminalOutput",
     legacyToolReferenceFullNames: ["runCommands/getTerminalOutput"],
-    displayName: ( localize(12560, "Get Terminal Output")),
+    displayName: ( localize(13374, "Get Terminal Output")),
     modelDescription: `Get the output of a terminal command previously started with ${TerminalToolId.RunInTerminal}`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -28,8 +28,8 @@ const GetTerminalOutputToolData = {
 class GetTerminalOutputTool extends Disposable {
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(12561, "Checking background terminal output")),
-            pastTenseMessage: ( localize(12562, "Checked background terminal output"))
+            invocationMessage: ( localize(13375, "Checking background terminal output")),
+            pastTenseMessage: ( localize(13376, "Checked background terminal output"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -11,7 +11,7 @@ const GetTerminalSelectionToolData = {
     id: TerminalToolId.TerminalSelection,
     toolReferenceName: "terminalSelection",
     legacyToolReferenceFullNames: ["runCommands/terminalSelection"],
-    displayName: ( localize(12563, "Get Terminal Selection")),
+    displayName: ( localize(13377, "Get Terminal Selection")),
     modelDescription: "Get the current selection in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -23,8 +23,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(12564, "Reading terminal selection")),
-            pastTenseMessage: ( localize(12565, "Read terminal selection"))
+            invocationMessage: ( localize(13378, "Reading terminal selection")),
+            pastTenseMessage: ( localize(13379, "Read terminal selection"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

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

@@ -9,7 +9,7 @@ import { TerminalToolId } from './toolIds.js';
 const KillTerminalToolData = {
     id: TerminalToolId.KillTerminal,
     toolReferenceName: "killTerminal",
-    displayName: ( localize(12566, "Kill Terminal")),
+    displayName: ( localize(13380, "Kill Terminal")),
     modelDescription: `Kill a terminal by its ID. Use this to clean up terminals that are no longer needed (e.g., after stopping a server or when a long-running task completes). The terminal ID is returned by ${TerminalToolId.RunInTerminal} when isBackground=true.`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -27,8 +27,8 @@ const KillTerminalToolData = {
 class KillTerminalTool extends Disposable {
     async prepareToolInvocation(_context, _token) {
         return {
-            invocationMessage: ( localize(12567, "Killing terminal")),
-            pastTenseMessage: ( localize(12568, "Killed terminal"))
+            invocationMessage: ( localize(13381, "Killing terminal")),
+            pastTenseMessage: ( localize(13382, "Killed terminal"))
         };
     }
     async invoke(invocation, _countTokens, _progress, _token) {

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

@@ -39,6 +39,8 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private readonly _terminalService;
     private _state;
     get state(): OutputMonitorState;
+    private _formatLastLineForLog;
+    private _formatOptionsForLog;
     private _lastPromptMarker;
     private _lastPrompt;
     private _promptPart;
@@ -77,6 +79,9 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private _cleanupIdleInputListener;
     private _assessOutputForErrors;
     private _determineUserInputOptions;
+    private _isSensitivePrompt;
+    private _normalizeAutoReplyInput;
+    private _extractExplicitInputFromPrompt;
     private _selectAndHandleOption;
     private _requestFreeFormTerminalInput;
     private _confirmRunInTerminal;
@@ -84,6 +89,10 @@ export declare class OutputMonitor extends Disposable implements IOutputMonitor
     private _createElicitationPart;
     private _getLanguageModel;
 }
+export declare function matchTerminalPromptOption(options: readonly string[], suggestedOption: string): {
+    option: string | undefined;
+    index: number;
+};
 export declare function detectsInputRequiredPattern(cursorLine: string): boolean;
 export declare function detectsNonInteractiveHelpPattern(cursorLine: string): boolean;
 /**