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

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQueueActions.js

@@ -9,17 +9,11 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatRequestQueueKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
-const queueingEnabledCondition = ( ContextKeyExpr.equals(`config.${ChatConfiguration.RequestQueueingEnabled}`, true));
-const requestInProgressOrPendingToolCall = ( ContextKeyExpr.or(
-    ChatContextKeys.requestInProgress,
-    ChatContextKeys.Editing.hasToolConfirmation
-));
-const queuingActionsPresent = ( ContextKeyExpr.and(queueingEnabledCondition, ( ContextKeyExpr.or(requestInProgressOrPendingToolCall, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.QueueOrSteer)))), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Sent))));
+const queuingActionsPresent = ( ContextKeyExpr.and(( ContextKeyExpr.or(ChatContextKeys.requestInProgress, ( ChatContextKeys.editingRequestType.isEqualTo(ChatContextKeys.EditingRequestType.QueueOrSteer)))), ( ChatContextKeys.editingRequestType.notEqualsTo(ChatContextKeys.EditingRequestType.Sent))));
 function isRemovePendingRequestContext(context) {
     return !!context && typeof context === "object" && "sessionResource" in context && "pendingRequestId" in context && URI.isUri(context.sessionResource) && typeof context.pendingRequestId === "string";
 }
@@ -30,8 +24,8 @@ class ChatQueueMessageAction extends Action2 {
     constructor() {
         super({
             id: ChatQueueMessageAction.ID,
-            title: ( localize2(4842, "Add to Queue")),
-            tooltip: ( localize(4843, "Queue this message to send after the current request completes")),
+            title: ( localize2(4948, "Add to Queue")),
+            tooltip: ( localize(4949, "Queue this message to send after the current request completes")),
             icon: Codicon.add,
             f1: false,
             category: CHAT_CATEGORY,
@@ -65,12 +59,12 @@ class ChatSteerWithMessageAction extends Action2 {
     constructor() {
         super({
             id: ChatSteerWithMessageAction.ID,
-            title: ( localize2(4844, "Steer with Message")),
+            title: ( localize2(4950, "Steer with Message")),
             tooltip: ( localize(
-                4845,
+                4951,
                 "Send this message at the next opportunity, signaling the current request to yield"
             )),
-            icon: Codicon.arrowRight,
+            icon: Codicon.arrowUp,
             f1: false,
             category: CHAT_CATEGORY,
             precondition: ( ContextKeyExpr.and(queuingActionsPresent, ChatContextKeys.inputHasText)),
@@ -103,7 +97,7 @@ class ChatRemovePendingRequestAction extends Action2 {
     constructor() {
         super({
             id: ChatRemovePendingRequestAction.ID,
-            title: ( localize2(4846, "Remove from Queue")),
+            title: ( localize2(4952, "Remove from Queue")),
             icon: Codicon.close,
             f1: false,
             category: CHAT_CATEGORY,
@@ -111,11 +105,7 @@ class ChatRemovePendingRequestAction extends Action2 {
                 id: MenuId.ChatMessageTitle,
                 group: "navigation",
                 order: 4,
-                when: ( ContextKeyExpr.and(
-                    queueingEnabledCondition,
-                    ChatContextKeys.isRequest,
-                    ChatContextKeys.isPendingRequest
-                ))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ChatContextKeys.isPendingRequest))
             }]
         });
     }
@@ -139,7 +129,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
     constructor() {
         super({
             id: ChatSendPendingImmediatelyAction.ID,
-            title: ( localize2(4847, "Send Immediately")),
+            title: ( localize2(4953, "Send Immediately")),
             icon: Codicon.arrowUp,
             f1: false,
             category: CHAT_CATEGORY,
@@ -147,11 +137,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
                 id: MenuId.ChatMessageTitle,
                 group: "navigation",
                 order: 3,
-                when: ( ContextKeyExpr.and(
-                    queueingEnabledCondition,
-                    ChatContextKeys.isRequest,
-                    ChatContextKeys.isPendingRequest
-                ))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ChatContextKeys.isPendingRequest))
             }]
         });
     }
@@ -181,7 +167,7 @@ class ChatSendPendingImmediatelyAction extends Action2 {
             kind: r.kind
         })))];
         chatService.setPendingRequests(context.sessionResource, reordered);
-        chatService.cancelCurrentRequestForSession(context.sessionResource);
+        chatService.cancelCurrentRequestForSession(context.sessionResource, "queueRunNext");
         chatService.processPendingRequests(context.sessionResource);
     }
 }
