@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -1,18 +1,14 @@
 
 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 { diffSets } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 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';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 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';
@@ -20,12 +16,11 @@ import { McpCommandIds } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerEditorTab, McpConnectionState } 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 { ToolDataSource, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+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';
 import { ConfigureToolSets } from '../tools/toolSetsContribution.js';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { markdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 
@@ -36,21 +31,6 @@ var BucketOrdinal;
     BucketOrdinal[BucketOrdinal["Mcp"] = 2] = "Mcp";
     BucketOrdinal[BucketOrdinal["Extension"] = 3] = "Extension";
 })(BucketOrdinal || (BucketOrdinal = {}));
-function isBucketPick(obj) {
-    return Boolean(obj.children);
-}
-function isToolSetPick(obj) {
-    return Boolean(obj.toolset);
-}
-function isToolPick(obj) {
-    return Boolean(obj.tool);
-}
-function isCallbackPick(obj) {
-    return Boolean(obj.run);
-}
-function isActionableButton(obj) {
-    return typeof obj.action === 'function';
-}
 function isBucketTreeItem(item) {
     return item.itemType === 'bucket';
 }
@@ -89,7 +69,31 @@ function createToolTreeItemFromData(tool, checked) {
         ...iconProps
     };
 }
-async function showToolsPickerTree(accessor, placeHolder, description, toolsEntries, onUpdate) {
+function createToolSetTreeItem(toolset, checked, editorService) {
+    const iconProps = mapIconToTreeItem(toolset.icon);
+    const buttons = [];
+    if (toolset.source.type === 'user') {
+        const resource = toolset.source.file;
+        buttons.push({
+            iconClass: ThemeIcon.asClassName(Codicon.edit),
+            tooltip: ( localize(4715, "Edit Tool Set")),
+            action: () => editorService.openEditor({ resource })
+        });
+    }
+    return {
+        itemType: 'toolset',
+        toolset,
+        buttons,
+        id: toolset.id,
+        label: toolset.referenceName,
+        description: toolset.description,
+        checked,
+        children: undefined,
+        collapsed: true,
+        ...iconProps
+    };
+}
+async function showToolsPicker(accessor, placeHolder, description, toolsEntries) {
     const quickPickService = accessor.get(IQuickInputService);
     const mcpService = accessor.get(IMcpService);
     const mcpRegistry = accessor.get(IMcpRegistry);
@@ -119,149 +123,157 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
     }
     const treeItems = [];
     const bucketMap = ( new Map());
-    for (const [toolSetOrTool, picked] of toolsEntries) {
-        let bucketItem;
-        const buttons = [];
-        if (toolSetOrTool.source.type === 'mcp') {
-            const key = ToolDataSource.toKey(toolSetOrTool.source);
-            const { definitionId } = toolSetOrTool.source;
+    const getKey = (source) => {
+        switch (source.type) {
+            case 'mcp':
+            case 'extension':
+                return ToolDataSource.toKey(source);
+            case 'internal':
+                return ( BucketOrdinal.BuiltIn.toString());
+            case 'user':
+                return ( BucketOrdinal.User.toString());
+            case 'external':
+                throw ( new Error('should not be reachable'));
+            default:
+                assertNever();
+        }
+    };
+    const createBucket = (source, key) => {
+        if (source.type === 'mcp') {
+            const { definitionId } = source;
             const mcpServer = mcpService.servers.get().find(candidate => candidate.definition.id === definitionId);
             if (!mcpServer) {
-                continue;
-            }
-            bucketItem = bucketMap.get(key);
-            if (!bucketItem) {
-                const collection = mcpRegistry.collections.get().find(c => c.id === mcpServer.collection.id);
-                if (collection?.source) {
-                    buttons.push({
-                        iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4662, "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(4662, "Configure {0}", collection.label)),
-                        action: () => editorService.openEditor({
-                            resource: collection.presentation.origin,
-                        })
-                    });
-                }
-                if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
-                    buttons.push({
-                        iconClass: ThemeIcon.asClassName(Codicon.warning),
-                        tooltip: ( localize(4663, "Show Output")),
-                        action: () => mcpServer.showOutput(),
-                    });
-                }
-                bucketItem = {
-                    itemType: 'bucket',
-                    ordinal: BucketOrdinal.Mcp,
-                    id: key,
-                    label: ( localize(4664, "MCP Server: {0}", toolSetOrTool.source.label)),
-                    checked: false,
-                    collapsed: true,
-                    children: [],
-                    buttons,
-                    alwaysShow: true,
-                    iconClass: ThemeIcon.asClassName(Codicon.mcp)
-                };
-                bucketMap.set(key, bucketItem);
-            }
-            if (toolSetOrTool instanceof ToolSet) {
-                bucketItem.toolset = toolSetOrTool;
-                bucketItem.checked = picked;
+                return undefined;
             }
-            else if (toolSetOrTool.canBeReferencedInPrompt) {
-                const toolTreeItem = createToolTreeItemFromData(toolSetOrTool, picked);
-                bucketItem.children = [...(bucketItem.children || []), toolTreeItem];
-            }
-        }
-        else {
-            let ordinal;
-            let label;
-            let key;
-            let collapsed;
-            if (toolSetOrTool.source.type === 'extension') {
-                ordinal = BucketOrdinal.Extension;
-                label = ( localize(4665, 'Extension: {0}', toolSetOrTool.source.label));
-                key = ToolDataSource.toKey(toolSetOrTool.source);
-                collapsed = true;
+            const buttons = [];
+            const collection = mcpRegistry.collections.get().find(c => c.id === mcpServer.collection.id);
+            if (collection?.source) {
+                buttons.push({
+                    iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
+                    tooltip: ( localize(4716, "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 (toolSetOrTool.source.type === 'internal') {
-                ordinal = BucketOrdinal.BuiltIn;
-                label = ( localize(4666, "Built-In"));
-                key = ( ordinal.toString());
+            else if (collection?.presentation?.origin) {
+                buttons.push({
+                    iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
+                    tooltip: ( localize(4716, "Configure {0}", collection.label)),
+                    action: () => editorService.openEditor({
+                        resource: collection.presentation.origin,
+                    })
+                });
             }
-            else if (toolSetOrTool.source.type === 'user') {
-                ordinal = BucketOrdinal.User;
-                label = ( localize(4667, "User Defined Tool Sets"));
-                key = ( ordinal.toString());
+            if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
                 buttons.push({
-                    iconClass: ThemeIcon.asClassName(Codicon.edit),
-                    tooltip: ( localize(4668, "Edit Tool Set")),
-                    action: () => {
-                        assertType(toolSetOrTool.source.type === 'user');
-                        editorService.openEditor({ resource: toolSetOrTool.source.file });
-                    }
+                    iconClass: ThemeIcon.asClassName(Codicon.warning),
+                    tooltip: ( localize(4717, "Show Output")),
+                    action: () => mcpServer.showOutput(),
                 });
             }
-            else {
-                assertNever();
+            return {
+                itemType: 'bucket',
+                ordinal: BucketOrdinal.Mcp,
+                id: key,
+                label: ( localize(4718, "MCP Server: {0}", source.label)),
+                checked: undefined,
+                collapsed: true,
+                children: [],
+                buttons,
+                iconClass: ThemeIcon.asClassName(Codicon.mcp)
+            };
+        }
+        else if (source.type === 'extension') {
+            return {
+                itemType: 'bucket',
+                ordinal: BucketOrdinal.Extension,
+                id: key,
+                label: ( localize(4719, 'Extension: {0}', source.label)),
+                checked: undefined,
+                children: [],
+                buttons: [],
+                collapsed: true,
+                iconClass: ThemeIcon.asClassName(Codicon.extensions)
+            };
+        }
+        else if (source.type === 'internal') {
+            return {
+                itemType: 'bucket',
+                ordinal: BucketOrdinal.BuiltIn,
+                id: key,
+                label: ( localize(4720, "Built-In")),
+                checked: undefined,
+                children: [],
+                buttons: [],
+                collapsed: false
+            };
+        }
+        else {
+            return {
+                itemType: 'bucket',
+                ordinal: BucketOrdinal.User,
+                id: key,
+                label: ( localize(4721, "User Defined Tool Sets")),
+                checked: undefined,
+                children: [],
+                buttons: [],
+                collapsed: true
+            };
+        }
+    };
+    const getBucket = (source) => {
+        const key = getKey(source);
+        let bucket = bucketMap.get(key);
+        if (!bucket) {
+            bucket = createBucket(source, key);
+            if (bucket) {
+                bucketMap.set(key, bucket);
             }
-            bucketItem = bucketMap.get(key);
-            if (!bucketItem) {
-                const iconProps = toolSetOrTool.source.type === 'extension'
-                    ? { iconClass: ThemeIcon.asClassName(Codicon.extensions) }
-                    : {};
-                bucketItem = {
-                    itemType: 'bucket',
-                    ordinal,
-                    id: key,
-                    label,
-                    checked: false,
-                    children: [],
-                    buttons,
-                    collapsed,
-                    alwaysShow: true,
-                    ...iconProps
-                };
-                bucketMap.set(key, bucketItem);
+        }
+        return bucket;
+    };
+    for (const toolSet of toolsService.toolSets.get()) {
+        if (!( toolsEntries.has(toolSet))) {
+            continue;
+        }
+        const bucket = getBucket(toolSet.source);
+        if (!bucket) {
+            continue;
+        }
+        const toolSetChecked = toolsEntries.get(toolSet) === true;
+        if (toolSet.source.type === 'mcp') {
+            bucket.toolset = toolSet;
+            if (toolSetChecked) {
+                bucket.checked = toolSetChecked;
             }
-            if (toolSetOrTool instanceof ToolSet) {
-                const iconProps = mapIconToTreeItem(toolSetOrTool.icon);
-                const toolSetTreeItem = {
-                    itemType: 'toolset',
-                    toolset: toolSetOrTool,
-                    buttons,
-                    id: toolSetOrTool.id,
-                    label: toolSetOrTool.referenceName,
-                    description: toolSetOrTool.description,
-                    checked: picked,
-                    collapsed: true,
-                    ...iconProps
-                };
-                bucketItem.children = [...(bucketItem.children || []), toolSetTreeItem];
+        }
+        else {
+            const treeItem = createToolSetTreeItem(toolSet, toolSetChecked, editorService);
+            bucket.children.push(treeItem);
+            const children = [];
+            for (const tool of toolSet.getTools()) {
+                const toolChecked = toolSetChecked || toolsEntries.get(tool) === true;
+                const toolTreeItem = createToolTreeItemFromData(tool, toolChecked);
+                children.push(toolTreeItem);
             }
-            else if (toolSetOrTool.canBeReferencedInPrompt) {
-                const toolTreeItem = createToolTreeItemFromData(toolSetOrTool, picked);
-                bucketItem.children = [...(bucketItem.children || []), toolTreeItem];
+            if (children.length > 0) {
+                treeItem.children = children;
             }
         }
     }
-    const sortedBuckets = Array.from(( bucketMap.values())).sort((a, b) => a.ordinal - b.ordinal);
-    treeItems.push(...sortedBuckets);
-    for (const bucketItem of treeItems.filter(isBucketTreeItem)) {
-        if (bucketItem.checked) {
-            bucketItem.children?.forEach(child => {
-                child.checked = true;
-            });
+    for (const tool of toolsService.getTools()) {
+        if (!tool.canBeReferencedInPrompt || !( toolsEntries.has(tool))) {
+            continue;
         }
-        else {
-            bucketItem.checked = bucketItem.children?.some(child => child.checked) || false;
+        const bucket = getBucket(tool.source);
+        if (!bucket) {
+            continue;
         }
+        const toolChecked = bucket.checked === true || toolsEntries.get(tool) === true;
+        const toolTreeItem = createToolTreeItemFromData(tool, toolChecked);
+        bucket.children.push(toolTreeItem);
     }
+    const sortedBuckets = Array.from(( bucketMap.values())).sort((a, b) => a.ordinal - b.ordinal);
+    treeItems.push(...sortedBuckets);
     const store = ( new DisposableStore());
     const treePicker = store.add(quickPickService.createQuickTree());
     treePicker.placeholder = placeHolder;
@@ -270,7 +282,7 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
     treePicker.matchOnDescription = true;
     treePicker.matchOnLabel = true;
     if (treeItems.length === 0) {
-        treePicker.placeholder = ( localize(4669, "Add tools to chat"));
+        treePicker.placeholder = ( localize(4722, "Add tools to chat"));
     }
     treePicker.setItemTree(treeItems);
     store.add(treePicker.onDidTriggerItemButton(e => {
@@ -279,43 +291,26 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
             store.dispose();
         }
     }));
-    const result = ( new Map());
-    const collectResults = () => {
-        result.clear();
-        let count = 0;
-        const traverse = (items) => {
-            for (const item of items) {
-                if (isBucketTreeItem(item)) {
-                    if (item.toolset) {
-                        const checked = typeof item.checked === 'boolean' ? item.checked : false;
-                        result.set(item.toolset, checked);
-                    }
-                    if (item.children) {
-                        traverse(item.children);
-                    }
-                }
-                else if (isToolSetTreeItem(item)) {
-                    const checked = typeof item.checked === 'boolean' ? item.checked : false;
-                    result.set(item.toolset, checked);
-                    if (item.children) {
-                        traverse(item.children);
+    const updateToolLimitMessage = () => {
+        if (toolLimit) {
+            let count = 0;
+            const traverse = (items) => {
+                for (const item of items) {
+                    if (isBucketTreeItem(item) || isToolSetTreeItem(item)) {
+                        if (item.children) {
+                            traverse(item.children);
+                        }
                     }
-                }
-                else if (isToolTreeItem(item)) {
-                    const checked = typeof item.checked === 'boolean' ? item.checked : false;
-                    if (checked) {
+                    else if (isToolTreeItem(item) && item.checked) {
                         count++;
                     }
-                    result.set(item.tool, checked);
                 }
-            }
-        };
-        traverse(treeItems);
-        if (toolLimit) {
+            };
+            traverse(treeItems);
             if (count > toolLimit) {
                 treePicker.severity = Severity.Warning;
                 treePicker.validationMessage = ( localize(
-                    4670,
+                    4723,
                     "{0} tools are enabled. You may experience degraded tool calling above {1} tools.",
                     count,
                     markdownCommandLink({ title: String(toolLimit), id: '_chat.toolPicker.closeAndOpenVirtualThreshold' })
@@ -326,14 +321,33 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
                 treePicker.validationMessage = undefined;
             }
         }
-        for (const item of toolsService.toolSets.get()) {
-            if (item.source.type === 'mcp') {
-                const toolsInSet = Array.from(item.getTools());
-                result.set(item, toolsInSet.every(tool => result.get(tool)));
+    };
+    updateToolLimitMessage();
+    const collectResults = () => {
+        const result = ( new Map());
+        const traverse = (items) => {
+            for (const item of items) {
+                if (isBucketTreeItem(item)) {
+                    if (item.toolset) {
+                        const allChecked = item.checked === true;
+                        result.set(item.toolset, allChecked);
+                    }
+                    traverse(item.children);
+                }
+                else if (isToolSetTreeItem(item)) {
+                    result.set(item.toolset, item.checked === true);
+                    if (item.children) {
+                        traverse(item.children);
+                    }
+                }
+                else if (isToolTreeItem(item)) {
+                    result.set(item.tool, item.checked);
+                }
             }
-        }
+        };
+        traverse(treeItems);
+        return result;
     };
-    collectResults();
     store.add(CommandsRegistry.registerCommand({
         id: '_chat.toolPicker.closeAndOpenVirtualThreshold',
         handler: () => {
@@ -341,21 +355,7 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
             commandService.executeCommand('workbench.action.openSettings', 'github.copilot.chat.virtualTools.threshold');
         }
     }));
-    store.add(treePicker.onDidChangeCheckedLeafItems(() => {
-        collectResults();
-        if (onUpdate) {
-            let didChange = toolsEntries.size !== result.size;
-            for (const [key, value] of toolsEntries) {
-                if (didChange) {
-                    break;
-                }
-                didChange = result.get(key) !== value;
-            }
-            if (didChange) {
-                onUpdate(result);
-            }
-        }
-    }));
+    store.add(treePicker.onDidChangeCheckedLeafItems(() => updateToolLimitMessage()));
     let didAccept = false;
     store.add(treePicker.onDidAccept(() => {
         const activeItems = treePicker.activeItems;
@@ -369,17 +369,17 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
     }));
     const addMcpServerButton = {
         iconClass: ThemeIcon.asClassName(Codicon.mcp),
-        tooltip: ( localize(4671, 'Add MCP Server...'))
+        tooltip: ( localize(4724, 'Add MCP Server...'))
     };
     const installExtension = {
         iconClass: ThemeIcon.asClassName(Codicon.extensions),
-        tooltip: ( localize(4672, 'Install Extension...'))
+        tooltip: ( localize(4725, 'Install Extension...'))
     };
     const configureToolSets = {
         iconClass: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(4673, 'Configure Tool Sets...'))
+        tooltip: ( localize(4726, 'Configure Tool Sets...'))
     };
-    treePicker.title = ( localize(4674, "Configure Tools"));
+    treePicker.title = ( localize(4727, "Configure Tools"));
     treePicker.buttons = [addMcpServerButton, installExtension, configureToolSets];
     store.add(treePicker.onDidTriggerButton(button => {
         if (button === addMcpServerButton) {
@@ -396,353 +396,7 @@ async function showToolsPickerTree(accessor, placeHolder, description, toolsEntr
     treePicker.show();
     await Promise.race([Event.toPromise(Event.any(treePicker.onDidAccept, treePicker.onDidHide), store)]);
     store.dispose();
-    collectResults();
-    return didAccept ? result : undefined;
-}
-async function showToolsPicker(accessor, placeHolder, description, toolsEntries, onUpdate) {
-    const configurationService = accessor.get(IConfigurationService);
-    const useTreePicker = configurationService.getValue('chat.tools.useTreePicker');
-    if (useTreePicker) {
-        return showToolsPickerTree(accessor, placeHolder, description, toolsEntries, onUpdate);
-    }
-    else {
-        return showToolsPickerLegacy(accessor, placeHolder, description, toolsEntries, onUpdate);
-    }
-}
-async function showToolsPickerLegacy(accessor, placeHolder, description, toolsEntries, onUpdate) {
-    const quickPickService = accessor.get(IQuickInputService);
-    const mcpService = accessor.get(IMcpService);
-    const mcpRegistry = accessor.get(IMcpRegistry);
-    const commandService = accessor.get(ICommandService);
-    const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
-    const editorService = accessor.get(IEditorService);
-    const mcpWorkbenchService = accessor.get(IMcpWorkbenchService);
-    const toolsService = accessor.get(ILanguageModelToolsService);
-    const mcpServerByTool = ( new Map());
-    for (const server of mcpService.servers.get()) {
-        for (const tool of server.tools.get()) {
-            mcpServerByTool.set(tool.id, server);
-        }
-    }
-    const builtinBucket = {
-        type: 'item',
-        children: [],
-        label: ( localize(4666, "Built-In")),
-        ordinal: BucketOrdinal.BuiltIn,
-        picked: false,
-    };
-    const userBucket = {
-        type: 'item',
-        children: [],
-        label: ( localize(4667, "User Defined Tool Sets")),
-        ordinal: BucketOrdinal.User,
-        alwaysShow: true,
-        picked: false,
-    };
-    const toolLimit = accessor.get(IContextKeyService).getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key);
-    const addMcpPick = { type: 'item', label: ( localize(4675, "Add MCP Server...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => commandService.executeCommand(McpCommandIds.AddConfiguration) };
-    const configureToolSetsPick = { type: 'item', label: ( localize(4676, "Configure Tool Sets...")), iconClass: ThemeIcon.asClassName(Codicon.gear), pickable: false, run: () => commandService.executeCommand(ConfigureToolSets.ID) };
-    const addExpPick = { type: 'item', label: ( localize(4677, "Install Extension...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => extensionsWorkbenchService.openSearch('@tag:language-model-tools') };
-    const addPick = {
-        type: 'item', label: ( localize(4678, "Add More Tools...")), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: async () => {
-            const pick = await quickPickService.pick([addMcpPick, addExpPick], {
-                canPickMany: false,
-                placeHolder: ( localize(4669, "Add tools to chat"))
-            });
-            pick?.run();
-        }
-    };
-    const toolBuckets = ( new Map());
-    if (!toolsEntries) {
-        const defaultEntries = ( new Map());
-        for (const tool of toolsService.getTools()) {
-            if (tool.canBeReferencedInPrompt) {
-                defaultEntries.set(tool, false);
-            }
-        }
-        for (const toolSet of toolsService.toolSets.get()) {
-            defaultEntries.set(toolSet, false);
-        }
-        toolsEntries = defaultEntries;
-    }
-    for (const [toolSetOrTool, picked] of toolsEntries) {
-        let bucket;
-        const buttons = [];
-        if (toolSetOrTool.source.type === 'mcp') {
-            const key = ToolDataSource.toKey(toolSetOrTool.source);
-            const { definitionId } = toolSetOrTool.source;
-            const mcpServer = mcpService.servers.get().find(candidate => candidate.definition.id === definitionId);
-            if (!mcpServer) {
-                continue;
-            }
-            const buttons = [];
-            bucket = toolBuckets.get(key) ?? {
-                type: 'item',
-                label: ( localize(4664, "MCP Server: {0}", toolSetOrTool.source.label)),
-                ordinal: BucketOrdinal.Mcp,
-                picked: false,
-                alwaysShow: true,
-                children: [],
-                buttons
-            };
-            toolBuckets.set(key, bucket);
-            const collection = mcpRegistry.collections.get().find(c => c.id === mcpServer.collection.id);
-            if (collection?.source) {
-                buttons.push({
-                    iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(4662, "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(4662, "Configure {0}", collection.label)),
-                    action: () => editorService.openEditor({
-                        resource: collection.presentation.origin,
-                    })
-                });
-            }
-            if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
-                buttons.push({
-                    iconClass: ThemeIcon.asClassName(Codicon.warning),
-                    tooltip: ( localize(4663, "Show Output")),
-                    action: () => mcpServer.showOutput(),
-                });
-            }
-        }
-        else if (toolSetOrTool.source.type === 'extension') {
-            const key = ToolDataSource.toKey(toolSetOrTool.source);
-            bucket = toolBuckets.get(key) ?? {
-                type: 'item',
-                label: ( localize(4665, 'Extension: {0}', toolSetOrTool.source.label)),
-                ordinal: BucketOrdinal.Extension,
-                picked: false,
-                alwaysShow: true,
-                children: []
-            };
-            toolBuckets.set(key, bucket);
-        }
-        else if (toolSetOrTool.source.type === 'internal') {
-            bucket = builtinBucket;
-        }
-        else if (toolSetOrTool.source.type === 'user') {
-            bucket = userBucket;
-            buttons.push({
-                iconClass: ThemeIcon.asClassName(Codicon.edit),
-                tooltip: ( localize(4668, "Edit Tool Set")),
-                action: () => {
-                    assertType(toolSetOrTool.source.type === 'user');
-                    editorService.openEditor({ resource: toolSetOrTool.source.file });
-                }
-            });
-        }
-        else {
-            assertNever();
-        }
-        if (toolSetOrTool instanceof ToolSet) {
-            if (toolSetOrTool.source.type !== 'mcp') {
-                bucket.children.push({
-                    parent: bucket,
-                    type: 'item',
-                    picked,
-                    toolset: toolSetOrTool,
-                    label: toolSetOrTool.referenceName,
-                    description: toolSetOrTool.description,
-                    indented: true,
-                    buttons
-                });
-            }
-            else {
-                bucket.toolset = toolSetOrTool;
-                bucket.picked = picked;
-            }
-        }
-        else if (toolSetOrTool.canBeReferencedInPrompt) {
-            bucket.children.push({
-                parent: bucket,
-                type: 'item',
-                picked,
-                tool: toolSetOrTool,
-                label: toolSetOrTool.toolReferenceName ?? toolSetOrTool.displayName,
-                description: toolSetOrTool.userDescription ?? toolSetOrTool.modelDescription,
-                indented: 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)) {
-        picks.push({
-            type: 'separator',
-            label: bucket.status
-        });
-        picks.push(bucket);
-        picks.push(...bucket.children.sort((a, b) => a.label.localeCompare(b.label)));
-    }
-    const picker = store.add(quickPickService.createQuickPick({ useSeparators: true }));
-    picker.placeholder = placeHolder;
-    picker.ignoreFocusOut = true;
-    picker.description = description;
-    picker.canSelectMany = true;
-    picker.keepScrollPosition = true;
-    picker.sortByLabel = false;
-    picker.matchOnDescription = true;
-    if (picks.length === 0) {
-        picker.placeholder = ( localize(4669, "Add tools to chat"));
-        picker.canSelectMany = false;
-        picks.push(addMcpPick, addExpPick);
-    }
-    else {
-        picks.push({ type: 'separator' }, configureToolSetsPick, addPick);
-    }
-    let lastSelectedItems = ( new Set());
-    let ignoreEvent = false;
-    const result = ( new Map());
-    const _update = () => {
-        ignoreEvent = true;
-        try {
-            const items = picks.filter((p) => p.type === 'item' && Boolean(p.picked));
-            lastSelectedItems = ( new Set(items));
-            picker.selectedItems = items;
-            let count = 0;
-            result.clear();
-            for (const item of picks) {
-                if (item.type !== 'item') {
-                    continue;
-                }
-                if (isToolSetPick(item)) {
-                    result.set(item.toolset, item.picked);
-                    count += Iterable.length(item.toolset.getTools());
-                }
-                else if (isToolPick(item)) {
-                    result.set(item.tool, item.picked);
-                    count++;
-                }
-                else if (isBucketPick(item)) {
-                    if (item.toolset) {
-                        result.set(item.toolset, item.picked);
-                    }
-                    for (const child of item.children) {
-                        if (isToolSetPick(child)) {
-                            result.set(child.toolset, item.picked);
-                            count += Iterable.length(child.toolset.getTools());
-                        }
-                        else if (isToolPick(child)) {
-                            result.set(child.tool, item.picked);
-                            count++;
-                        }
-                    }
-                }
-            }
-            if (toolLimit) {
-                if (count > toolLimit) {
-                    picker.severity = Severity.Warning;
-                    picker.validationMessage = ( localize(
-                        4670,
-                        "{0} tools are enabled. You may experience degraded tool calling above {1} tools.",
-                        count,
-                        toolLimit
-                    ));
-                }
-                else {
-                    picker.severity = Severity.Ignore;
-                    picker.validationMessage = undefined;
-                }
-            }
-            if (onUpdate) {
-                let didChange = toolsEntries.size !== result.size;
-                for (const [key, value] of toolsEntries) {
-                    if (didChange) {
-                        break;
-                    }
-                    didChange = result.get(key) !== value;
-                }
-                if (didChange) {
-                    onUpdate(result);
-                }
-            }
-        }
-        finally {
-            ignoreEvent = false;
-        }
-    };
-    _update();
-    picker.items = picks;
-    picker.show();
-    store.add(picker.onDidTriggerItemButton(e => {
-        if (isActionableButton(e.button)) {
-            e.button.action();
-            store.dispose();
-        }
-    }));
-    store.add(picker.onDidChangeSelection(selectedPicks => {
-        if (ignoreEvent) {
-            return;
-        }
-        const addPick = selectedPicks.find(isCallbackPick);
-        if (addPick) {
-            return;
-        }
-        const { added, removed } = diffSets(lastSelectedItems, ( new Set(selectedPicks)));
-        for (const item of added) {
-            item.picked = true;
-            if (isBucketPick(item)) {
-                for (const toolPick of item.children) {
-                    toolPick.picked = true;
-                }
-            }
-            else if (isToolPick(item) || isToolSetPick(item)) {
-                item.parent.picked = true;
-            }
-        }
-        for (const item of removed) {
-            item.picked = false;
-            if (isBucketPick(item)) {
-                for (const toolPick of item.children) {
-                    toolPick.picked = false;
-                }
-            }
-            else if ((isToolPick(item) || isToolSetPick(item)) && item.parent.children.every(child => !child.picked)) {
-                item.parent.picked = false;
-            }
-        }
-        _update();
-    }));
-    let didAccept = false;
-    store.add(picker.onDidAccept(() => {
-        const callbackPick = picker.activeItems.find(isCallbackPick);
-        if (callbackPick) {
-            callbackPick.run();
-        }
-        else {
-            didAccept = true;
-        }
-    }));
-    await Promise.race([Event.toPromise(Event.any(picker.onDidAccept, picker.onDidHide))]);
-    store.dispose();
-    for (const item of toolsService.toolSets.get()) {
-        if (item.source.type === 'mcp') {
-            const toolsInSet = Array.from(item.getTools());
-            result.set(item, toolsInSet.every(tool => result.get(tool)));
-        }
-    }
-    return didAccept ? result : undefined;
+    return didAccept ? collectResults() : undefined;
 }
 
 export { showToolsPicker };