@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.1

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

@@ -0,0 +1,179 @@
+
+import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
+import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { INTERNAL_AUTH_PROVIDER_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+
+class ManageLanguageModelAuthenticationAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.manageLanguageModelAuthentication'; }
+    constructor() {
+        super({
+            id: ManageLanguageModelAuthenticationAction.ID,
+            title: ( localize2(4572, 'Manage Language Model Access...')),
+            category: CHAT_CATEGORY,
+            precondition: ChatContextKeys.enabled,
+            menu: [{
+                    id: MenuId.AccountsContext,
+                    order: 100,
+                }],
+            f1: true
+        });
+    }
+    async run(accessor) {
+        const quickInputService = accessor.get(IQuickInputService);
+        const languageModelsService = accessor.get(ILanguageModelsService);
+        const authenticationAccessService = accessor.get(IAuthenticationAccessService);
+        const dialogService = accessor.get(IDialogService);
+        const extensionService = accessor.get(IExtensionService);
+        const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+        const productService = accessor.get(IProductService);
+        const modelIds = languageModelsService.getLanguageModelIds();
+        const extensionAuth = ( new Map());
+        const ownerToAccountLabel = ( new Map());
+        for (const modelId of modelIds) {
+            const model = languageModelsService.lookupLanguageModel(modelId);
+            if (!model?.auth) {
+                continue;
+            }
+            const ownerId = model.extension.value;
+            if (( extensionAuth.has(ownerId))) {
+                continue;
+            }
+            try {
+                const providerId = INTERNAL_AUTH_PROVIDER_PREFIX + ownerId;
+                const accountLabel = model.auth.accountLabel || 'Language Models';
+                ownerToAccountLabel.set(ownerId, accountLabel);
+                const allowedExtensions = authenticationAccessService.readAllowedExtensions(providerId, accountLabel).filter(ext => !ext.trusted);
+                if (productService.trustedExtensionAuthAccess && !Array.isArray(productService.trustedExtensionAuthAccess)) {
+                    const trustedExtensions = productService.trustedExtensionAuthAccess[providerId];
+                    for (const ext of trustedExtensions) {
+                        const index = allowedExtensions.findIndex(a => a.id === ext);
+                        if (index !== -1) {
+                            allowedExtensions.splice(index, 1);
+                        }
+                        const extension = await extensionService.getExtension(ext);
+                        if (!extension) {
+                            continue;
+                        }
+                        allowedExtensions.push({
+                            id: ext,
+                            name: extension.displayName || extension.name,
+                            allowed: true,
+                            trusted: true
+                        });
+                    }
+                }
+                const filteredExtensions = ( new Array());
+                for (const ext of allowedExtensions) {
+                    if (await extensionService.getExtension(ext.id)) {
+                        filteredExtensions.push(ext);
+                    }
+                }
+                extensionAuth.set(ownerId, filteredExtensions);
+            }
+            catch (error) {
+                if (!( extensionAuth.has(ownerId))) {
+                    extensionAuth.set(ownerId, []);
+                }
+            }
+        }
+        if (extensionAuth.size === 0) {
+            dialogService.prompt({
+                type: 'info',
+                message: ( localize(4573, 'No language models requiring authentication found.')),
+                detail: ( localize(
+                    4574,
+                    'There are currently no language models that require authentication.'
+                ))
+            });
+            return;
+        }
+        const items = [];
+        for (const [ownerId, allowedExtensions] of extensionAuth) {
+            const extension = await extensionService.getExtension(ownerId);
+            if (!extension) {
+                continue;
+            }
+            items.push({
+                type: 'separator',
+                id: ownerId,
+                label: ( localize(4575, '{0}', extension.displayName || extension.name)),
+                buttons: [{
+                        iconClass: ThemeIcon.asClassName(Codicon.info),
+                        tooltip: ( localize(4576, 'Open Extension')),
+                    }]
+            });
+            let addedTrustedSeparator = false;
+            if (allowedExtensions.length > 0) {
+                for (const allowedExt of allowedExtensions) {
+                    if (allowedExt.trusted && !addedTrustedSeparator) {
+                        items.push({
+                            type: 'separator',
+                            label: ( localize(4577, 'Trusted by Microsoft')),
+                        });
+                        addedTrustedSeparator = true;
+                    }
+                    items.push({
+                        label: allowedExt.name,
+                        ownerId,
+                        id: allowedExt.id,
+                        picked: allowedExt.allowed ?? false,
+                        extension: allowedExt,
+                        disabled: allowedExt.trusted,
+                    });
+                }
+            }
+            else {
+                items.push({
+                    label: ( localize(4578, 'No extensions have access')),
+                    description: ( localize(
+                        4579,
+                        'No extensions are currently allowed to use models from {0}',
+                        ownerId
+                    )),
+                    pickable: false
+                });
+            }
+        }
+        const result = await quickInputService.pick(items, {
+            canPickMany: true,
+            sortByLabel: true,
+            onDidTriggerSeparatorButton(context) {
+                const extId = context.separator.id;
+                if (extId) {
+                    void extensionsWorkbenchService.open(extId);
+                }
+            },
+            title: ( localize(4580, 'Manage Language Model Access')),
+            placeHolder: ( localize(4581, 'Choose which extensions can access language models')),
+        });
+        if (!result) {
+            return;
+        }
+        for (const [ownerId, allowedExtensions] of extensionAuth) {
+            const allowedSet = ( new Set(( result
+                .filter(item => item.ownerId === ownerId)
+                .filter(item => !item.extension?.trusted)
+                .map(item => item.id))));
+            for (const allowedExt of allowedExtensions) {
+                allowedExt.allowed = ( allowedSet.has(allowedExt.id));
+            }
+            authenticationAccessService.updateAllowedExtensions(INTERNAL_AUTH_PROVIDER_PREFIX + ownerId, ownerToAccountLabel.get(ownerId) || 'Language Models', allowedExtensions);
+        }
+    }
+}
+function registerLanguageModelActions() {
+    registerAction2(ManageLanguageModelAuthenticationAction);
+}
+
+export { registerLanguageModelActions };

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

