@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.1

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

@@ -1,39 +1,39 @@
 
-import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import { IExtensionGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { AUX_WINDOW_GROUP, SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IWorkbenchExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { ChatConfiguration, AGENT_SESSIONS_VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatConfiguration, LEGACY_AGENT_SESSIONS_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { AGENT_SESSIONS_VIEW_CONTAINER_ID, AGENT_SESSIONS_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { findExistingChatEditorByUri } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
-import { CHAT_CATEGORY, ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, ACTION_ID_OPEN_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
+function isMarshalledChatSessionContext(thing) {
+    if (typeof thing === 'object' && thing !== null) {
+        const candidate = thing;
+        return candidate.$mid === MarshalledId.ChatSessionContext && typeof candidate.session === 'object' && candidate.session !== null;
+    }
+    return false;
+}
 class RenameChatSessionAction extends Action2 {
     static { this.id = 'workbench.action.chat.renameSession'; }
     constructor() {
         super({
             id: RenameChatSessionAction.id,
-            title: ( localize(4749, "Rename")),
+            title: ( localize(4770, "Rename")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.pencil,
@@ -56,14 +56,14 @@ class RenameChatSessionAction extends Action2 {
             await chatSessionsService.setEditableSession(context.session.resource, {
                 validationMessage: (value) => {
                     if (!value || value.trim().length === 0) {
-                        return { content: ( localize(4750, "Name cannot be empty")), severity: Severity.Error };
+                        return { content: ( localize(4771, "Name cannot be empty")), severity: Severity.Error };
                     }
                     if (value.length > 100) {
-                        return { content: ( localize(4751, "Name is too long (maximum 100 characters)")), severity: Severity.Error };
+                        return { content: ( localize(4772, "Name is too long (maximum 100 characters)")), severity: Severity.Error };
                     }
                     return null;
                 },
-                placeholder: ( localize(4752, "Enter new name for chat session")),
+                placeholder: ( localize(4773, "Enter new name for chat session")),
                 startingValue: label,
                 onFinish: async (value, success) => {
                     if (success && value && value.trim() !== label) {
@@ -74,7 +74,7 @@ class RenameChatSessionAction extends Action2 {
                         }
                         catch (error) {
                             logService.error(( localize(
-                                4753,
+                                4774,
                                 "Failed to rename chat session: {0}",
                                 (error instanceof Error ? error.message : String(error))
                             )));
@@ -94,7 +94,7 @@ class DeleteChatSessionAction extends Action2 {
     constructor() {
         super({
             id: DeleteChatSessionAction.id,
-            title: ( localize(4754, "Delete")),
+            title: ( localize(4775, "Delete")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.x,
@@ -110,9 +110,9 @@ class DeleteChatSessionAction extends Action2 {
         const chatSessionsService = accessor.get(IChatSessionsService);
         try {
             const result = await dialogService.confirm({
-                message: ( localize(4755, "Are you sure you want to delete this chat session?")),
-                detail: ( localize(4756, "This action cannot be undone.")),
-                primaryButton: ( localize(4757, "Delete")),
+                message: ( localize(4776, "Are you sure you want to delete this chat session?")),
+                detail: ( localize(4777, "This action cannot be undone.")),
+                primaryButton: ( localize(4778, "Delete")),
                 type: 'warning'
             });
             if (result.confirmed) {
@@ -125,118 +125,22 @@ class DeleteChatSessionAction extends Action2 {
         }
     }
 }
-class OpenChatSessionInNewWindowAction extends Action2 {
-    static { this.id = 'workbench.action.chat.openSessionInNewWindow'; }
-    constructor() {
-        super({
-            id: OpenChatSessionInNewWindowAction.id,
-            title: ( localize(4758, "Move Chat into New Window")),
-            category: CHAT_CATEGORY,
-            f1: false,
-        });
-    }
-    async run(accessor, context) {
-        if (!context) {
-            return;
-        }
-        const editorService = accessor.get(IEditorService);
-        const chatWidgetService = accessor.get(IChatWidgetService);
-        const editorGroupsService = accessor.get(IEditorGroupsService);
-        if (context.session.provider?.chatSessionType) {
-            const uri = context.session.resource;
-            const existingEditor = findExistingChatEditorByUri(uri, editorGroupsService);
-            if (existingEditor) {
-                await editorService.openEditor(existingEditor.editor, existingEditor.group);
-                return;
-            }
-            else if (chatWidgetService.getWidgetBySessionResource(uri)) {
-                return;
-            }
-            else {
-                const options = {
-                    ignoreInView: true,
-                };
-                await editorService.openEditor({
-                    resource: uri,
-                    options,
-                }, AUX_WINDOW_GROUP);
-            }
-        }
-    }
-}
-class OpenChatSessionInNewEditorGroupAction extends Action2 {
-    static { this.id = 'workbench.action.chat.openSessionInNewEditorGroup'; }
-    constructor() {
-        super({
-            id: OpenChatSessionInNewEditorGroupAction.id,
-            title: ( localize(4759, "Move Chat to the Side")),
-            category: CHAT_CATEGORY,
-            f1: false,
-        });
-    }
-    async run(accessor, context) {
-        if (!context) {
-            return;
-        }
-        const editorService = accessor.get(IEditorService);
-        const chatWidgetService = accessor.get(IChatWidgetService);
-        const editorGroupsService = accessor.get(IEditorGroupsService);
-        if (context.session.provider?.chatSessionType) {
-            const uri = context.session.resource;
-            const existingEditor = findExistingChatEditorByUri(uri, editorGroupsService);
-            if (existingEditor) {
-                await editorService.openEditor(existingEditor.editor, existingEditor.group);
-                return;
-            }
-            else if (chatWidgetService.getWidgetBySessionResource(uri)) {
-                return;
-            }
-            else {
-                const options = {
-                    ignoreInView: true,
-                };
-                await editorService.openEditor({
-                    resource: uri,
-                    options,
-                }, SIDE_GROUP);
-            }
-        }
-    }
-}
 class OpenChatSessionInSidebarAction extends Action2 {
     static { this.id = 'workbench.action.chat.openSessionInSidebar'; }
     constructor() {
         super({
             id: OpenChatSessionInSidebarAction.id,
-            title: ( localize(4760, "Move Chat into Side Bar")),
+            title: ( localize(4779, "Move Chat into Side Bar")),
             category: CHAT_CATEGORY,
             f1: false,
         });
     }
     async run(accessor, context) {
-        const editorService = accessor.get(IEditorService);
-        const viewsService = accessor.get(IViewsService);
         const chatWidgetService = accessor.get(IChatWidgetService);
-        const editorGroupsService = accessor.get(IEditorGroupsService);
         if (!context) {
             return;
         }
-        if (context.session.provider.chatSessionType !== localChatSessionType) {
-            return;
-        }
-        const existingEditor = findExistingChatEditorByUri(context.session.resource, editorGroupsService);
-        if (existingEditor) {
-            await editorService.openEditor(existingEditor.editor, existingEditor.group);
-            return;
-        }
-        else if (chatWidgetService.getWidgetBySessionResource(context.session.resource)) {
-            return;
-        }
-        const chatViewPane = await viewsService.openView(ChatViewId);
-        if (chatViewPane) {
-            await chatViewPane.loadSession(context.session.resource);
-            chatViewPane.focusInput();
-        }
+        await chatWidgetService.openSession(context.session.resource, ChatViewPaneTarget);
     }
 }
 class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
@@ -244,7 +148,7 @@ class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
     constructor() {
         super({
             id: ToggleChatSessionsDescriptionDisplayAction.id,
-            title: ( localize(4761, "Show Rich Descriptions")),
+            title: ( localize(4780, "Show Rich Descriptions")),
             category: CHAT_CATEGORY,
             f1: false,
             toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true))
@@ -257,24 +161,24 @@ class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
     }
 }
 class ToggleAgentSessionsViewLocationAction extends Action2 {
-    static { this.id = 'workbench.action.chatSessions.toggleNewSingleView'; }
+    static { this.id = 'workbench.action.chatSessions.toggleNewCombinedView'; }
     constructor() {
         super({
             id: ToggleAgentSessionsViewLocationAction.id,
-            title: ( localize(4762, "Enable New Single View")),
+            title: ( localize(4781, "Combined Sessions View")),
             category: CHAT_CATEGORY,
             f1: false,
             toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentSessionsViewLocation}`, 'single-view')),
             menu: [
                 {
                     id: MenuId.ViewContainerTitle,
-                    when: ( ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEWLET_ID)),
+                    when: ( ContextKeyExpr.equals('viewContainer', LEGACY_AGENT_SESSIONS_VIEW_ID)),
                     group: '2_togglenew',
                     order: 1
                 },
                 {
-                    id: MenuId.ViewTitle,
-                    when: ( ContextKeyExpr.equals('view', 'workbench.view.agentSessions')),
+                    id: MenuId.ViewContainerTitle,
+                    when: ( ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEW_CONTAINER_ID)),
                     group: '2_togglenew',
                     order: 1
                 }
@@ -287,126 +191,58 @@ class ToggleAgentSessionsViewLocationAction extends Action2 {
         const currentValue = configurationService.getValue(ChatConfiguration.AgentSessionsViewLocation);
         const newValue = currentValue === 'single-view' ? 'view' : 'single-view';
         await configurationService.updateValue(ChatConfiguration.AgentSessionsViewLocation, newValue);
-        const viewId = newValue === 'single-view' ? 'workbench.view.agentSessions' : `${AGENT_SESSIONS_VIEWLET_ID}.local`;
+        const viewId = newValue === 'single-view' ? AGENT_SESSIONS_VIEW_ID : `${LEGACY_AGENT_SESSIONS_VIEW_ID}.local`;
         await viewsService.openView(viewId, true);
     }
 }
-class ChatSessionsGettingStartedAction extends Action2 {
-    static { this.ID = 'chat.sessions.gettingStarted'; }
-    constructor() {
-        super({
-            id: ChatSessionsGettingStartedAction.ID,
-            title: ( localize2(4763, "Getting Started with Chat Sessions")),
-            icon: Codicon.sendToRemoteAgent,
-            f1: false,
-        });
-    }
-    async run(accessor) {
-        const productService = accessor.get(IProductService);
-        const quickInputService = accessor.get(IQuickInputService);
-        const extensionManagementService = accessor.get(IWorkbenchExtensionManagementService);
-        const extensionGalleryService = accessor.get(IExtensionGalleryService);
-        const recommendations = productService.chatSessionRecommendations;
-        if (!recommendations || recommendations.length === 0) {
-            return;
-        }
-        const installedExtensions = await extensionManagementService.getInstalled();
-        const isExtensionAlreadyInstalled = (extensionId) => {
-            return installedExtensions.find(installed => installed.identifier.id === extensionId);
-        };
-        const quickPickItems = ( recommendations.map((recommendation) => {
-            const extensionInstalled = !!isExtensionAlreadyInstalled(recommendation.extensionId);
-            return {
-                label: recommendation.displayName,
-                description: recommendation.description,
-                detail: extensionInstalled
-                    ? ( localize(4764, "'{0}' is already installed", recommendation.extensionName))
-                    : ( localize(4765, "Installs '{0}'", recommendation.extensionName)),
-                extensionId: recommendation.extensionId,
-                disabled: extensionInstalled,
-            };
-        }));
-        const selected = await quickInputService.pick(quickPickItems, {
-            title: ( localize(4766, "Install Chat Extensions")),
-            placeHolder: ( localize(4767, "Choose extensions to enhance your chat experience")),
-            canPickMany: true,
-        });
-        if (!selected) {
-            return;
-        }
-        const galleryExtensions = await extensionGalleryService.getExtensions(( selected.map(item => ({ id: item.extensionId }))), CancellationToken.None);
-        if (!galleryExtensions) {
-            return;
-        }
-        await extensionManagementService.installGalleryExtensions(( galleryExtensions.map(
-            extension => ({ extension, options: { preRelease: productService.quality !== 'stable' } })
-        )));
-    }
-}
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsContext, {
     command: {
         id: RenameChatSessionAction.id,
-        title: ( localize(4749, "Rename")),
+        title: ( localize(4770, "Rename")),
         icon: Codicon.pencil
     },
     group: 'inline',
     order: 1,
-    when: ( ChatContextKeys.sessionType.isEqualTo(localChatSessionType))
+    when: ( ContextKeyExpr.and(( ChatContextKeys.agentSessionType.isEqualTo(localChatSessionType)), ( ChatContextKeys.isCombinedAgentSessionsViewer.negate())))
 });
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsContext, {
     command: {
         id: DeleteChatSessionAction.id,
-        title: ( localize(4754, "Delete")),
+        title: ( localize(4775, "Delete")),
         icon: Codicon.x
     },
     group: 'inline',
     order: 2,
-    when: ( ContextKeyExpr.and(( ChatContextKeys.isHistoryItem.isEqualTo(true)), ( ChatContextKeys.isActiveSession.isEqualTo(false))))
-});
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-    command: {
-        id: OpenChatSessionInNewWindowAction.id,
-        title: ( localize(4768, "Open in New Window"))
-    },
-    group: 'navigation',
-    order: 1,
-});
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-    command: {
-        id: OpenChatSessionInNewEditorGroupAction.id,
-        title: ( localize(4769, "Open to the Side"))
-    },
-    group: 'navigation',
-    order: 2,
+    when: ( ContextKeyExpr.and(( ChatContextKeys.isArchivedAgentSession.isEqualTo(true)), ( ChatContextKeys.isActiveAgentSession.isEqualTo(false))))
 });
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsContext, {
     command: {
         id: OpenChatSessionInSidebarAction.id,
-        title: ( localize(4770, "Open in Sidebar"))
+        title: ( localize(4782, "Open in Sidebar"))
     },
     group: 'navigation',
     order: 3,
-    when: ( ChatContextKeys.sessionType.isEqualTo(localChatSessionType)),
+    when: ( ChatContextKeys.isCombinedAgentSessionsViewer.negate())
 });
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     command: {
         id: ToggleChatSessionsDescriptionDisplayAction.id,
-        title: ( localize(4761, "Show Rich Descriptions")),
+        title: ( localize(4780, "Show Rich Descriptions")),
         toggled: ( ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true))
     },
     group: '1_config',
     order: 1,
-    when: ( ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEWLET_ID)),
+    when: ( ContextKeyExpr.equals('viewContainer', LEGACY_AGENT_SESSIONS_VIEW_ID)),
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     command: {
         id: ACTION_ID_OPEN_CHAT,
-        title: ( localize2(4771, "New Chat Editor")),
+        title: ( localize2(4783, "New Chat Editor")),
         icon: Codicon.plus
     },
     group: 'navigation',
     order: 1,
-    when: ( ContextKeyExpr.equals('view', `${AGENT_SESSIONS_VIEWLET_ID}.local`)),
+    when: ( ContextKeyExpr.equals('view', `${LEGACY_AGENT_SESSIONS_VIEW_ID}.local`)),
 });
 
-export { ChatSessionsGettingStartedAction, DeleteChatSessionAction, OpenChatSessionInNewEditorGroupAction, OpenChatSessionInNewWindowAction, OpenChatSessionInSidebarAction, RenameChatSessionAction, ToggleAgentSessionsViewLocationAction, ToggleChatSessionsDescriptionDisplayAction };
+export { DeleteChatSessionAction, OpenChatSessionInSidebarAction, RenameChatSessionAction, ToggleAgentSessionsViewLocationAction, ToggleChatSessionsDescriptionDisplayAction, isMarshalledChatSessionContext };

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

@@ -17,12 +17,12 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 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-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatSelectedTools';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ToolsScope } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSelectedTools';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { showToolsPicker } from './chatToolPicker.js';
 
 class ToolConfirmationAction extends Action2 {
@@ -47,7 +47,7 @@ class AcceptToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4782, "Accept")),
+            title: ( localize2(4794, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -65,7 +65,7 @@ class SkipToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: SkipToolConfirmationActionId,
-            title: ( localize2(4783, "Skip")),
+            title: ( localize2(4795, "Skip")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -84,7 +84,7 @@ class ConfigureToolsAction extends Action2 {
     constructor() {
         super({
             id: ConfigureToolsAction.ID,
-            title: ( localize(4784, "Configure Tools...")),
+            title: ( localize(4796, "Configure Tools...")),
             icon: Codicon.tools,
             f1: false,
             category: CHAT_CATEGORY,
@@ -104,7 +104,7 @@ class ConfigureToolsAction extends Action2 {
         let widget = chatWidgetService.lastFocusedWidget;
         if (!widget) {
             function isChatActionContext(obj) {
-                return obj && typeof obj === 'object' && obj.widget;
+                return !!obj && typeof obj === 'object' && !!obj.widget;
             }
             const context = args[0];
             if (isChatActionContext(context)) {
@@ -119,29 +119,29 @@ class ConfigureToolsAction extends Action2 {
         const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
         switch (entriesScope) {
             case ToolsScope.Session:
-                placeholder = ( localize(4785, "Select tools for this chat session"));
-                description = ( localize(4786, "The selected tools were configured only for this chat session."));
+                placeholder = ( localize(4797, "Select tools for this chat session"));
+                description = ( localize(4798, "The selected tools were configured only for this chat session."));
                 break;
             case ToolsScope.Agent:
-                placeholder = ( localize(4787, "Select tools for this custom agent"));
+                placeholder = ( localize(4799, "Select tools for this custom agent"));
                 description = ( localize(
-                    4788,
+                    4800,
                     "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(4789, "Select tools for this custom agent"));
+                placeholder = ( localize(4801, "Select tools for this custom agent"));
                 description = ( localize(
-                    4790,
+                    4802,
                     "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(4791, "Select tools that are available to chat."));
+                placeholder = ( localize(4803, "Select tools that are available to chat."));
                 description = ( localize(
-                    4792,
+                    4804,
                     "The selected tools will be applied globally for all chat sessions that use the default agent."
                 ));
                 break;
@@ -191,7 +191,7 @@ let ConfigureToolsActionRendering = class ConfigureToolsActionRendering {
                 getTooltip() {
                     if (this.isAboveToolLimit()) {
                         const warningMessage = ( localize(
-                            4793,
+                            4805,
                             'More than {0} tools are enabled, you may experience degraded tool calling.',
                             this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key)
                         ));

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

@@ -2,7 +2,7 @@
 import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { markdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { createMarkdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -15,11 +15,11 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtensionEditorTab } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
-import { McpCommandIds } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
+import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 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-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
@@ -77,7 +77,7 @@ function createToolSetTreeItem(toolset, checked, editorService) {
         const resource = toolset.source.file;
         buttons.push({
             iconClass: ThemeIcon.asClassName(Codicon.edit),
-            tooltip: ( localize(4794, "Edit Tool Set")),
+            tooltip: ( localize(4806, "Edit Tool Set")),
             action: () => editorService.openEditor({ resource })
         });
     }
@@ -158,14 +158,14 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                 if (collection?.source) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4795, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4807, "Configure {0}", collection.label)),
                         action: () => collection.source ? collection.source instanceof ExtensionIdentifier ? extensionsWorkbenchService.open(collection.source.value, { tab: ExtensionEditorTab.Features, feature: 'mcp' }) : mcpWorkbenchService.open(collection.source, { tab: McpServerEditorTab.Configuration }) : undefined
                     });
                 }
                 else if (collection?.presentation?.origin) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4795, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4807, "Configure {0}", collection.label)),
                         action: () => editorService.openEditor({
                             resource: collection.presentation.origin,
                         })
@@ -174,7 +174,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                 if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.warning),
-                        tooltip: ( localize(4796, "Show Output")),
+                        tooltip: ( localize(4808, "Show Output")),
                         action: () => mcpServer.showOutput(),
                     });
                 }
@@ -186,7 +186,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     children.push({
                         itemType: 'callback',
                         iconClass: ThemeIcon.asClassName(Codicon.sync),
-                        label: ( localize(4797, "Update Tools")),
+                        label: ( localize(4809, "Update Tools")),
                         pickable: false,
                         run: () => {
                             treePicker.busy = true;
@@ -243,7 +243,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.BuiltIn,
                     id: key,
-                    label: ( localize(4798, "Built-In")),
+                    label: ( localize(4810, "Built-In")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -256,7 +256,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.User,
                     id: key,
-                    label: ( localize(4799, "User Defined Tool Sets")),
+                    label: ( localize(4811, "User Defined Tool Sets")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -339,7 +339,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
             }
         }
         if (treeItems.length === 0) {
-            treePicker.placeholder = ( localize(4800, "Add tools to chat"));
+            treePicker.placeholder = ( localize(4812, "Add tools to chat"));
         }
         else {
             treePicker.placeholder = placeHolder;
@@ -380,10 +380,10 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
             if (count > toolLimit) {
                 treePicker.severity = Severity.Warning;
                 treePicker.validationMessage = ( localize(
-                    4801,
+                    4813,
                     "{0} tools are enabled. You may experience degraded tool calling above {1} tools.",
                     count,
-                    markdownCommandLink({ title: String(toolLimit), id: '_chat.toolPicker.closeAndOpenVirtualThreshold' })
+                    createMarkdownCommandLink({ title: String(toolLimit), id: '_chat.toolPicker.closeAndOpenVirtualThreshold' })
                 ));
             }
             else {
@@ -443,17 +443,17 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
     }));
     const addMcpServerButton = {
         iconClass: ThemeIcon.asClassName(Codicon.mcp),
-        tooltip: ( localize(4802, 'Add MCP Server...'))
+        tooltip: ( localize(4814, 'Add MCP Server...'))
     };
     const installExtension = {
         iconClass: ThemeIcon.asClassName(Codicon.extensions),
-        tooltip: ( localize(4803, 'Install Extension...'))
+        tooltip: ( localize(4815, 'Install Extension...'))
     };
     const configureToolSets = {
         iconClass: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(4804, 'Configure Tool Sets...'))
+        tooltip: ( localize(4816, 'Configure Tool Sets...'))
     };
-    treePicker.title = ( localize(4805, "Configure Tools"));
+    treePicker.title = ( localize(4817, "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.d.ts

@@ -14,7 +14,7 @@ import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ICodeBlockActionContext } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
 export declare class InsertCodeBlockOperation {
     private readonly editorService;
     private readonly textFileService;