@@ -192,7 +178,7 @@ class ChatRemoveAllPendingRequestsAction extends Action2 {
     constructor() {
         super({
             id: ChatRemoveAllPendingRequestsAction.ID,
-            title: ( localize2(4848, "Remove All Queued")),
+            title: ( localize2(4954, "Remove All Queued")),
             icon: Codicon.clearAll,
             f1: false,
             category: CHAT_CATEGORY,
@@ -200,7 +186,7 @@ class ChatRemoveAllPendingRequestsAction extends Action2 {
                 id: MenuId.ChatContext,
                 group: "navigation",
                 order: 3,
-                when: ( ContextKeyExpr.and(queueingEnabledCondition, ChatContextKeys.hasPendingRequests))
+                when: ChatContextKeys.hasPendingRequests
             }]
         });
     }
@@ -227,7 +213,7 @@ function registerChatQueueActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatExecuteQueue, {
         command: {
             id: ChatQueueMessageAction.ID,
-            title: ( localize2(4842, "Add to Queue")),
+            title: ( localize2(4948, "Add to Queue")),
             icon: Codicon.add
         },
         group: "navigation",
@@ -236,17 +222,17 @@ function registerChatQueueActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatExecuteQueue, {
         command: {
             id: ChatSteerWithMessageAction.ID,
-            title: ( localize2(4844, "Steer with Message")),
-            icon: Codicon.arrowRight
+            title: ( localize2(4950, "Steer with Message")),
+            icon: Codicon.arrowUp
         },
         group: "navigation",
         order: 2
     });
     MenuRegistry.appendMenuItem(MenuId.ChatExecute, {
         submenu: MenuId.ChatExecuteQueue,
-        title: ( localize2(4849, "Queue")),
+        title: ( localize2(4955, "Queue")),
         icon: Codicon.listOrdered,
-        when: queuingActionsPresent,
+        when: ( ContextKeyExpr.and(queuingActionsPresent, ChatContextKeys.inputHasText)),
         group: "navigation",
         order: 4
     });

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js