@@ -12,11 +12,11 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditor } from '../chatEditor.js';
-import { ChatEditorInput } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 var MoveToNewLocation;
 (function (MoveToNewLocation) {
@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInEditor',
-                title: ( localize2(4472, "Open Chat in Editor")),
+                title: ( localize2(4582, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -49,7 +49,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInNewWindow',
-                title: ( localize2(4473, "Open Chat in New Window")),
+                title: ( localize2(4583, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -70,7 +70,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInSidebar',
-                title: ( localize2(4474, "Open Chat in Side Bar")),
+                title: ( localize2(4584, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -89,9 +89,9 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        appendOpenChatInViewMenuItem(id, ( localize(4475, "Open Chat in Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4476, "Open Chat in Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4477, "Open Chat in Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
+        appendOpenChatInViewMenuItem(id, ( localize(4585, "Open Chat in Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4586, "Open Chat in Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4587, "Open Chat in Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, _sessionId) {

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

@@ -1,2 +1,2 @@
-export { ASK_QUICK_QUESTION_ACTION_ID } from "@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants";
+export { ASK_QUICK_QUESTION_ACTION_ID } from "@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants";
 export declare function registerQuickChatActions(): void;

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

@@ -5,11 +5,11 @@ import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
-export { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+export { ASK_QUICK_QUESTION_ACTION_ID } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 function registerQuickChatActions() {
     registerAction2(QuickChatGlobalAction);
@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4478, "Open in Chat View")),
+                title: ( localize2(4588, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.commentDiscussion,
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.close',
-                title: ( localize2(4479, "Close Quick Chat")),
+                title: ( localize2(4589, "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(4480, 'Quick Chat')),
+            title: ( localize2(4590, 'Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.commentDiscussion,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4481, 'Toggle the quick chat')),
+                description: ( localize(4591, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4482, "The query to open the quick chat with")),
+                                            description: ( localize(4592, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4483, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4593, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4482, "The query to open the quick chat with"))
+                                    description: ( localize(4592, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -125,7 +125,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4484, "Open Quick Chat")),
+            title: ( localize2(4594, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });

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

@@ -8,19 +8,20 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { isResponseVM } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { AcceptToolConfirmationActionId } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ToolsScope } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatSelectedTools';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { AcceptToolConfirmationActionId } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { showToolsPicker } from './chatToolPicker.js';
 
 class AcceptToolConfirmation extends Action2 {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4495, "Accept")),
+            title: ( localize2(4605, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -48,17 +49,17 @@ class ConfigureToolsAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.configureTools',
-            title: ( localize(4496, "Configure Tools...")),
+            title: ( localize(4606, "Configure Tools...")),
             icon: Codicon.tools,
             f1: false,
             category: CHAT_CATEGORY,
-            precondition: ( ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)),
-            menu: {
-                when: ( ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)),
-                id: MenuId.ChatExecute,
-                group: 'navigation',
-                order: 1,
-            }
+            precondition: ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)),
+            menu: [{
+                    when: ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)),
+                    id: MenuId.ChatExecute,
+                    group: 'navigation',
+                    order: 1,
+                }]
         });
     }
     async run(accessor, ...args) {
@@ -78,23 +79,39 @@ class ConfigureToolsAction extends Action2 {
         if (!widget) {
             return;
         }
-        await instaService.invokeFunction(showToolsPicker, ( localize(4497, "Select tools that are available to chat")), widget.input.selectedToolsModel.entriesMap, newEntriesMap => {
-            const disableToolSets = [];
-            const disableTools = [];
+        let placeholder;
+        let description;
+        const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
+        switch (entriesScope) {
+            case ToolsScope.Session:
+                placeholder = ( localize(4607, "Select tools for this chat session"));
+                description = ( localize(
+                    4608,
+                    "The selected tools were configured by a prompt command and only apply to this chat session."
+                ));
+                break;
+            case ToolsScope.Mode:
+                placeholder = ( localize(4609, "Select tools for this chat mode"));
+                description = ( localize(
+                    4610,
+                    "The selected tools are configured by the '{0}' chat mode. Changes to the tools will be applied to the mode file as well.",
+                    widget.input.currentModeObs.get().name
+                ));
+                break;
+            case ToolsScope.Global:
+                placeholder = ( localize(4611, "Select tools that are available to chat."));
+                description = undefined;
+                break;
+        }
+        const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, entriesMap.get(), newEntriesMap => {
             for (const [item, enabled] of newEntriesMap) {
-                if (!enabled) {
-                    if (item instanceof ToolSet) {
-                        disableToolSets.push(item);
-                    }
-                    else {
-                        disableTools.push(item);
-                    }
-                }
             }
-            widget.input.selectedToolsModel.disable(disableToolSets, disableTools, false);
         });
+        if (result) {
+            widget.input.selectedToolsModel.set(result, false);
+        }
         telemetryService.publicLog2('chat/selectedTools', {
-            total: widget.input.selectedToolsModel.entriesMap.size,
+            total: widget.input.selectedToolsModel.entriesMap.get().size,
             enabled: widget.input.selectedToolsModel.entries.get().size,
         });
     }

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

@@ -1,3 +1,3 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
-export declare function showToolsPicker(accessor: ServicesAccessor, placeHolder: string, toolsEntries?: ReadonlyMap<ToolSet | IToolData, boolean>, onUpdate?: (toolsEntries: ReadonlyMap<ToolSet | IToolData, boolean>) => void): Promise<ReadonlyMap<ToolSet | IToolData, boolean> | undefined>;
+export declare function showToolsPicker(accessor: ServicesAccessor, placeHolder: string, description?: string, toolsEntries?: ReadonlyMap<ToolSet | IToolData, boolean>, onUpdate?: (toolsEntries: ReadonlyMap<ToolSet | IToolData, boolean>) => void): Promise<ReadonlyMap<ToolSet | IToolData, boolean> | undefined>;

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

@@ -3,7 +3,6 @@ import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { diffSets } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -13,7 +12,7 @@ import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
-import { AddConfigurationAction } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommands';
+import { McpCommandIds } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
@@ -43,7 +42,7 @@ function isCallbackPick(obj) {
 function isActionableButton(obj) {
     return typeof obj.action === 'function';
 }
-async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
+async function showToolsPicker(accessor, placeHolder, description, toolsEntries, onUpdate) {
     const quickPickService = accessor.get(IQuickInputService);
     const mcpService = accessor.get(IMcpService);
     const mcpRegistry = accessor.get(IMcpRegistry);
@@ -60,26 +59,26 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
     const builtinBucket = {
         type: 'item',
         children: [],
-        label: ( localize(4498, "Built-In")),
+        label: ( localize(4612, "Built-In")),
         ordinal: BucketOrdinal.BuiltIn,
         picked: false,
     };
     const userBucket = {
         type: 'item',
         children: [],
-        label: ( localize(4499, "User Defined Tool Sets")),
+        label: ( localize(4613, "User Defined Tool Sets")),
         ordinal: BucketOrdinal.User,
         alwaysShow: true,
         picked: false,
     };
-    const addMcpPick = { type: 'item', label: ( localize(4500, "Add MCP Server...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => commandService.executeCommand(AddConfigurationAction.ID) };
-    const configureToolSetsPick = { type: 'item', label: ( localize(4501, "Configure Tool Sets...")), iconClass: ThemeIcon.asClassName(Codicon.gear), pickable: false, run: () => commandService.executeCommand(ConfigureToolSets.ID) };
-    const addExpPick = { type: 'item', label: ( localize(4502, "Install Extension...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => extensionWorkbenchService.openSearch('@tag:language-model-tools') };
+    const addMcpPick = { type: 'item', label: ( localize(4614, "Add MCP Server...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => commandService.executeCommand(McpCommandIds.AddConfiguration) };
+    const configureToolSetsPick = { type: 'item', label: ( localize(4615, "Configure Tool Sets...")), iconClass: ThemeIcon.asClassName(Codicon.gear), pickable: false, run: () => commandService.executeCommand(ConfigureToolSets.ID) };
+    const addExpPick = { type: 'item', label: ( localize(4616, "Install Extension...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => extensionWorkbenchService.openSearch('@tag:language-model-tools') };
     const addPick = {
-        type: 'item', label: ( localize(4503, "Add More Tools...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: async () => {
+        type: 'item', label: ( localize(4617, "Add More Tools...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: async () => {
             const pick = await quickPickService.pick([addMcpPick, addExpPick], {
                 canPickMany: false,
-                placeHolder: ( localize(4504, "Add tools to chat"))
+                placeHolder: ( localize(4618, "Add tools to chat"))
             });
             pick?.run();
         }
@@ -88,7 +87,9 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
     if (!toolsEntries) {
         const defaultEntries = ( new Map());
         for (const tool of toolsService.getTools()) {
-            defaultEntries.set(tool, false);
+            if (tool.canBeReferencedInPrompt) {
+                defaultEntries.set(tool, false);
+            }
         }
         for (const toolSet of toolsService.toolSets.get()) {
             defaultEntries.set(toolSet, false);
@@ -108,7 +109,7 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
             const buttons = [];
             bucket = toolBuckets.get(key) ?? {
                 type: 'item',
-                label: ( localize(4505, "MCP Server: {0}", toolSetOrTool.source.label)),
+                label: ( localize(4619, "MCP Server: {0}", toolSetOrTool.source.label)),
                 ordinal: BucketOrdinal.Mcp,
                 picked: false,
                 alwaysShow: true,
@@ -120,7 +121,7 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
             if (collection?.presentation?.origin) {
                 buttons.push({
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(4506, "Configure {0}", collection.label)),
+                    tooltip: ( localize(4620, "Configure {0}", collection.label)),
                     action: () => editorService.openEditor({
                         resource: collection.presentation.origin,
                     })
@@ -129,7 +130,7 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
             if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
                 buttons.push({
                     iconClass: ThemeIcon.asClassName(Codicon.warning),
-                    tooltip: ( localize(4507, "Show Output")),
+                    tooltip: ( localize(4621, "Show Output")),
                     action: () => mcpServer.showOutput(),
                 });
             }
@@ -138,7 +139,7 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
             const key = ToolDataSource.toKey(toolSetOrTool.source);
             bucket = toolBuckets.get(key) ?? {
                 type: 'item',
-                label: ( localize(4508, 'Extension: {0}', toolSetOrTool.source.label)),
+                label: ( localize(4622, 'Extension: {0}', toolSetOrTool.source.label)),
                 ordinal: BucketOrdinal.Extension,
                 picked: false,
                 alwaysShow: true,
@@ -153,7 +154,7 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
             bucket = userBucket;
             buttons.push({
                 iconClass: ThemeIcon.asClassName(Codicon.edit),
-                tooltip: ( localize(4509, "Edit Tool Set")),
+                tooltip: ( localize(4623, "Edit Tool Set")),
                 action: () => {
                     assertType(toolSetOrTool.source.type === 'user');
                     editorService.openEditor({ resource: toolSetOrTool.source.file });
@@ -178,6 +179,7 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
             }
             else {
                 bucket.toolset = toolSetOrTool;
+                bucket.picked = picked;
             }
         }
         else if (toolSetOrTool.canBeReferencedInPrompt) {
@@ -191,15 +193,22 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
                 indented: true,
             });
         }
-        if (picked) {
-            bucket.picked = true;
-        }
     }
     for (const bucket of [builtinBucket, userBucket]) {
         if (bucket.children.length > 0) {
             toolBuckets.set(generateUuid(), bucket);
         }
     }
+    for (const bucket of ( toolBuckets.values())) {
+        if (bucket.picked) {
+            for (const child of bucket.children) {
+                child.picked = true;
+            }
+        }
+        else {
+            bucket.picked = ( bucket.children.some(child => child.picked));
+        }
+    }
     const store = ( new DisposableStore());
     const picks = [];
     for (const bucket of Array.from(( toolBuckets.values())).sort((a, b) => a.ordinal - b.ordinal)) {
@@ -212,12 +221,13 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
     }
     const picker = store.add(quickPickService.createQuickPick({ useSeparators: true }));
     picker.placeholder = placeHolder;
+    picker.description = description;
     picker.canSelectMany = true;
     picker.keepScrollPosition = true;
     picker.sortByLabel = false;
     picker.matchOnDescription = true;
     if (picks.length === 0) {
-        picker.placeholder = ( localize(4504, "Add tools to chat"));
+        picker.placeholder = ( localize(4618, "Add tools to chat"));
         picker.canSelectMany = false;
         picks.push(addMcpPick, addExpPick);
     }
@@ -326,16 +336,10 @@ async function showToolsPicker(accessor, placeHolder, toolsEntries, onUpdate) {
     }));
     await Promise.race([Event.toPromise(Event.any(picker.onDidAccept, picker.onDidHide))]);
     store.dispose();
-    const mcpToolSets = ( new Set());
     for (const item of toolsService.toolSets.get()) {
         if (item.source.type === 'mcp') {
-            mcpToolSets.add(item);
-            if (Iterable.every(item.getTools(), tool => result.get(tool))) {
-                for (const tool of item.getTools()) {
-                    result.delete(tool);
-                }
-                result.set(item, true);
-            }
+            const toolsInSet = Array.from(item.getTools());
+            result.set(item, toolsInSet.every(tool => result.get(tool)));
         }
     }
     return didAccept ? result : undefined;