@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/mcpListWidget.js

@@ -15,6 +15,9 @@ import { defaultButtonStyles, defaultInputBoxStyles } from '@codingame/monaco-vs
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { McpConnectionState, McpServerInstallState } 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 { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { isContributionDisabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
@@ -23,23 +26,41 @@ import { InputBox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui
 import { IContextViewService, IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { Action, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { getContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerActions';
 import { LocalMcpServerScope } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService';
-import { workspaceIcon, userIcon, extensionIcon } from './aiCustomizationIcons.js';
+import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { mcpServerIcon, workspaceIcon, userIcon, pluginIcon, extensionIcon, builtinIcon } from './aiCustomizationIcons.js';
+import { formatDisplayName } from './aiCustomizationListWidget.js';
+import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
+import { CustomizationHarness } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService';
+import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
+import { CUSTOMIZATION_GROUP_HEADER_HEIGHT, CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR, CustomizationGroupHeaderRenderer } from './customizationGroupHeaderRenderer.js';
+import { AgentPluginItemKind } from '../agentPluginEditor/agentPluginItems.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { truncateToFirstLine } from './aiCustomizationListWidgetUtils.js';
 
 registerCss(aiCustomizationManagement);
 const $ = $$1;
 const MCP_ITEM_HEIGHT = 36;
-const MCP_GROUP_HEADER_HEIGHT = 36;
-const MCP_GROUP_HEADER_HEIGHT_WITH_SEPARATOR = 40;
+const PLUGIN_COLLECTION_PREFIX = "plugin.";
+const COPILOT_EXTENSION_IDS = ["github.copilot", "github.copilot-chat"];
+function isCopilotExtension(id) {
+    return ( COPILOT_EXTENSION_IDS.some(copilotId => ExtensionIdentifier.equals(id, copilotId)));
+}
+function getPluginUriFromCollectionId(collectionId) {
+    return collectionId?.startsWith(PLUGIN_COLLECTION_PREFIX) ? collectionId.slice(PLUGIN_COLLECTION_PREFIX.length) : undefined;
+}
 class McpServerItemDelegate {
     getHeight(element) {
         if (element.type === "group-header") {
-            return element.isFirst ? MCP_GROUP_HEADER_HEIGHT : MCP_GROUP_HEADER_HEIGHT_WITH_SEPARATOR;
+            return element.isFirst ? CUSTOMIZATION_GROUP_HEADER_HEIGHT : CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR;
+        }
+        if (element.type === "server-item" && element.server.gallery && !element.server.local) {
+            return 62;
         }
         return MCP_ITEM_HEIGHT;
     }
@@ -54,104 +75,104 @@ class McpServerItemDelegate {
         return server.gallery && !server.local ? "mcpGalleryItem" : "mcpServerItem";
     }
 }
-class McpGroupHeaderRenderer {
-    constructor(hoverService) {
-        this.hoverService = hoverService;
-        this.templateId = "mcpGroupHeader";
-    }
-    renderTemplate(container) {
-        const disposables = ( new DisposableStore());
-        const elementDisposables = ( new DisposableStore());
-        container.classList.add("ai-customization-group-header");
-        const chevron = append(container, $(".group-chevron"));
-        const icon = append(container, $(".group-icon"));
-        const labelGroup = append(container, $(".group-label-group"));
-        const label = append(labelGroup, $(".group-label"));
-        const infoIcon = append(labelGroup, $(".group-info"));
-        infoIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.info));
-        const count = append(container, $(".group-count"));
-        return {
-            container,
-            chevron,
-            icon,
-            label,
-            count,
-            infoIcon,
-            disposables,
-            elementDisposables
-        };
-    }
-    renderElement(element, _index, templateData) {
-        templateData.elementDisposables.clear();
-        templateData.chevron.className = "group-chevron";
-        templateData.chevron.classList.add(
-            ...ThemeIcon.asClassNameArray(element.collapsed ? Codicon.chevronRight : Codicon.chevronDown)
-        );
-        templateData.icon.className = "group-icon";
-        templateData.icon.classList.add(...ThemeIcon.asClassNameArray(element.icon));
-        templateData.label.textContent = element.label;
-        templateData.count.textContent = `${element.count}`;
-        templateData.elementDisposables.add(this.hoverService.setupDelayedHover(templateData.infoIcon, () => ({
-            content: element.description,
-            appearance: {
-                compact: true,
-                skipFadeInAnimation: true
-            }
-        })));
-        templateData.container.classList.toggle("collapsed", element.collapsed);
-        templateData.container.classList.toggle("has-previous-group", !element.isFirst);
-    }
-    disposeTemplate(templateData) {
-        templateData.elementDisposables.dispose();
-        templateData.disposables.dispose();
-    }
-}
 let McpServerItemRenderer = class McpServerItemRenderer {
-    constructor(mcpService, workspaceService) {
+    constructor(
+        mcpService,
+        workspaceService,
+        agentPluginService,
+        harnessService,
+        hoverService
+    ) {
         this.mcpService = mcpService;
         this.workspaceService = workspaceService;
+        this.agentPluginService = agentPluginService;
+        this.harnessService = harnessService;
+        this.hoverService = hoverService;
         this.templateId = "mcpServerItem";
     }
     renderTemplate(container) {
         container.classList.add("mcp-server-item");
+        const typeIcon = append(container, $(".mcp-server-icon"));
+        typeIcon.classList.add(...ThemeIcon.asClassNameArray(mcpServerIcon));
         const details = append(container, $(".mcp-server-details"));
-        const name = append(details, $(".mcp-server-name"));
+        const nameRow = append(details, $(".mcp-server-name-row"));
+        const name = append(nameRow, $(".mcp-server-name"));
+        const bridgedBadge = append(nameRow, $(".inline-badge.mcp-bridged-badge"));
+        bridgedBadge.textContent = ( localize(5394, "Bridged"));
         const description = append(details, $(".mcp-server-description"));
         const status = append(container, $(".mcp-server-status"));
         return {
             container,
+            typeIcon,
             name,
             description,
             status,
+            bridgedBadge,
             disposables: ( new DisposableStore())
         };
     }
     renderElement(element, index, templateData) {
         templateData.disposables.clear();
+        templateData.disposables.add(autorun(reader => {
+            const activeId = this.harnessService.activeHarness.read(reader);
+            templateData.bridgedBadge.style.display = activeId !== CustomizationHarness.VSCode ? "" : "none";
+        }));
+        templateData.disposables.add(this.hoverService.setupManagedHover(
+            getDefaultHoverDelegate("mouse"),
+            templateData.bridgedBadge,
+            ( localize(
+            5395,
+            "This server is managed by VS Code and forwarded to all compatible agent sessions."
+        ))
+        ));
         if (element.type === "builtin-item") {
             templateData.container.classList.add("builtin");
-            templateData.name.textContent = element.label;
+            templateData.name.textContent = formatDisplayName(element.label);
             if (element.description) {
-                templateData.description.textContent = element.description;
+                templateData.description.textContent = truncateToFirstLine(element.description);
                 templateData.description.style.display = "";
             } else {
                 templateData.description.style.display = "none";
             }
             templateData.status.style.display = "none";
+            const pluginUriStr = getPluginUriFromCollectionId(element.collectionId);
+            if (pluginUriStr) {
+                templateData.disposables.add(this.hoverService.setupDelayedHover(templateData.container, () => {
+                    const plugin = this.agentPluginService.plugins.get().find(p => ( p.uri.toString()) === pluginUriStr);
+                    if (plugin) {
+                        return {
+                            content: `${element.label}\n${( localize(5396, "Plugin: {0}", plugin.label))}`,
+                            appearance: {
+                                compact: true,
+                                skipFadeInAnimation: true
+                            }
+                        };
+                    }
+                    return {
+                        content: element.label,
+                        appearance: {
+                            compact: true,
+                            skipFadeInAnimation: true
+                        }
+                    };
+                }));
+            }
             return;
         }
         templateData.container.classList.remove("builtin");
-        templateData.name.textContent = element.server.label;
+        templateData.name.textContent = formatDisplayName(element.server.label);
         if (element.server.description) {
-            templateData.description.textContent = element.server.description;
+            templateData.description.textContent = truncateToFirstLine(element.server.description);
             templateData.description.style.display = "";
         } else {
             templateData.description.style.display = "none";
         }
         const server = this.mcpService.servers.get().find(s => s.definition.id === element.server.id);
         templateData.disposables.add(autorun(reader => {
+            const disabled = server ? isContributionDisabled(server.enablement.read(reader)) : false;
             const connectionState = server?.connectionState.read(reader);
-            this.updateStatus(templateData.status, connectionState?.state);
+            templateData.container.classList.toggle("disabled", disabled);
+            this.updateStatus(templateData.status, disabled ? "disabled" : connectionState?.state);
         }));
     }
     updateStatus(statusElement, state) {
@@ -161,22 +182,27 @@ let McpServerItemRenderer = class McpServerItemRenderer {
             return;
         }
         statusElement.style.display = "";
+        if (state === "disabled") {
+            statusElement.textContent = ( localize(5397, "Disabled"));
+            statusElement.classList.add("disabled");
+            return;
+        }
         switch (state) {
         case McpConnectionState.Kind.Running:
-            statusElement.textContent = ( localize(5320, "Running"));
+            statusElement.textContent = ( localize(5398, "Running"));
             statusElement.classList.add("running");
             break;
         case McpConnectionState.Kind.Starting:
-            statusElement.textContent = ( localize(5321, "Starting"));
+            statusElement.textContent = ( localize(5399, "Starting"));
             statusElement.classList.add("starting");
             break;
         case McpConnectionState.Kind.Error:
-            statusElement.textContent = ( localize(5322, "Error"));
+            statusElement.textContent = ( localize(5400, "Error"));
             statusElement.classList.add("error");
             break;
         case McpConnectionState.Kind.Stopped:
         default:
-            statusElement.textContent = ( localize(5323, "Stopped"));
+            statusElement.textContent = ( localize(5401, "Stopped"));
             statusElement.classList.add("stopped");
             break;
         }
@@ -185,20 +211,23 @@ let McpServerItemRenderer = class McpServerItemRenderer {
         templateData.disposables.dispose();
     }
 };
-McpServerItemRenderer = ( __decorate([( __param(0, IMcpService)), ( __param(1, IAICustomizationWorkspaceService))], McpServerItemRenderer));
+McpServerItemRenderer = ( __decorate([( __param(0, IMcpService)), ( __param(1, IAICustomizationWorkspaceService)), ( __param(2, IAgentPluginService)), ( __param(3, ICustomizationHarnessService)), ( __param(4, IHoverService))], McpServerItemRenderer));
 class McpGalleryItemRenderer {
     constructor(mcpWorkbenchService) {
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.templateId = "mcpGalleryItem";
     }
     renderTemplate(container) {
-        container.classList.add("mcp-server-item", "mcp-gallery-item");
-        const details = append(container, $(".mcp-server-details"));
-        const nameRow = append(details, $(".mcp-gallery-name-row"));
-        const name = append(nameRow, $(".mcp-server-name"));
-        const publisher = append(nameRow, $(".mcp-gallery-publisher"));
-        const description = append(details, $(".mcp-server-description"));
-        const actionContainer = append(container, $(".mcp-gallery-action"));
+        container.classList.add("mcp-server-item", "mcp-gallery-item", "extension-list-item");
+        const details = append(container, $(".details"));
+        const headerContainer = append(details, $(".header-container"));
+        const header = append(headerContainer, $(".header"));
+        const name = append(header, $("span.name"));
+        const description = append(details, $(".description.ellipsis"));
+        const footer = append(details, $(".footer"));
+        const publisherContainer = append(footer, $(".publisher-container"));
+        const publisher = append(publisherContainer, $("span.publisher-name"));
+        const actionContainer = append(footer, $(".mcp-gallery-action"));
         const installButton = ( new Button(actionContainer, {
             ...defaultButtonStyles,
             supportIcons: true
@@ -225,7 +254,7 @@ class McpGalleryItemRenderer {
         templateData.elementDisposables.add(templateData.installButton.onDidClick(async () => {
             const canInstall = this.mcpWorkbenchService.canInstall(element.server);
             if (canInstall === true) {
-                templateData.installButton.label = ( localize(5324, "Installing..."));
+                templateData.installButton.label = ( localize(5402, "Installing..."));
                 templateData.installButton.enabled = false;
                 await this.mcpWorkbenchService.install(element.server);
             }
@@ -239,15 +268,15 @@ class McpGalleryItemRenderer {
     updateInstallButton(button, server) {
         switch (server.installState) {
         case McpServerInstallState.Installed:
-            button.label = ( localize(5325, "Installed"));
+            button.label = ( localize(5403, "Installed"));
             button.enabled = false;
             break;
         case McpServerInstallState.Installing:
-            button.label = ( localize(5324, "Installing..."));
+            button.label = ( localize(5402, "Installing..."));
             button.enabled = false;
             break;
         default:
-            button.label = ( localize(5326, "Install"));
+            button.label = ( localize(5404, "Install"));
             button.enabled = true;
             break;
         }
@@ -262,28 +291,41 @@ let McpListWidget = class McpListWidget extends Disposable {
         instantiationService,
         mcpWorkbenchService,
         mcpService,
+        mcpRegistry,
         commandService,
         openerService,
         contextViewService,
         contextMenuService,
-        hoverService
+        hoverService,
+        agentPluginService,
+        dialogService
     ) {
         super();
         this.instantiationService = instantiationService;
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.mcpService = mcpService;
+        this.mcpRegistry = mcpRegistry;
         this.commandService = commandService;
         this.openerService = openerService;
         this.contextViewService = contextViewService;
         this.contextMenuService = contextMenuService;
         this.hoverService = hoverService;
+        this.agentPluginService = agentPluginService;
+        this.dialogService = dialogService;
         this._onDidSelectServer = this._register(( new Emitter()));
         this.onDidSelectServer = this._onDidSelectServer.event;
+        this._onDidChangeItemCount = this._register(( new Emitter()));
+        this.onDidChangeItemCount = this._onDidChangeItemCount.event;
+        this._onDidRequestShowPlugin = this._register(( new Emitter()));
+        this.onDidRequestShowPlugin = this._onDidRequestShowPlugin.event;
         this.filteredServers = [];
+        this.filteredBuiltinCount = 0;
         this.displayEntries = [];
         this.galleryServers = [];
         this.searchQuery = "";
         this.browseMode = false;
+        this.lastHeight = 0;
+        this.lastWidth = 0;
         this.collapsedGroups = ( new Set());
         this.delayedFilter = ( new Delayer(200));
         this.delayedGallerySearch = ( new Delayer(400));
@@ -299,7 +341,7 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.searchAndButtonContainer = append(this.element, $(".list-search-and-button-container"));
         const searchContainer = append(this.searchAndButtonContainer, $(".list-search-container"));
         this.searchInput = this._register(( new InputBox(searchContainer, this.contextViewService, {
-            placeholder: ( localize(5327, "Type to search...")),
+            placeholder: ( localize(5405, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
@@ -317,29 +359,34 @@ let McpListWidget = class McpListWidget extends Disposable {
             secondary: true,
             supportIcons: true
         })));
-        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5328, "Browse Marketplace"))}`;
+        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5406, "Browse Marketplace"))}`;
         this.browseButton.element.classList.add("list-add-button");
         this._register(this.browseButton.onDidClick(() => {
             this.toggleBrowseMode(!this.browseMode);
         }));
-        const addButtonContainer = append(buttonContainer, $(".list-add-button-container"));
-        this.addButton = this._register(( new Button(addButtonContainer, {
+        this.addButton = this._register(( new Button(buttonContainer, {
             ...defaultButtonStyles,
-            supportIcons: true
+            secondary: true,
+            supportIcons: true,
+            title: ( localize(5407, "Add Server")),
+            ariaLabel: ( localize(5407, "Add Server"))
         })));
-        this.addButton.label = `$(${Codicon.add.id}) ${( localize(5329, "Add Server"))}`;
-        this.addButton.element.classList.add("list-add-button");
+        this.addButton.label = `$(${Codicon.add.id})`;
+        this.addButton.element.classList.add("list-icon-button");
+        this._register(
+            this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), this.addButton.element, ( localize(5408, "Add Server")))
+        );
         this._register(this.addButton.onDidClick(() => {
             this.commandService.executeCommand(McpCommandIds.AddConfiguration);
         }));
         this.backLink = append(this.element, $(".mcp-back-link"));
         this.backLink.setAttribute("role", "button");
         this.backLink.tabIndex = 0;
-        this.backLink.setAttribute("aria-label", ( localize(5330, "Back to installed servers")));
+        this.backLink.setAttribute("aria-label", ( localize(5409, "Back to installed servers")));
         const backIcon = append(this.backLink, $("span"));
         backIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.arrowLeft));
         const backText = append(this.backLink, $("span"));
-        backText.textContent = ( localize(5331, "Back to installed servers"));
+        backText.textContent = ( localize(5410, "Back to installed servers"));
         this._register(addDisposableListener(this.backLink, "click", () => {
             this.toggleBrowseMode(false);
         }));
@@ -351,19 +398,20 @@ let McpListWidget = class McpListWidget extends Disposable {
         }));
         this.backLink.style.display = "none";
         this.emptyContainer = append(this.element, $(".mcp-empty-state"));
-        const emptyIcon = append(this.emptyContainer, $(".empty-icon"));
+        const emptyHeader = append(this.emptyContainer, $(".empty-state-header"));
+        const emptyIcon = append(emptyHeader, $(".empty-icon"));
         emptyIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.server));
-        this.emptyText = append(this.emptyContainer, $(".empty-text"));
+        this.emptyText = append(emptyHeader, $(".empty-text"));
         this.emptySubtext = append(this.emptyContainer, $(".empty-subtext"));
         this.listContainer = append(this.element, $(".mcp-list-container"));
         this.sectionHeader = append(this.element, $(".section-footer"));
         this.sectionDescription = append(this.sectionHeader, $("p.section-footer-description"));
         this.sectionDescription.textContent = ( localize(
-            5332,
+            5411,
             "An open standard that lets AI use external tools and services. MCP servers provide tools for file operations, databases, APIs, and more."
         ));
         this.sectionLink = append(this.sectionHeader, $("a.section-footer-link"));
-        this.sectionLink.textContent = ( localize(5333, "Learn more about MCP servers"));
+        this.sectionLink.textContent = ( localize(5412, "Learn more about MCP servers"));
         this.sectionLink.href = "https://code.visualstudio.com/docs/copilot/chat/mcp-servers";
         this._register(addDisposableListener(this.sectionLink, "click", e => {
             e.preventDefault();
@@ -373,7 +421,7 @@ let McpListWidget = class McpListWidget extends Disposable {
             }
         }));
         const delegate = ( new McpServerItemDelegate());
-        const groupHeaderRenderer = ( new McpGroupHeaderRenderer(this.hoverService));
+        const groupHeaderRenderer = ( new CustomizationGroupHeaderRenderer("mcpGroupHeader", this.hoverService));
         const localRenderer = this.instantiationService.createInstance(McpServerItemRenderer);
         const galleryRenderer = ( new McpGalleryItemRenderer(this.mcpWorkbenchService));
         this.list = this._register(this.instantiationService.createInstance(
@@ -390,11 +438,11 @@ let McpListWidget = class McpListWidget extends Disposable {
                     getAriaLabel(element) {
                         if (element.type === "group-header") {
                             return localize(
-                                5334,
+                                5413,
                                 "{0}, {1} items, {2}",
                                 element.label,
                                 element.count,
-                                element.collapsed ? ( localize(5335, "collapsed")) : ( localize(5336, "expanded"))
+                                element.collapsed ? ( localize(5414, "collapsed")) : ( localize(5415, "expanded"))
                             );
                         }
                         if (element.type === "builtin-item") {
@@ -403,7 +451,7 @@ let McpListWidget = class McpListWidget extends Disposable {
                         return element.server.label;
                     },
                     getWidgetAriaLabel() {
-                        return localize(5337, "MCP Servers");
+                        return localize(5416, "MCP Servers");
                     }
                 },
                 openOnSingleClick: true,
@@ -455,9 +503,9 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.searchInput.value = "";
         this.searchQuery = "";
         this.backLink.style.display = browse ? "" : "none";
-        this.addButton.element.parentElement.style.display = browse ? "none" : "";
+        this.addButton.element.style.display = browse ? "none" : "";
         this.browseButton.element.parentElement.style.display = browse ? "none" : "";
-        this.searchInput.setPlaceHolder(browse ? ( localize(5338, "Search MCP marketplace...")) : ( localize(5327, "Type to search...")));
+        this.searchInput.setPlaceHolder(browse ? ( localize(5417, "Search MCP marketplace...")) : ( localize(5405, "Type to search...")));
         if (browse) {
             void this.queryGallery();
         } else {
@@ -465,13 +513,16 @@ let McpListWidget = class McpListWidget extends Disposable {
             this.galleryServers = [];
             this.filterServers();
         }
+        if (this.lastHeight > 0) {
+            this.layout(this.lastHeight, this.lastWidth);
+        }
     }
     async queryGallery() {
         this.galleryCts?.dispose(true);
         const cts = this.galleryCts = ( new CancellationTokenSource());
         this.emptyContainer.style.display = "flex";
         this.listContainer.style.display = "none";
-        this.emptyText.textContent = ( localize(5339, "Loading marketplace..."));
+        this.emptyText.textContent = ( localize(5418, "Loading marketplace..."));
         this.emptySubtext.textContent = "";
         try {
             const pager = await this.mcpWorkbenchService.queryGallery({
@@ -487,8 +538,8 @@ let McpListWidget = class McpListWidget extends Disposable {
                 this.galleryServers = [];
                 this.emptyContainer.style.display = "flex";
                 this.listContainer.style.display = "none";
-                this.emptyText.textContent = ( localize(5340, "Unable to load marketplace"));
-                this.emptySubtext.textContent = ( localize(5341, "Check your connection and try again"));
+                this.emptyText.textContent = ( localize(5419, "Unable to load marketplace"));
+                this.emptySubtext.textContent = ( localize(5420, "Check your connection and try again"));
             }
         }
     }
@@ -497,10 +548,10 @@ let McpListWidget = class McpListWidget extends Disposable {
             this.emptyContainer.style.display = "flex";
             this.listContainer.style.display = "none";
             if (this.searchQuery.trim()) {
-                this.emptyText.textContent = ( localize(5342, "No servers match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5343, "Try a different search term"));
+                this.emptyText.textContent = ( localize(5421, "No servers match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(5422, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5344, "No MCP servers available"));
+                this.emptyText.textContent = ( localize(5423, "No MCP servers available"));
                 this.emptySubtext.textContent = "";
             }
         } else {
@@ -528,11 +579,11 @@ let McpListWidget = class McpListWidget extends Disposable {
             this.emptyContainer.style.display = "flex";
             this.listContainer.style.display = "none";
             if (this.searchQuery.trim()) {
-                this.emptyText.textContent = ( localize(5345, "No servers match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5343, "Try a different search term"));
+                this.emptyText.textContent = ( localize(5424, "No servers match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(5422, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5346, "No MCP servers configured"));
-                this.emptySubtext.textContent = ( localize(5347, "Add an MCP server configuration to get started"));
+                this.emptyText.textContent = ( localize(5425, "No MCP servers configured"));
+                this.emptySubtext.textContent = ( localize(5426, "Add an MCP server configuration to get started"));
             }
         } else {
             this.emptyContainer.style.display = "none";
@@ -540,19 +591,19 @@ let McpListWidget = class McpListWidget extends Disposable {
         }
         const groups = [{
             scope: LocalMcpServerScope.Workspace,
-            label: ( localize(5348, "Workspace")),
+            label: ( localize(5427, "Workspace")),
             icon: workspaceIcon,
             description: ( localize(
-                5349,
+                5428,
                 "MCP servers configured in your workspace settings, shared with your team via version control."
             )),
             servers: []
         }, {
             scope: LocalMcpServerScope.User,
-            label: ( localize(5350, "User")),
+            label: ( localize(5429, "User")),
             icon: userIcon,
             description: ( localize(
-                5351,
+                5430,
                 "MCP servers configured in your user settings. Private to you and available across all projects."
             )),
             servers: []
@@ -593,32 +644,108 @@ let McpListWidget = class McpListWidget extends Disposable {
             }
             isFirst = false;
         }
-        if (builtinServers.length > 0) {
+        const collectionSources = ( new Map(( this.mcpRegistry.collections.get().map(c => [c.id, c.source]))));
+        const pluginServers = [];
+        const extensionServers = [];
+        const otherBuiltinServers = [];
+        for (const server of builtinServers) {
+            const source = collectionSources.get(server.collection.id);
+            if (server.collection.id.startsWith(PLUGIN_COLLECTION_PREFIX)) {
+                pluginServers.push(server);
+            } else if (source instanceof ExtensionIdentifier && !isCopilotExtension(source)) {
+                extensionServers.push(server);
+            } else {
+                otherBuiltinServers.push(server);
+            }
+        }
+        if (pluginServers.length > 0) {
+            const collapsed = ( this.collapsedGroups.has("plugin"));
+            entries.push({
+                type: "group-header",
+                id: "mcp-group-plugin",
+                scope: "plugin",
+                label: ( localize(5431, "Plugins")),
+                icon: pluginIcon,
+                count: pluginServers.length,
+                isFirst,
+                description: ( localize(5432, "MCP servers provided by installed plugins.")),
+                collapsed
+            });
+            if (!collapsed) {
+                for (const server of pluginServers) {
+                    entries.push({
+                        type: "builtin-item",
+                        id: `builtin-${server.definition.id}`,
+                        label: server.definition.label,
+                        description: "",
+                        collectionId: server.collection.id
+                    });
+                }
+            }
+            isFirst = false;
+        }
+        if (extensionServers.length > 0) {
+            const collapsed = ( this.collapsedGroups.has("extension"));
+            entries.push({
+                type: "group-header",
+                id: "mcp-group-extension",
+                scope: "extension",
+                label: ( localize(5433, "Extensions")),
+                icon: extensionIcon,
+                count: extensionServers.length,
+                isFirst,
+                description: ( localize(5434, "MCP servers contributed by installed VS Code extensions.")),
+                collapsed
+            });
+            if (!collapsed) {
+                for (const server of extensionServers) {
+                    entries.push({
+                        type: "builtin-item",
+                        id: `builtin-${server.definition.id}`,
+                        label: server.definition.label,
+                        description: "",
+                        collectionId: server.collection.id
+                    });
+                }
+            }
+            isFirst = false;
+        }
+        if (otherBuiltinServers.length > 0) {
             const collapsed = ( this.collapsedGroups.has("builtin"));
             entries.push({
                 type: "group-header",
                 id: "mcp-group-builtin",
                 scope: "builtin",
-                label: ( localize(5352, "Built-in")),
-                icon: extensionIcon,
-                count: builtinServers.length,
+                label: ( localize(5435, "Built-in")),
+                icon: builtinIcon,
+                count: otherBuiltinServers.length,
                 isFirst,
-                description: ( localize(5353, "MCP servers built into VS Code. These are available automatically.")),
+                description: ( localize(5436, "MCP servers built into VS Code. These are available automatically.")),
                 collapsed
             });
             if (!collapsed) {
-                for (const server of builtinServers) {
+                for (const server of otherBuiltinServers) {
                     entries.push({
                         type: "builtin-item",
                         id: `builtin-${server.definition.id}`,
                         label: server.definition.label,
-                        description: ""
+                        description: "",
+                        collectionId: server.collection.id
                     });
                 }
             }
+            isFirst = false;
         }
         this.displayEntries = entries;
         this.list.splice(0, this.list.length, this.displayEntries);
+        this.filteredBuiltinCount = builtinServers.length;
+        this._onDidChangeItemCount.fire(this.itemCount);
+    }
+    get itemCount() {
+        return this.filteredServers.length + this.filteredBuiltinCount;
+    }
+    fireItemCount() {
+        this._onDidChangeItemCount.fire(this.itemCount);
     }
     toggleGroup(entry) {
         if (( this.collapsedGroups.has(entry.scope))) {
@@ -629,6 +756,8 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.filterServers();
     }
     layout(height, width) {
+        this.lastHeight = height;
+        this.lastWidth = width;
         const sectionFooterHeight = this.sectionHeader.offsetHeight || 0;
         const searchBarHeight = this.searchAndButtonContainer.offsetHeight || 52;
         const backLinkHeight = this.browseMode ? (this.backLink.offsetHeight || 28) : 0;
@@ -660,7 +789,52 @@ let McpListWidget = class McpListWidget extends Disposable {
         }
     }
     onContextMenu(e) {
-        if (!e.element || e.element.type !== "server-item") {
+        if (!e.element) {
+            return;
+        }
+        if (e.element.type === "builtin-item") {
+            const collectionId = e.element.collectionId;
+            const pluginUriStr = getPluginUriFromCollectionId(collectionId);
+            if (!pluginUriStr) {
+                return;
+            }
+            const plugin = this.agentPluginService.plugins.get().find(p => ( p.uri.toString()) === pluginUriStr);
+            if (!plugin) {
+                return;
+            }
+            const disposables = ( new DisposableStore());
+            const showPluginAction = disposables.add(( new Action("mcpServer.showPlugin", ( localize(5437, "Show Plugin")), undefined, true, async () => {
+                const item = {
+                    kind: AgentPluginItemKind.Installed,
+                    name: plugin.label,
+                    description: plugin.fromMarketplace?.description ?? "",
+                    marketplace: plugin.fromMarketplace?.marketplace,
+                    plugin
+                };
+                this._onDidRequestShowPlugin.fire(item);
+            })));
+            const uninstallAction = disposables.add(( new Action("mcpServer.uninstallPlugin", ( localize(5438, "Uninstall Plugin")), undefined, true, async () => {
+                const result = await this.dialogService.confirm({
+                    message: ( localize(5439, "This MCP server is provided by the plugin '{0}'", plugin.label)),
+                    detail: ( localize(
+                        5440,
+                        "Individual MCP servers from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"
+                    )),
+                    primaryButton: ( localize(5441, "Uninstall Plugin")),
+                    type: "question"
+                });
+                if (result.confirmed) {
+                    plugin.remove();
+                }
+            })));
+            this.contextMenuService.showContextMenu({
+                getAnchor: () => e.anchor,
+                getActions: () => [showPluginAction, uninstallAction],
+                onHide: () => disposables.dispose()
+            });
+            return;
+        }
+        if (e.element.type !== "server-item") {
             return;
         }
         const serverEntry = e.element;
@@ -687,6 +861,6 @@ let McpListWidget = class McpListWidget extends Disposable {
         });
     }
 };
-McpListWidget = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IMcpWorkbenchService)), ( __param(2, IMcpService)), ( __param(3, ICommandService)), ( __param(4, IOpenerService)), ( __param(5, IContextViewService)), ( __param(6, IContextMenuService)), ( __param(7, IHoverService))], McpListWidget));
+McpListWidget = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IMcpWorkbenchService)), ( __param(2, IMcpService)), ( __param(3, IMcpRegistry)), ( __param(4, ICommandService)), ( __param(5, IOpenerService)), ( __param(6, IContextViewService)), ( __param(7, IContextMenuService)), ( __param(8, IHoverService)), ( __param(9, IAgentPluginService)), ( __param(10, IDialogService))], McpListWidget));
 
 export { McpListWidget };