@codingame/monaco-vscode-chat-service-override 37.1.0 → 37.3.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.js

@@ -13,7 +13,7 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
 import { ITerminalService, ITerminalGroupService, ITerminalEditorService, ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { registerActiveXtermAction } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
+import { registerActiveXtermAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
 import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
 import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from './terminalChat.js';
@@ -33,8 +33,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(17323, "Open Inline Chat")),
-    category: ( localize2(17324, "Terminal")),
+    title: ( localize2(19466, "Open Inline Chat")),
+    category: ( localize2(19467, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -78,7 +78,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(17325, "Close")),
+    title: ( localize2(19468, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -103,8 +103,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(17326, "Run Chat Command")),
-    shortTitle: ( localize2(17327, "Run")),
+    title: ( localize2(19469, "Run Chat Command")),
+    shortTitle: ( localize2(19470, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -132,8 +132,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(17328, "Run First Chat Command")),
-    shortTitle: ( localize2(17329, "Run First")),
+    title: ( localize2(19471, "Run First Chat Command")),
+    shortTitle: ( localize2(19472, "Run First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -161,8 +161,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(17330, "Insert Chat Command")),
-    shortTitle: ( localize2(17331, "Insert")),
+    title: ( localize2(19473, "Insert Chat Command")),
+    shortTitle: ( localize2(19474, "Insert")),
     category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -191,8 +191,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(17332, "Insert First Chat Command")),
-    shortTitle: ( localize2(17333, "Insert First")),
+    title: ( localize2(19475, "Insert First Chat Command")),
+    shortTitle: ( localize2(19476, "Insert First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -220,7 +220,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(17334, "Rerun Request")),
+    title: ( localize2(19477, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -261,7 +261,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(17335, "View in Chat")),
+    title: ( localize2(19478, "View in Chat")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -287,8 +287,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(17336, "View Hidden Chat Terminals")),
-            category: ( localize2(17337, "Terminal")),
+            title: ( localize2(19479, "View Hidden Chat Terminals")),
+            category: ( localize2(19480, "Terminal")),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -335,7 +335,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             return;
         }
         const items = [];
-        const lastCommandLocalized = command => ( localize2(17338, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(19481, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
@@ -387,10 +387,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(17339, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(19482, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(17340, "Chat Terminals")).value;
+        qp.title = ( localize2(19483, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -454,14 +454,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(17341, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(19484, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(17342, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(19485, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.js

@@ -143,7 +143,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     }
     getToolSessionTerminalInstances(hiddenOnly) {
         if (hiddenOnly) {
-            const foregroundInstances = ( new Set(( this._terminalService.foregroundInstances.map(i => i.instanceId))));
+            const foregroundInstances = ( new Set(this._terminalService.foregroundInstances.map(i => i.instanceId)));
             const uniqueInstances = ( new Set(( this._terminalInstancesByToolSessionId.values())));
             return Array.from(uniqueInstances).filter(i => !( foregroundInstances.has(i.instanceId)));
         }
@@ -372,7 +372,9 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         }
         const shell = language === "powershell" ? "pwsh" : "bash";
         const evaluator = this._autoApproveEvaluator ??= this._register(this._instantiationService.createInstance(CommandLineAutoApprover));
-        const subCommandResults = await Promise.all(( subCommands.map(e => evaluator.isCommandAutoApproved(e, shell, OS, undefined))));
+        const subCommandResults = await Promise.all(
+            subCommands.map(e => evaluator.isCommandAutoApproved(e, shell, OS, undefined))
+        );
         const commandLineResult = evaluator.isCommandLineAutoApproved(trimmedCommandLine);
         return generateAutoApproveActions(trimmedCommandLine, subCommands, {
             subCommandResults,

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js

@@ -24,7 +24,7 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { InlineChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
-import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { TerminalStickyScrollContribution } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
 import * as terminalChatWidget from './media/terminalChatWidget.css';
 import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from './terminalChat.js';
@@ -44,7 +44,7 @@ import { ITerminalChatSessionResolver } from '@codingame/monaco-vscode-api/vscod
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
-registerCss(terminalChatWidget);
+registerCss(terminalChatWidget, 1);
 var Constants;
 (function(Constants) {
     Constants[Constants["HorizontalMargin"] = 10] = "HorizontalMargin";
@@ -211,7 +211,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(17343, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(19486, "Ask about commands"));
     }
     async reveal() {
         this._createSession();
@@ -479,7 +479,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
                     if (isCellTextEditOperationArray(group)) {
                         message.push({
                             kind: "textEdit",
-                            edits: ( group.map(e => e.edit)),
+                            edits: group.map(e => e.edit),
                             uri: group[0].uri
                         });
                     } else {

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { AgentHostSdkSandboxEnabledSettingId, AgentHostSdkSandboxWindowsEnabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
-import { AgentHostCustomTerminalToolEnabledSettingId } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/copilotCliConfig';
+import { AgentHostCustomTerminalToolEnabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/copilotCliConfig';
 import { IAgentHostConnectionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service';
 import { AgentHostSandboxConfigKey, AgentHostSandboxKey } from '../../../../../platform/agentHost/common/sandboxConfigSchema.js';
 import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';

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

@@ -81,7 +81,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
             }
             return undefined;
         };
-        const subCommandsToSuggest = Array.from(( new Set(coalesce(( unapprovedSubCommands.map(command => {
+        const subCommandsToSuggest = Array.from(( new Set(coalesce(unapprovedSubCommands.map(command => {
             const parts = command.trim().split(/\s+/);
             const baseCommand = parts[0].toLowerCase();
             if (( neverAutoApproveCommands.has(baseCommand))) {
@@ -105,24 +105,24 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
             } else {
                 return parts[0];
             }
-        }))))));
+        })))));
         if (subCommandsToSuggest.length > 0) {
             let subCommandLabel;
             if (subCommandsToSuggest.length === 1) {
                 subCommandLabel = `\`${subCommandsToSuggest[0]} \u2026\``;
             } else {
-                subCommandLabel = `Commands ${( subCommandsToSuggest.map(e => `\`${e} \u2026\``)).join(", ")}`;
+                subCommandLabel = `Commands ${subCommandsToSuggest.map(e => `\`${e} \u2026\``).join(", ")}`;
             }
             if (!options?.skipSessionScoped) {
                 actions.push({
                     label: `Allow ${subCommandLabel} in this Session`,
                     data: {
                         type: "newRule",
-                        rule: ( subCommandsToSuggest.map(key => ({
+                        rule: subCommandsToSuggest.map(key => ({
                             key,
                             value: true,
                             scope: "session"
-                        })))
+                        }))
                     }
                 });
             }
@@ -130,22 +130,22 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
                 label: `Allow ${subCommandLabel} in this Workspace`,
                 data: {
                     type: "newRule",
-                    rule: ( subCommandsToSuggest.map(key => ({
+                    rule: subCommandsToSuggest.map(key => ({
                         key,
                         value: true,
                         scope: "workspace"
-                    })))
+                    }))
                 }
             });
             actions.push({
                 label: `Always Allow ${subCommandLabel}`,
                 data: {
                     type: "newRule",
-                    rule: ( subCommandsToSuggest.map(key => ({
+                    rule: subCommandsToSuggest.map(key => ({
                         key,
                         value: true,
                         scope: "user"
-                    })))
+                    }))
                 }
             });
         }
@@ -156,7 +156,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
         if (firstSubcommandFirstWord !== commandLine && !( commandsWithSubcommands.has(commandLine)) && !( commandsWithSubSubCommands.has(commandLine))) {
             if (!options?.skipSessionScoped) {
                 actions.push({
-                    label: ( localize(17344, "Allow Exact Command Line in this Session")),
+                    label: ( localize(19487, "Allow Exact Command Line in this Session")),
                     data: {
                         type: "newRule",
                         rule: {
@@ -171,7 +171,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
                 });
             }
             actions.push({
-                label: ( localize(17345, "Allow Exact Command Line in this Workspace")),
+                label: ( localize(19488, "Allow Exact Command Line in this Workspace")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -185,7 +185,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
                 }
             });
             actions.push({
-                label: ( localize(17346, "Always Allow Exact Command Line")),
+                label: ( localize(19489, "Always Allow Exact Command Line")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -205,8 +205,8 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
     }
     if (!options?.skipSessionScoped) {
         actions.push({
-            label: ( localize(17347, "Allow All Commands in this Session")),
-            tooltip: ( localize(17348, "Allow this tool to run in this session without confirmation.")),
+            label: ( localize(19490, "Allow All Commands in this Session")),
+            tooltip: ( localize(19491, "Allow this tool to run in this session without confirmation.")),
             data: {
                 type: "sessionApproval"
             }
@@ -214,7 +214,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult,
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(17349, "Configure Auto Approve...")),
+        label: ( localize(19492, "Configure Auto Approve...")),
         data: {
             type: "configure"
         }

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

@@ -12,7 +12,7 @@ let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
         this._configurationService = _configurationService;
     }
     logPrepare(state) {
-        const subCommandsSanitized = ( state.subCommands.map(e => {
+        const subCommandsSanitized = state.subCommands.map(e => {
             const commandName = e.split(" ")[0];
             let sanitizedCommandName = commandName.toLowerCase();
             if (!( commandAllowList.has(sanitizedCommandName))) {
@@ -43,7 +43,7 @@ let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
                 }
             }
             return sanitizedCommandName;
-        }));
+        });
         this._telemetryService.publicLog2("toolUse.runInTerminal.prepare", {
             terminalToolSessionId: state.terminalToolSessionId,
             subCommands: ( new TelemetryTrustedValue(JSON.stringify(subCommandsSanitized))),

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

@@ -113,7 +113,7 @@ async function resolveDependencyTasks(parentTask, workspaceFolder, configuration
     if (!parentTask.configurationProperties?.dependsOn) {
         return undefined;
     }
-    const dependencyTasks = await Promise.all(( parentTask.configurationProperties.dependsOn.map(async dep => {
+    const dependencyTasks = await Promise.all(parentTask.configurationProperties.dependsOn.map(async dep => {
         const depId = isString(dep.task) ? dep.task : dep.task?._key;
         if (!depId) {
             return undefined;
@@ -121,7 +121,7 @@ async function resolveDependencyTasks(parentTask, workspaceFolder, configuration
         return await getTaskForTool(depId, {
             taskLabel: depId
         }, workspaceFolder, configurationService, taskService);
-    })));
+    }));
     return dependencyTasks.filter(t => t !== undefined);
 }
 async function collectTerminalResults(
@@ -149,11 +149,11 @@ async function collectTerminalResults(
         taskIdToTaskMap[dependencyTask._id] = dependencyTask;
         taskLabelToTaskMap[dependencyTask._label] = dependencyTask;
     }
-    const terminalNames = ( terminals.map(t => t.shellLaunchConfig.name ?? t.title ?? "unknown"));
+    const terminalNames = terminals.map(t => t.shellLaunchConfig.name ?? t.title ?? "unknown");
     progress.report({
-        message: ( new MarkdownString(`Checking output for ${( terminalNames.map(n => `\`${n}\``)).join(", ")}`))
+        message: ( new MarkdownString(`Checking output for ${terminalNames.map(n => `\`${n}\``).join(", ")}`))
     });
-    const terminalPromises = ( terminals.map(async instance => {
+    const terminalPromises = terminals.map(async instance => {
         const startMarker = startMarkersByTerminalInstanceId ? startMarkersByTerminalInstanceId.get(instance.instanceId) : instance.registerMarker();
         let terminalTask = task;
         if (dependencyTasks?.length) {
@@ -224,11 +224,11 @@ async function collectTerminalResults(
         } finally {
             startMarker?.dispose();
         }
-    }));
+    });
     const parallelResults = await Promise.all(terminalPromises);
     results.push(...parallelResults);
     if (startMarkersByTerminalInstanceId) {
-        const activeInstanceIds = ( new Set(( terminals.map(instance => instance.instanceId))));
+        const activeInstanceIds = ( new Set(terminals.map(instance => instance.instanceId)));
         for (const [instanceId, marker] of startMarkersByTerminalInstanceId) {
             if (!( activeInstanceIds.has(instanceId))) {
                 marker?.dispose();

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

@@ -15,12 +15,12 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { IToolResultCompressor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service';
-import { registerActiveInstanceAction, sharedWhenClause } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
+import { registerActiveInstanceAction, sharedWhenClause } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
 import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
 import { TerminalChatAgentToolsCommandId } from '../common/terminal.chatAgentTools.js';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
-import { AgentNetworkDomainSettingId } from '../../../../../platform/networkFilter/common/settings.js';
+import { AgentNetworkDomainSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/networkFilter/common/settings';
 import { AgentHostSandboxForwarder } from './agentHostSandboxForwarder.js';
 import { GetTerminalLastCommandTool, GetTerminalLastCommandToolData } from './tools/getTerminalLastCommandTool.js';
 import { KillTerminalTool, KillTerminalToolData } from './tools/killTerminalTool.js';
@@ -177,7 +177,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(17350, "Add Terminal Selection to Chat")),
+    title: ( localize(19493, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -198,8 +198,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(17351, "Terminal Selection")),
-            fullName: ( localize(17351, "Terminal Selection")),
+            name: ( localize(19494, "Terminal Selection")),
+            fullName: ( localize(19494, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

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

@@ -15,7 +15,7 @@ import { PromptInputState } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 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-xterm-common/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
+import { getShellIntegrationTimeout } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { isBash, isZsh, isFish, isPowerShell } from './runInTerminalHelpers.js';
 

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(
-                17352,
+                19495,
                 "Auto approved as {0} is defined in package.json",
                 `\`${scriptName}\``
             ))))

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

@@ -56,7 +56,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 isAutoApproved: true,
                 isAutoApproveAllowed: true,
                 disclaimers: [],
-                autoApproveInfo: ( new MarkdownString(`${( localize(17353, "Auto approved for this session"))} ([${( localize(17354, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
+                autoApproveInfo: ( new MarkdownString(`${( localize(19496, "Auto approved for this session"))} ([${( localize(19497, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings))
             };
         }
         const trimmedCommandLine = options.commandLine.trimStart();
@@ -95,11 +95,11 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 disclaimers: []
             };
         }
-        const subCommandResults = await Promise.all(( subCommands.map(
+        const subCommandResults = await Promise.all(subCommands.map(
             e => this._commandLineAutoApprover.isCommandAutoApproved(e, options.shell, options.os, options.cwd, options.chatSessionResource)
-        )));
+        ));
         const commandLineResult = this._commandLineAutoApprover.isCommandLineAutoApproved(trimmedCommandLine, options.chatSessionResource);
-        const autoApproveReasons = [...( subCommandResults.map(e => e.reason)), commandLineResult.reason];
+        const autoApproveReasons = [...subCommandResults.map(e => e.reason), commandLineResult.reason];
         let isDenied = false;
         let autoApproveReason;
         let autoApproveDefault;
@@ -164,10 +164,10 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
             autoApproveDefault
         });
         const disclaimers = [];
-        const subCommandsLowerFirstWordOnly = ( subCommands.map(command => command.split(" ")[0].toLowerCase()));
+        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(
-                17355,
+                19498,
                 "Web content may contain malicious code or attempt prompt injection attacks."
             )));
         }
@@ -205,13 +205,13 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         commandLineResult
     ) {
         const formatRuleLinks = result => {
-            return ( asArray(result).filter(e => isAutoApproveRule(e.rule)).map(e => {
+            return asArray(result).filter(e => isAutoApproveRule(e.rule)).map(e => {
                 const escapedSourceText = e.rule.sourceText.replaceAll("$", "\\$");
                 if (e.rule.sourceTarget === "session") {
-                    return localize(17356, "{0} (session)", `\`${escapedSourceText}\``);
+                    return localize(19499, "{0} (session)", `\`${escapedSourceText}\``);
                 }
                 const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, e.rule.sourceTarget);
-                const tooltip = ( localize(17357, "View rule in settings"));
+                const tooltip = ( localize(19500, "View rule in settings"));
                 let label = escapedSourceText;
                 switch (e.rule?.sourceTarget) {
                 case ConfigurationTarget.DEFAULT:
@@ -230,7 +230,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     break;
                 }
                 return `[\`${label}\`](${( settingsUri.toString())} "${tooltip}")`;
-            })).join(", ");
+            }).join(", ");
         };
         const mdTrustSettings = {
             isTrusted: {
@@ -242,9 +242,9 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
         if (isGlobalAutoApproved) {
             const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, "global");
             return (new MarkdownString(`${( localize(
-                17358,
+                19501,
                 "Auto approved by setting {0}",
-                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(17359, "View settings"))}")`
+                `[\`${ChatConfiguration.GlobalAutoApprove}\`](${( settingsUri.toString())} "${( localize(19502, "View settings"))}")`
             ))}`, mdTrustSettings));
         }
         if (isAutoApproved) {
@@ -253,7 +253,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (isAutoApproveRule(commandLineResult.rule)) {
                         return (new MarkdownString(
-                            localize(17360, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
+                            localize(19503, "Auto approved by rule {0}", formatRuleLinks(commandLineResult)),
                             mdTrustSettings
                         ));
                     }
@@ -268,12 +268,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults);
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(17360, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(19503, "Auto approved by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(17361, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(19504, "Auto approved by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }
@@ -286,7 +286,7 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                 {
                     if (commandLineResult.rule) {
                         return (new MarkdownString(localize(
-                            17362,
+                            19505,
                             "Auto approval denied by rule {0}",
                             formatRuleLinks(commandLineResult)
                         ), mdTrustSettings));
@@ -298,12 +298,12 @@ let CommandLineAutoApproveAnalyzer = class CommandLineAutoApproveAnalyzer extend
                     const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === "denied"));
                     if (uniqueRules.length === 1) {
                         return (new MarkdownString(
-                            localize(17362, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
+                            localize(19505, "Auto approval denied by rule {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     } else if (uniqueRules.length > 1) {
                         return (new MarkdownString(
-                            localize(17363, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
+                            localize(19506, "Auto approval denied by rules {0}", formatRuleLinks(uniqueRules)),
                             mdTrustSettings
                         ));
                     }

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

@@ -45,14 +45,14 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
     }
     async _getFileWrites(options) {
         let fileWrites = [];
-        const capturedFileWrites = ( (await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine)).map(this._mapNullDevice.bind(this, options)));
-        const commandFileWrites = ( (await this._treeSitterCommandParser.getCommandFileWrites(options.treeSitterLanguage, options.commandLine)).map(this._mapNullDevice.bind(this, options)));
+        const capturedFileWrites = (await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine)).map(this._mapNullDevice.bind(this, options));
+        const commandFileWrites = (await this._treeSitterCommandParser.getCommandFileWrites(options.treeSitterLanguage, options.commandLine)).map(this._mapNullDevice.bind(this, options));
         const allCapturedFileWrites = [...capturedFileWrites, ...commandFileWrites];
         if (allCapturedFileWrites.length) {
             const cwd = options.cwd;
             if (cwd) {
                 this._log("Detected cwd", ( cwd.toString()));
-                fileWrites = ( allCapturedFileWrites.map(e => {
+                fileWrites = allCapturedFileWrites.map(e => {
                     if (e === nullDevice) {
                         return e;
                     }
@@ -66,13 +66,13 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
                         });
                     }
                     return URI.joinPath(cwd, e);
-                }));
+                });
             } else {
                 this._log("Cwd could not be detected");
                 fileWrites = allCapturedFileWrites;
             }
         }
-        this._log("File writes detected", ( fileWrites.map(e => ( e.toString()))));
+        this._log("File writes detected", fileWrites.map(e => ( e.toString())));
         return fileWrites;
     }
     _stripSurroundingQuotes(text) {
@@ -150,17 +150,17 @@ let CommandLineFileWriteAnalyzer = class CommandLineFileWriteAnalyzer extends Di
         }
         const disclaimers = [];
         if (fileWrites.length > 0) {
-            const fileWritesList = ( fileWrites.map(
+            const fileWritesList = fileWrites.map(
                 fw => `\`${URI.isUri(fw) ? this._labelService.getUriLabel(fw) : fw === nullDevice ? "/dev/null" : ( fw.toString())}\``
-            )).join(", ");
+            ).join(", ");
             if (!isAutoApproveAllowed) {
                 disclaimers.push(( localize(
-                    17364,
+                    19507,
                     "File write operations detected that cannot be auto approved: {0}",
                     fileWritesList
                 )));
             } else {
-                disclaimers.push(( localize(17365, "File write operations detected: {0}", fileWritesList)));
+                disclaimers.push(( localize(19508, "File write operations detected: {0}", fileWritesList)));
             }
         }
         return {