@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: "workbench.action.quickchat.openInChatView",
-                title: ( localize2(4850, "Open in Chat View")),
+                title: ( localize2(4956, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.chatSparkle,
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: "workbench.action.quickchat.close",
-                title: ( localize2(4851, "Close Quick Chat")),
+                title: ( localize2(4957, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -59,7 +59,7 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4852, "Open Quick Chat")),
+            title: ( localize2(4958, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.chatSparkle,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4853, "Toggle the quick chat")),
+                description: ( localize(4959, "Toggle the quick chat")),
                 args: [{
                     name: "args",
                     schema: {
@@ -83,17 +83,17 @@ class QuickChatGlobalAction extends Action2 {
                             required: ["query"],
                             properties: {
                                 query: {
-                                    description: ( localize(4854, "The query to open the quick chat with")),
+                                    description: ( localize(4960, "The query to open the quick chat with")),
                                     type: "string"
                                 },
                                 isPartialQuery: {
-                                    description: ( localize(4855, "Whether the query is partial; it will wait for more user input")),
+                                    description: ( localize(4961, "Whether the query is partial; it will wait for more user input")),
                                     type: "boolean"
                                 }
                             }
                         }, {
                             type: "string",
-                            description: ( localize(4854, "The query to open the quick chat with"))
+                            description: ( localize(4960, "The query to open the quick chat with"))
                         }]
                     }
                 }]
@@ -124,7 +124,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4856, "Open Quick Chat")),
+            title: ( localize2(4962, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.d.ts

@@ -1 +1,14 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+export interface IToolConfirmationActionContext {
+    readonly sessionResource?: URI;
+}
+export declare class ConfigureToolsAction extends Action2 {
+    static ID: string;
+    constructor();
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+    private extractWidget;
+    private extractSource;
+}
 export declare function registerChatToolActions(): void;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.js

@@ -13,7 +13,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ToolsScope } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatSelectedTools';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -22,9 +22,9 @@ import { showToolsPicker } from './chatToolPicker.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 class ToolConfirmationAction extends Action2 {
-    run(accessor, ...args) {
+    run(accessor, context) {
         const chatWidgetService = accessor.get(IChatWidgetService);
-        const widget = chatWidgetService.lastFocusedWidget;
+        const widget = context?.sessionResource ? chatWidgetService.getWidgetBySessionResource(context.sessionResource) : chatWidgetService.lastFocusedWidget;
         const lastItem = widget?.viewModel?.getItems().at(-1);
         if (!isResponseVM(lastItem)) {
             return;
@@ -43,7 +43,7 @@ class AcceptToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4867, "Accept")),
+            title: ( localize2(4973, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -63,7 +63,7 @@ class SkipToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: SkipToolConfirmationActionId,
-            title: ( localize2(4868, "Skip")),
+            title: ( localize2(4974, "Skip")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -86,13 +86,13 @@ class ConfigureToolsAction extends Action2 {
     constructor() {
         super({
             id: ConfigureToolsAction.ID,
-            title: ( localize(4869, "Configure Tools...")),
-            icon: Codicon.tools,
+            title: ( localize(4975, "Configure Tools...")),
+            icon: Codicon.settings,
             f1: false,
             category: CHAT_CATEGORY,
             precondition: ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)),
             menu: [{
-                when: ( ContextKeyExpr.and(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.lockedToCodingAgent.negate()), ( ContextKeyExpr.notEquals(`config.${ChatConfiguration.AlternativeToolAction}`, true)))),
+                when: ( ContextKeyExpr.and(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
                 id: MenuId.ChatInput,
                 group: "navigation",
                 order: 100
@@ -119,29 +119,29 @@ class ConfigureToolsAction extends Action2 {
         } = widget.input.selectedToolsModel;
         switch (entriesScope) {
         case ToolsScope.Session:
-            placeholder = ( localize(4870, "Select tools for this chat session"));
-            description = ( localize(4871, "The selected tools were configured only for this chat session."));
+            placeholder = ( localize(4976, "Select tools for this chat session"));
+            description = ( localize(4977, "The selected tools were configured only for this chat session."));
             break;
         case ToolsScope.Agent:
-            placeholder = ( localize(4872, "Select tools for this custom agent"));
+            placeholder = ( localize(4978, "Select tools for this custom agent"));
             description = ( localize(
-                4873,
+                4979,
                 "The selected tools are configured by the '{0}' custom agent. Changes to the tools will be applied to the custom agent file as well.",
                 widget.input.currentModeObs.get().label.get()
             ));
             break;
         case ToolsScope.Agent_ReadOnly:
-            placeholder = ( localize(4874, "Select tools for this custom agent"));
+            placeholder = ( localize(4980, "Select tools for this custom agent"));
             description = ( localize(
-                4875,
+                4981,
                 "The selected tools are configured by the '{0}' custom agent. Changes to the tools will only be used for this session and will not change the '{0}' custom agent.",
                 widget.input.currentModeObs.get().label.get()
             ));
             break;
         case ToolsScope.Global:
-            placeholder = ( localize(4876, "Select tools that are available to chat."));
+            placeholder = ( localize(4982, "Select tools that are available to chat."));
             description = ( localize(
-                4877,
+                4983,
                 "The selected tools will be applied globally for all chat sessions that use the default agent."
             ));
             break;
@@ -205,4 +205,4 @@ function registerChatToolActions() {
     registerAction2(ConfigureToolsAction);
 }
 
-export { registerChatToolActions };
+export { ConfigureToolsAction, registerChatToolActions };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.js

@@ -17,6 +17,7 @@ import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { McpServerEditorTab, McpConnectionState, McpServerCacheState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService, IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ConfigureToolSets } from '../tools/toolSetsContribution.js';
@@ -78,7 +79,7 @@ function createToolSetTreeItem(toolset, checked, editorService) {
         const resource = toolset.source.file;
         buttons.push({
             iconClass: ThemeIcon.asClassName(Codicon.edit),
-            tooltip: ( localize(4878, "Edit Tool Set")),
+            tooltip: ( localize(4984, "Edit Tool Set")),
             action: () => editorService.openEditor({
                 resource
             })
@@ -106,6 +107,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
     const editorService = accessor.get(IEditorService);
     const mcpWorkbenchService = accessor.get(IMcpWorkbenchService);
     const toolsService = accessor.get(ILanguageModelToolsService);
+    const confirmationService = accessor.get(ILanguageModelToolsConfirmationService);
     const telemetryService = accessor.get(ITelemetryService);
     const mcpServerByTool = ( new Map());
     for (const server of mcpService.servers.get()) {
@@ -164,7 +166,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 if (collection?.source) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4879, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4985, "Configure {0}", collection.label)),
                         action: () => collection.source ? collection.source instanceof ExtensionIdentifier ? extensionsWorkbenchService.open(collection.source.value, {
                             tab: ExtensionEditorTab.Features,
                             feature: "mcp"
@@ -175,7 +177,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 } else if (collection?.presentation?.origin) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4879, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4985, "Configure {0}", collection.label)),
                         action: () => editorService.openEditor({
                             resource: collection.presentation.origin
                         })
@@ -184,7 +186,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.warning),
-                        tooltip: ( localize(4880, "Show Output")),
+                        tooltip: ( localize(4986, "Show Output")),
                         action: () => mcpServer.showOutput()
                     });
                 }
@@ -196,7 +198,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                     children.push({
                         itemType: "callback",
                         iconClass: ThemeIcon.asClassName(Codicon.sync),
-                        label: ( localize(4881, "Update Tools")),
+                        label: ( localize(4987, "Update Tools")),
                         pickable: false,
                         run: () => {
                             treePicker.busy = true;
@@ -252,7 +254,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                     itemType: "bucket",
                     ordinal: BucketOrdinal.BuiltIn,
                     id: key,
-                    label: ( localize(4882, "Built-In")),
+                    label: ( localize(4988, "Built-In")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -264,7 +266,7 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                     itemType: "bucket",
                     ordinal: BucketOrdinal.User,
                     id: key,
-                    label: ( localize(4883, "User Defined Tool Sets")),
+                    label: ( localize(4989, "User Defined Tool Sets")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -355,8 +357,41 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
                 }
             }
         }
+        for (const bucket of sortedBuckets) {
+            const isMcpBucket = bucket.ordinal === BucketOrdinal.Mcp;
+            const addConfirmationButton = toolItem => {
+                if (!confirmationService.toolCanManageConfirmation(toolItem.tool)) {
+                    return;
+                }
+                const tool = toolItem.tool;
+                const manageTools = isMcpBucket ? bucket.children.flatMap(
+                    c => isToolTreeItem(c) ? [c.tool] : isToolSetTreeItem(c) && c.children ? ( c.children.filter(isToolTreeItem).map(gc => gc.tool)) : []
+                ) : [tool];
+                const buttons = toolItem.buttons ? [...toolItem.buttons] : [];
+                buttons.push({
+                    iconClass: ThemeIcon.asClassName(Codicon.pass),
+                    tooltip: ( localize(4990, "Manage Approval")),
+                    keepOpen: true,
+                    action: () => confirmationService.manageConfirmationPreferences(manageTools, {
+                        focusToolId: tool.id
+                    })
+                });
+                toolItem.buttons = buttons;
+            };
+            for (const child of bucket.children) {
+                if (isToolTreeItem(child)) {
+                    addConfirmationButton(child);
+                } else if (isToolSetTreeItem(child) && child.children) {
+                    for (const grandchild of child.children) {
+                        if (isToolTreeItem(grandchild)) {
+                            addConfirmationButton(grandchild);
+                        }
+                    }
+                }
+            }
+        }
         if (treeItems.length === 0) {
-            treePicker.placeholder = ( localize(4884, "Add tools to chat"));
+            treePicker.placeholder = ( localize(4991, "Add tools to chat"));
         } else {
             treePicker.placeholder = placeHolder;
         }
@@ -372,7 +407,8 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
     computeItems();
     store.add(treePicker.onDidTriggerItemButton(e => {
         if (e.button && typeof e.button.action === "function") {
-            e.button.action();
+            const actionableButton = e.button;
+            actionableButton.action();
             store.dispose();
         }
     }));
@@ -416,17 +452,17 @@ async function showToolsPicker(accessor, placeHolder, source, description, getTo
     }));
     const addMcpServerButton = {
         iconClass: ThemeIcon.asClassName(Codicon.mcp),
-        tooltip: ( localize(4885, "Add MCP Server..."))
+        tooltip: ( localize(4992, "Add MCP Server..."))
     };
     const installExtension = {
         iconClass: ThemeIcon.asClassName(Codicon.extensions),
-        tooltip: ( localize(4886, "Install Extension..."))
+        tooltip: ( localize(4993, "Install Extension..."))
     };
     const configureToolSets = {
         iconClass: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(4887, "Configure Tool Sets..."))
+        tooltip: ( localize(4994, "Configure Tool Sets..."))
     };
-    treePicker.title = ( localize(4888, "Configure Tools"));
+    treePicker.title = ( localize(4995, "Configure Tools"));
     treePicker.buttons = [addMcpServerButton, installExtension, configureToolSets];
     store.add(treePicker.onDidTriggerButton(button => {
         if (button === addMcpServerButton) {

package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.js

@@ -65,7 +65,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
                 await this.handleNotebookEditor(activeNotebookEditor, context);
             } else {
                 this.notify(( localize(
-                    4889,
+                    4996,
                     "To insert the code block, open a code editor or notebook editor and set the cursor at the location where to insert the code block."
                 )));
             }
@@ -98,7 +98,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4890, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4997, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -117,7 +117,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4891, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4998, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -179,7 +179,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     this.tryToRevealCodeBlock(codeEditor, context.code);
                     activeEditorControl = codeEditor;
                 } else {
-                    this.notify(( localize(4892, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4999, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             } catch (e) {
@@ -211,7 +211,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             if (activeNotebookEditor) {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionResource, context.code);
             } else {
-                this.notify(( localize(4893, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(5000, "To apply this code block, open a code or notebook editor.")));
             }
         }
         if (isResponseVM(context.element)) {
@@ -235,7 +235,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? {
             label: ( localize(
-                4894,
+                5001,
                 "Active editor '{0}'",
                 this.labelService.getUriLabel(activeEditorControl.getModel().uri, {
                     relative: true
@@ -244,13 +244,13 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             id: "activeEditor"
         } : undefined;
         const untitledEditorOption = {
-            label: ( localize(4895, "New untitled editor")),
+            label: ( localize(5002, "New untitled editor")),
             id: "newUntitledFile"
         };
         const options = [];
         if (resource) {
             options.push({
-                label: ( localize(4896, "New file '{0}'", this.labelService.getUriLabel(resource, {
+                label: ( localize(5003, "New file '{0}'", this.labelService.getUriLabel(resource, {
                     relative: true
                 }))),
                 id: "createFile"
@@ -266,7 +266,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             options.push(untitledEditorOption);
         }
         const selected = options.length > 1 ? await this.quickInputService.pick(options, {
-            placeHolder: ( localize(4897, "Select where to apply the code block"))
+            placeHolder: ( localize(5004, "Select where to apply the code block"))
         }) : options[0];
         if (selected) {
             switch (selected.id) {
@@ -275,7 +275,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     try {
                         await this.fileService.writeFile(resource, VSBuffer.fromString(""));
                     } catch (error) {
-                        this.notify(( localize(4898, "Failed to create file: {0}", error.message)));
+                        this.notify(( localize(5005, "Failed to create file: {0}", error.message)));
                         return ( URI.from({
                             scheme: "untitled",
                             path: resource.path
@@ -296,7 +296,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, chatSessionResource, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4899, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(5006, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const uri = notebookEditor.textModel.uri;
@@ -307,7 +307,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4900, "No code mapper available.")));
+            this.notify(( localize(5007, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
@@ -320,7 +320,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 cancellable: true
             }, async progress => {
                 progress.report({
-                    message: ( localize(4901, "Applying code block using {0}...", codeMapper))
+                    message: ( localize(5008, "Applying code block using {0}...", codeMapper))
                 });
                 const editsIterable = this.getNotebookEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
@@ -328,7 +328,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             editsProposed = await this.applyNotebookEditsWithInlinePreview(iterable, uri, cancellationTokenSource);
         } catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4902, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(5009, "Failed to apply code block: {0}", e.message)));
             }
         } finally {
             cancellationTokenSource.dispose();
@@ -341,7 +341,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async handleTextEditor(codeEditor, chatSessionResource, code, applyCodeBlockSuggestionId) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4903, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(5010, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const codeBlock = {
@@ -352,7 +352,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4900, "No code mapper available.")));
+            this.notify(( localize(5007, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
@@ -365,7 +365,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 cancellable: true
             }, async progress => {
                 progress.report({
-                    message: ( localize(4901, "Applying code block using {0}...", codeMapper))
+                    message: ( localize(5008, "Applying code block using {0}...", codeMapper))
                 });
                 const editsIterable = this.getTextEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
@@ -373,7 +373,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource, applyCodeBlockSuggestionId);
         } catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4902, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(5009, "Failed to apply code block: {0}", e.message)));
             }
         } finally {
             cancellationTokenSource.dispose();