@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.0

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

@@ -11,13 +11,14 @@ import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
-import { defaultButtonStyles, defaultInputBoxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
+import { defaultInputBoxStyles, defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 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 { IMcpWorkbenchService, IMcpService } 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 { MCP_PLUGIN_COLLECTION_ID_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/discovery/pluginMcpDiscovery';
 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';
@@ -40,13 +41,22 @@ import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
 import { CUSTOMIZATION_GROUP_HEADER_HEIGHT, CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR, CustomizationGroupHeaderRenderer } from './customizationGroupHeaderRenderer.js';
 import { AgentPluginItemKind } from '../agentPluginEditor/agentPluginItems.js';
+import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
+import { IAgentHostCustomizationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostCustomizationService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import { McpServerStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
+import { GalleryItemInstallState, GalleryItemRenderer } from './galleryItemRenderer.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 PLUGIN_COLLECTION_PREFIX = "plugin.";
+const PLUGIN_COLLECTION_PREFIX = MCP_PLUGIN_COLLECTION_ID_PREFIX;
 const COPILOT_EXTENSION_IDS = ["github.copilot", "github.copilot-chat"];
 function isCopilotExtension(id) {
     return ( COPILOT_EXTENSION_IDS.some(copilotId => ExtensionIdentifier.equals(id, copilotId)));
@@ -59,7 +69,7 @@ class McpServerItemDelegate {
         if (element.type === "group-header") {
             return element.isFirst ? CUSTOMIZATION_GROUP_HEADER_HEIGHT : CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR;
         }
-        if (element.type === "server-item" && element.server.gallery && !element.server.local) {
+        if (element.type === "server-item" && element.server.gallery && (element.marketplace || !element.server.local)) {
             return 62;
         }
         return MCP_ITEM_HEIGHT;
@@ -71,13 +81,15 @@ class McpServerItemDelegate {
         if (element.type === "builtin-item") {
             return "mcpServerItem";
         }
+        if (element.type === "session-server-item") {
+            return "mcpServerItem";
+        }
         const server = element.server;
-        return server.gallery && !server.local ? "mcpGalleryItem" : "mcpServerItem";
+        return server.gallery && (element.marketplace || !server.local) ? MCP_GALLERY_ITEM_TEMPLATE_ID : "mcpServerItem";
     }
 }
 let McpServerItemRenderer = class McpServerItemRenderer {
-    constructor(mcpService, workspaceService, agentPluginService, hoverService) {
-        this.mcpService = mcpService;
+    constructor(workspaceService, agentPluginService, hoverService) {
         this.workspaceService = workspaceService;
         this.agentPluginService = agentPluginService;
         this.hoverService = hoverService;
@@ -105,6 +117,7 @@ let McpServerItemRenderer = class McpServerItemRenderer {
         templateData.disposables.clear();
         if (element.type === "builtin-item") {
             templateData.container.classList.add("builtin");
+            templateData.container.classList.toggle("has-detail", false);
             templateData.name.textContent = formatDisplayName(element.label);
             if (element.description) {
                 templateData.description.textContent = truncateToFirstLine(element.description);
@@ -112,14 +125,14 @@ let McpServerItemRenderer = class McpServerItemRenderer {
             } else {
                 templateData.description.style.display = "none";
             }
-            templateData.status.style.display = "none";
+            this.updateKnownServerStatus(templateData, element.localServer, element.activeSessionServer);
             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(5709, "Plugin: {0}", plugin.label))}`,
+                            content: `${element.label}\n${( localize(6023, "Plugin: {0}", plugin.label))}`,
                             appearance: {
                                 compact: true,
                                 skipFadeInAnimation: true
@@ -137,6 +150,14 @@ let McpServerItemRenderer = class McpServerItemRenderer {
             }
             return;
         }
+        if (element.type === "session-server-item") {
+            templateData.container.classList.remove("builtin");
+            templateData.container.classList.toggle("has-detail", false);
+            templateData.name.textContent = formatDisplayName(element.server.name);
+            templateData.description.style.display = "none";
+            this.updateActiveSessionStatus(templateData, element.server);
+            return;
+        }
         templateData.container.classList.remove("builtin");
         templateData.name.textContent = formatDisplayName(element.server.label);
         const description = element.server.description?.trim();
@@ -149,122 +170,256 @@ let McpServerItemRenderer = class McpServerItemRenderer {
         } else {
             templateData.description.style.display = "none";
         }
-        const server = this.mcpService.servers.get().find(s => s.definition.id === element.server.id);
+        if (element.activeSessionServer) {
+            this.updateKnownServerStatus(templateData, element.localServer, element.activeSessionServer);
+        } else if (this.workspaceService.isSessionsWindow) {
+            this.updateKnownServerStatus(templateData, element.localServer, undefined);
+        } else {
+            templateData.disposables.add(autorun(reader => {
+                const disabled = element.localServer ? isContributionDisabled(element.localServer.enablement.read(reader)) : false;
+                const connectionState = element.localServer?.connectionState.read(reader);
+                templateData.container.classList.toggle("disabled", disabled);
+                this.updateStatus(templateData.status, disabled ? "disabled" : connectionState?.state);
+            }));
+        }
+    }
+    updateKnownServerStatus(templateData, localServer, activeSessionServer) {
         templateData.disposables.add(autorun(reader => {
-            const disabled = server ? isContributionDisabled(server.enablement.read(reader)) : false;
-            const connectionState = server?.connectionState.read(reader);
-            templateData.container.classList.toggle("disabled", disabled);
-            this.updateStatus(templateData.status, disabled ? "disabled" : connectionState?.state);
+            const localDisabled = localServer ? isContributionDisabled(localServer.enablement.read(reader)) : false;
+            templateData.container.classList.toggle("disabled", localDisabled || activeSessionServer?.enabled === false);
+            this.updateStatus(
+                templateData.status,
+                localDisabled ? "disabled" : activeSessionServer ? (activeSessionServer.enabled ? activeSessionServer.status : "disabled") : undefined
+            );
         }));
     }
+    updateActiveSessionStatus(templateData, server) {
+        const disabled = server?.enabled === false;
+        templateData.container.classList.toggle("disabled", disabled);
+        this.updateStatus(templateData.status, disabled ? "disabled" : server?.status);
+    }
     updateStatus(statusElement, state) {
         statusElement.className = "mcp-server-status";
-        if (this.workspaceService.isSessionsWindow) {
+        const presentation = getMcpStatusPresentation(state);
+        if (!presentation) {
             statusElement.style.display = "none";
             return;
         }
         statusElement.style.display = "";
-        if (state === "disabled") {
-            statusElement.textContent = ( localize(5710, "Disabled"));
-            statusElement.classList.add("disabled");
-            return;
-        }
-        switch (state) {
-        case McpConnectionState.Kind.Running:
-            statusElement.textContent = ( localize(5711, "Running"));
-            statusElement.classList.add("running");
-            break;
-        case McpConnectionState.Kind.Starting:
-            statusElement.textContent = ( localize(5712, "Starting"));
-            statusElement.classList.add("starting");
-            break;
-        case McpConnectionState.Kind.Error:
-            statusElement.textContent = ( localize(5713, "Error"));
-            statusElement.classList.add("error");
-            break;
-        case McpConnectionState.Kind.Stopped:
-        default:
-            statusElement.textContent = ( localize(5714, "Stopped"));
-            statusElement.classList.add("stopped");
-            break;
-        }
+        statusElement.textContent = presentation.label;
+        statusElement.classList.add(presentation.className);
     }
     disposeTemplate(templateData) {
         templateData.disposables.dispose();
     }
 };
-McpServerItemRenderer = ( __decorate([( __param(0, IMcpService)), ( __param(1, IAICustomizationWorkspaceService)), ( __param(2, IAgentPluginService)), ( __param(3, IHoverService))], McpServerItemRenderer));
-class McpGalleryItemRenderer {
-    constructor(mcpWorkbenchService) {
-        this.mcpWorkbenchService = mcpWorkbenchService;
-        this.templateId = "mcpGalleryItem";
+McpServerItemRenderer = ( __decorate([( __param(0, IAICustomizationWorkspaceService)), ( __param(1, IAgentPluginService)), ( __param(2, IHoverService))], McpServerItemRenderer));
+function getMcpStatusPresentation(state) {
+    if (state === undefined) {
+        return undefined;
     }
-    renderTemplate(container) {
-        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 publisherContainer = append(details, $(".publisher-container"));
-        const publisher = append(publisherContainer, $("span.publisher-name.mcp-gallery-publisher"));
-        const actionContainer = append(container, $(".mcp-gallery-action"));
-        const installButton = ( new Button(actionContainer, {
-            ...defaultButtonStyles,
-            supportIcons: true
-        }));
-        installButton.element.classList.add("mcp-gallery-install-button");
-        const templateDisposables = ( new DisposableStore());
-        templateDisposables.add(installButton);
+    if (state === "disabled") {
         return {
-            container,
-            name,
-            publisher,
-            description,
-            installButton,
-            elementDisposables: ( new DisposableStore()),
-            templateDisposables
+            label: ( localize(6024, "Disabled")),
+            className: "disabled"
+        };
+    }
+    switch (state) {
+    case McpConnectionState.Kind.Running:
+    case McpServerStatus.Ready:
+        return {
+            label: ( localize(6025, "Running")),
+            className: "running"
+        };
+    case McpConnectionState.Kind.Starting:
+    case McpServerStatus.Starting:
+        return {
+            label: ( localize(6026, "Starting")),
+            className: "starting"
+        };
+    case McpServerStatus.AuthRequired:
+        return {
+            label: ( localize(6027, "Authentication required")),
+            className: "auth-required"
+        };
+    case McpConnectionState.Kind.Error:
+    case McpServerStatus.Error:
+        return {
+            label: ( localize(6028, "Error")),
+            className: "error"
+        };
+    case McpConnectionState.Kind.Stopped:
+    case McpServerStatus.Stopped:
+    default:
+        return {
+            label: ( localize(6029, "Stopped")),
+            className: "stopped"
         };
     }
-    renderElement(element, _index, templateData) {
-        templateData.elementDisposables.clear();
-        templateData.name.textContent = element.server.label;
-        templateData.publisher.textContent = element.server.publisherDisplayName ? `by ${element.server.publisherDisplayName}` : "";
-        templateData.description.textContent = element.server.description || "";
-        this.updateInstallButton(templateData.installButton, element.server);
-        templateData.elementDisposables.add(templateData.installButton.onDidClick(async () => {
-            const canInstall = this.mcpWorkbenchService.canInstall(element.server);
-            if (canInstall === true) {
-                templateData.installButton.label = ( localize(5715, "Installing..."));
-                templateData.installButton.enabled = false;
-                await this.mcpWorkbenchService.install(element.server);
+}
+function getMcpStatusKind(entry, isSessionsWindow) {
+    if (entry.type === "session-server-item") {
+        return entry.server.enabled ? entry.server.status : "disabled";
+    }
+    if (entry.localServer && isContributionDisabled(entry.localServer.enablement.get())) {
+        return "disabled";
+    }
+    if (entry.activeSessionServer) {
+        return entry.activeSessionServer.enabled ? entry.activeSessionServer.status : "disabled";
+    }
+    if (entry.type === "server-item" && !isSessionsWindow) {
+        return entry.localServer?.connectionState.get().state;
+    }
+    return undefined;
+}
+function getMcpEntryAriaLabel(element, isSessionsWindow) {
+    if (element.type === "group-header") {
+        return localize(
+            6030,
+            "{0}, {1} items, {2}",
+            element.label,
+            element.count,
+            element.collapsed ? ( localize(6031, "collapsed")) : ( localize(6032, "expanded"))
+        );
+    }
+    const label = element.type === "session-server-item" ? element.server.name : element.type === "builtin-item" ? element.label : element.server.label;
+    const status = getMcpStatusPresentation(getMcpStatusKind(element, isSessionsWindow));
+    return status ? ( localize(6033, "{0}, {1}", label, status.label)) : label;
+}
+function normalizeMcpMatchKey(value) {
+    const key = value?.trim().toLowerCase();
+    return key || undefined;
+}
+function getUniqueMcpMatchKeys(values) {
+    const keys = ( new Set());
+    for (const value of values) {
+        const key = normalizeMcpMatchKey(value);
+        if (key) {
+            keys.add(key);
+        }
+    }
+    return [...keys];
+}
+class ActiveSessionMcpServerMatcher {
+    constructor(servers) {
+        this.servers = servers;
+        this.byKey = ( new Map());
+        this.matchedIds = ( new Set());
+        for (const server of servers) {
+            for (const key of getUniqueMcpMatchKeys([server.id, server.name])) {
+                let bucket = this.byKey.get(key);
+                if (!bucket) {
+                    bucket = [];
+                    this.byKey.set(key, bucket);
+                }
+                bucket.push(server);
             }
-        }));
-        templateData.elementDisposables.add(this.mcpWorkbenchService.onChange(changed => {
-            if (!changed || changed.id === element.server.id) {
-                this.updateInstallButton(templateData.installButton, element.server);
+        }
+    }
+    take(keys) {
+        for (const key of getUniqueMcpMatchKeys(keys)) {
+            const matches = this.byKey.get(key);
+            const match = matches?.find(server => !( this.matchedIds.has(server.id)));
+            if (match) {
+                this.matchedIds.add(match.id);
+                return match;
             }
-        }));
+        }
+        return undefined;
+    }
+    unmatched(query) {
+        return this.servers.filter(server => !( this.matchedIds.has(server.id)) && matchesActiveSessionServerQuery(server, query));
+    }
+}
+class LocalMcpServerMatcher {
+    constructor(servers) {
+        this.byKey = ( new Map());
+        for (const server of servers) {
+            for (const key of getRuntimeServerMatchKeys(server)) {
+                this.byKey.set(key, server);
+            }
+        }
+    }
+    find(keys) {
+        for (const key of getUniqueMcpMatchKeys(keys)) {
+            const server = this.byKey.get(key);
+            if (server) {
+                return server;
+            }
+        }
+        return undefined;
+    }
+}
+function matchesActiveSessionServerQuery(server, query) {
+    if (!query) {
+        return true;
+    }
+    return server.name.toLowerCase().includes(query);
+}
+function getWorkbenchServerMatchKeys(server) {
+    return getUniqueMcpMatchKeys([server.id, server.name, server.label]);
+}
+function getRuntimeServerMatchKeys(server) {
+    return getUniqueMcpMatchKeys([server.definition.id, server.definition.label]);
+}
+function getActiveSessionServerOptionsAction(commandService, sessionResource, server) {
+    return (new Action(
+        "mcpServer.activeSession.options",
+        localize(6034, "Server Options"),
+        undefined,
+        true,
+        async () => {
+            await commandService.executeCommand(McpCommandIds.AgentHostServerOptions, sessionResource, server.id);
+        }
+    ));
+}
+function createBuiltinEntry(server, activeSessionServer) {
+    return {
+        type: "builtin-item",
+        id: `builtin-${server.definition.id}`,
+        label: server.definition.label,
+        description: "",
+        collectionId: server.collection.id,
+        activeSessionServer,
+        localServer: server
+    };
+}
+const MCP_GALLERY_ITEM_TEMPLATE_ID = "mcpGalleryItem";
+class McpGalleryItemProvider {
+    constructor(mcpWorkbenchService) {
+        this.mcpWorkbenchService = mcpWorkbenchService;
+    }
+    getLabel(element) {
+        return element.server.label;
+    }
+    getPublisherDisplayName(element) {
+        return element.server.publisherDisplayName;
     }
-    updateInstallButton(button, server) {
-        switch (server.installState) {
+    getDescription(element) {
+        return element.server.description;
+    }
+    getInstallState(element) {
+        switch (element.server.installState) {
         case McpServerInstallState.Installed:
-            button.label = ( localize(5716, "Installed"));
-            button.enabled = false;
-            break;
+            return GalleryItemInstallState.Installed;
         case McpServerInstallState.Installing:
-            button.label = ( localize(5715, "Installing..."));
-            button.enabled = false;
-            break;
+            return GalleryItemInstallState.Installing;
         default:
-            button.label = ( localize(5717, "Install"));
-            button.enabled = true;
-            break;
+            return GalleryItemInstallState.Uninstalled;
         }
     }
-    disposeTemplate(templateData) {
-        templateData.elementDisposables.dispose();
-        templateData.templateDisposables.dispose();
+    canInstall(element) {
+        return this.mcpWorkbenchService.canInstall(element.server) === true;
+    }
+    async install(element) {
+        await this.mcpWorkbenchService.install(element.server);
+    }
+    onDidChangeInstallState(element, listener) {
+        return this.mcpWorkbenchService.onChange(changed => {
+            if (!changed || changed.id === element.server.id) {
+                listener();
+            }
+        });
     }
 }
 let McpListWidget = class McpListWidget extends Disposable {
@@ -280,7 +435,10 @@ let McpListWidget = class McpListWidget extends Disposable {
         hoverService,
         agentPluginService,
         dialogService,
-        configurationService
+        configurationService,
+        customizationHarnessService,
+        agentHostCustomizationService,
+        workspaceService
     ) {
         super();
         this.instantiationService = instantiationService;
@@ -295,6 +453,9 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.agentPluginService = agentPluginService;
         this.dialogService = dialogService;
         this.configurationService = configurationService;
+        this.customizationHarnessService = customizationHarnessService;
+        this.agentHostCustomizationService = agentHostCustomizationService;
+        this.workspaceService = workspaceService;
         this._onDidSelectServer = this._register(( new Emitter()));
         this.onDidSelectServer = this._onDidSelectServer.event;
         this._onDidChangeItemCount = this._register(( new Emitter()));
@@ -304,6 +465,7 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.disabledLinkListener = this._register(( new MutableDisposable()));
         this.filteredServers = [];
         this.filteredBuiltinCount = 0;
+        this.filteredActiveSessionCount = 0;
         this.displayEntries = [];
         this.galleryServers = [];
         this.searchQuery = "";
@@ -333,17 +495,17 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.sectionTitleHeader = append(this.element, $(".section-title-header"));
         const titleRow = append(this.sectionTitleHeader, $(".section-title-row"));
         const sectionTitle = append(titleRow, $("h2.section-title"));
-        sectionTitle.textContent = ( localize(5718, "MCP Servers"));
+        sectionTitle.textContent = ( localize(6035, "MCP Servers"));
         const sectionTitleDescription = append(this.sectionTitleHeader, $("p.section-title-description"));
         const sectionTitleDescriptionText = append(sectionTitleDescription, $("span.section-title-description-text"));
         sectionTitleDescriptionText.textContent = ( localize(
-            5719,
+            6036,
             "An open standard that lets AI use external tools and services. MCP servers provide tools for file operations, databases, APIs, and more."
         ));
         sectionTitleDescription.appendChild(createTextNode(" "));
         this.sectionLink = append(sectionTitleDescription, $("a.section-title-link"));
-        this.sectionLink.textContent = ( localize(5720, "Learn more about MCP servers"));
-        this.sectionLink.href = "https://code.visualstudio.com/docs/copilot/chat/mcp-servers";
+        this.sectionLink.textContent = ( localize(6037, "Learn more about MCP servers"));
+        this.sectionLink.href = "https://code.visualstudio.com/docs/agent-customization/mcp-servers?referrer=in-product";
         this._register(addDisposableListener(this.sectionLink, "click", e => {
             e.preventDefault();
             const href = this.sectionLink.href;
@@ -368,7 +530,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(5721, "Type to search...")),
+            placeholder: ( localize(6038, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
@@ -385,10 +547,10 @@ let McpListWidget = class McpListWidget extends Disposable {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(5722, "Back to installed servers")),
-            ariaLabel: ( localize(5722, "Back to installed servers"))
+            title: ( localize(6039, "Back to installed servers")),
+            ariaLabel: ( localize(6039, "Back to installed servers"))
         })));
-        this.backButton.label = `$(${Codicon.arrowLeft.id}) ${( localize(5723, "Back"))}`;
+        this.backButton.label = `$(${Codicon.arrowLeft.id}) ${( localize(6040, "Back"))}`;
         this.backButton.element.classList.add("list-add-button");
         backButtonContainer.style.display = "none";
         this._register(this.backButton.onDidClick(() => {
@@ -400,7 +562,7 @@ let McpListWidget = class McpListWidget extends Disposable {
             secondary: true,
             supportIcons: true
         })));
-        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5724, "Browse Marketplace"))}`;
+        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(6041, "Browse Marketplace"))}`;
         this.browseButton.element.classList.add("list-add-button");
         this._register(this.browseButton.onDidClick(() => {
             this.toggleBrowseMode(!this.browseMode);
@@ -409,34 +571,32 @@ let McpListWidget = class McpListWidget extends Disposable {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(5725, "Add Server")),
-            ariaLabel: ( localize(5725, "Add Server"))
+            title: ( localize(6042, "Add Server")),
+            ariaLabel: ( localize(6042, "Add Server"))
         })));
         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(5726, "Add Server")))
+            this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), this.addButton.element, ( localize(6043, "Add Server")))
         );
         this._register(this.addButton.onDidClick(() => {
             this.commandService.executeCommand(McpCommandIds.AddConfiguration);
         }));
         this.emptyContainer = append(this.element, $(".mcp-empty-state"));
         const emptyHeader = append(this.emptyContainer, $(".empty-state-header"));
-        const emptyIcon = append(emptyHeader, $(".empty-icon"));
-        emptyIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.server));
         this.emptyText = append(emptyHeader, $(".empty-text"));
         this.emptySubtext = append(this.emptyContainer, $(".empty-subtext"));
         this.disabledContainer = append(this.element, $(".mcp-disabled-state"));
         const disabledHeader = append(this.disabledContainer, $(".empty-state-header"));
         this.disabledIcon = append(disabledHeader, $(".empty-icon"));
         const disabledText = append(disabledHeader, $(".empty-text"));
-        disabledText.textContent = ( localize(5727, "MCP servers are disabled"));
+        disabledText.textContent = ( localize(6044, "MCP servers are disabled"));
         this.disabledMessage = append(this.disabledContainer, $(".empty-subtext"));
         this.listContainer = append(this.element, $(".mcp-list-container"));
         const delegate = ( new McpServerItemDelegate());
         const groupHeaderRenderer = ( new CustomizationGroupHeaderRenderer("mcpGroupHeader", this.hoverService));
         const localRenderer = this.instantiationService.createInstance(McpServerItemRenderer);
-        const galleryRenderer = ( new McpGalleryItemRenderer(this.mcpWorkbenchService));
+        const galleryRenderer = ( new GalleryItemRenderer(MCP_GALLERY_ITEM_TEMPLATE_ID, ( new McpGalleryItemProvider(this.mcpWorkbenchService))));
         this.list = this._register(this.instantiationService.createInstance(
             WorkbenchList,
             "McpManagementList",
@@ -449,19 +609,10 @@ let McpListWidget = class McpListWidget extends Disposable {
                 horizontalScrolling: false,
                 accessibilityProvider: {
                     getAriaLabel: element => {
-                        if (element.type === "group-header") {
-                            return localize(
-                                5728,
-                                "{0}, {1} items, {2}",
-                                element.label,
-                                element.count,
-                                element.collapsed ? ( localize(5729, "collapsed")) : ( localize(5730, "expanded"))
-                            );
-                        }
-                        return element.type === "builtin-item" ? element.label : element.server.label;
+                        return getMcpEntryAriaLabel(element, this.workspaceService.isSessionsWindow);
                     },
                     getWidgetAriaLabel() {
-                        return localize(5731, "MCP Servers");
+                        return localize(6045, "MCP Servers");
                     }
                 },
                 openOnSingleClick: true,
@@ -484,10 +635,12 @@ let McpListWidget = class McpListWidget extends Disposable {
                     this.toggleGroup(e.element);
                 } else if (e.element.type === "server-item") {
                     const server = e.element.server;
-                    const isGallery = !server.local;
+                    const isGallery = e.element.marketplace || !server.local;
                     if (isGallery || server.description) {
                         this._onDidSelectServer.fire(server);
                     }
+                } else if (e.element.type === "session-server-item") {
+                    this.openActiveSessionServerOptions(e.element.server);
                 }
             }
         }));
@@ -503,6 +656,17 @@ let McpListWidget = class McpListWidget extends Disposable {
                 this.refresh();
             }
         }));
+        this._register(autorun(reader => {
+            this.customizationHarnessService.activeSessionResource.read(reader);
+            if (!this.browseMode) {
+                this.refresh();
+            }
+        }));
+        this._register(this.agentHostCustomizationService.onDidChangeCustomizations(() => {
+            if (!this.browseMode) {
+                this.refresh();
+            }
+        }));
         void this.refresh();
     }
     async refresh() {
@@ -527,13 +691,13 @@ let McpListWidget = class McpListWidget extends Disposable {
             this.disabledLinkListener.clear();
             if (policyLocked) {
                 this.disabledMessage.textContent = ( localize(
-                    5732,
+                    6046,
                     "Access to MCP servers is disabled by your organization. Contact your organization administrator for more information."
                 ));
             } else {
-                this.disabledMessage.appendChild(createTextNode(( localize(5733, "MCP servers are disabled in settings. "))));
+                this.disabledMessage.appendChild(createTextNode(( localize(6047, "MCP servers are disabled in settings. "))));
                 const link = append(this.disabledMessage, $("a.mcp-disabled-settings-link"));
-                link.textContent = ( localize(5734, "Configure in settings."));
+                link.textContent = ( localize(6048, "Configure in settings."));
                 link.href = "#";
                 link.setAttribute("role", "button");
                 this.disabledLinkListener.value = addDisposableListener(link, "click", e => {
@@ -555,7 +719,7 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.addButton.element.style.display = browse ? "none" : "";
         this.browseButton.element.parentElement.style.display = browse ? "none" : "";
         this.backButton.element.parentElement.style.display = browse ? "" : "none";
-        this.searchInput.setPlaceHolder(browse ? ( localize(5735, "Search MCP marketplace...")) : ( localize(5721, "Type to search...")));
+        this.searchInput.setPlaceHolder(browse ? ( localize(6049, "Search MCP marketplace...")) : ( localize(6038, "Type to search...")));
         if (browse) {
             void this.queryGallery();
         } else {
@@ -572,7 +736,7 @@ let McpListWidget = class McpListWidget extends Disposable {
         const cts = this.galleryCts = ( new CancellationTokenSource());
         this.emptyContainer.style.display = "flex";
         this.listContainer.style.display = "none";
-        this.emptyText.textContent = ( localize(5736, "Loading marketplace..."));
+        this.emptyText.textContent = ( localize(6050, "Loading marketplace..."));
         this.emptySubtext.textContent = "";
         try {
             const pager = await this.mcpWorkbenchService.queryGallery({
@@ -588,8 +752,8 @@ let McpListWidget = class McpListWidget extends Disposable {
                 this.galleryServers = [];
                 this.emptyContainer.style.display = "flex";
                 this.listContainer.style.display = "none";
-                this.emptyText.textContent = ( localize(5737, "Unable to load marketplace"));
-                this.emptySubtext.textContent = ( localize(5738, "Check your connection and try again"));
+                this.emptyText.textContent = ( localize(6051, "Unable to load marketplace"));
+                this.emptySubtext.textContent = ( localize(6052, "Check your connection and try again"));
             }
         }
     }
@@ -598,10 +762,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(5739, "No servers match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5740, "Try a different search term"));
+                this.emptyText.textContent = ( localize(6053, "No servers match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(6054, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5741, "No MCP servers available"));
+                this.emptyText.textContent = ( localize(6055, "No MCP servers available"));
                 this.emptySubtext.textContent = "";
             }
         } else {
@@ -610,12 +774,16 @@ let McpListWidget = class McpListWidget extends Disposable {
         }
         const entries = ( this.galleryServers.map(server => ({
             type: "server-item",
-            server
+            server,
+            marketplace: true
         })));
         this.list.splice(0, this.list.length, entries);
     }
     filterServers() {
         const query = this.searchQuery.toLowerCase().trim();
+        const activeSessionResource = this.customizationHarnessService.activeSessionResource.get();
+        const activeSessionMatcher = ( new ActiveSessionMcpServerMatcher(this.agentHostCustomizationService.getMcpServers(activeSessionResource)));
+        const localServerMatcher = ( new LocalMcpServerMatcher(this.mcpService.servers.get()));
         if (query) {
             this.filteredServers = this.mcpWorkbenchService.local.filter(
                 server => server.label.toLowerCase().includes(query) || (server.description?.toLowerCase().includes(query))
@@ -625,45 +793,36 @@ let McpListWidget = class McpListWidget extends Disposable {
         }
         const localIds = ( new Set(( this.filteredServers.map(s => s.id))));
         const builtinServers = this.mcpService.servers.get().filter(s => !( localIds.has(s.definition.id))).filter(s => !query || s.definition.label.toLowerCase().includes(query));
-        if (this.filteredServers.length === 0 && builtinServers.length === 0) {
-            this.emptyContainer.style.display = "flex";
-            this.listContainer.style.display = "none";
-            if (this.searchQuery.trim()) {
-                this.emptyText.textContent = ( localize(5742, "No servers match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5740, "Try a different search term"));
-            } else {
-                this.emptyText.textContent = ( localize(5743, "No MCP servers configured"));
-                this.emptySubtext.textContent = ( localize(5744, "Add an MCP server configuration to get started"));
-            }
-        } else {
-            this.emptyContainer.style.display = "none";
-            this.listContainer.style.display = "";
-        }
         const groups = [{
             scope: LocalMcpServerScope.Workspace,
-            label: ( localize(5745, "Workspace")),
+            label: ( localize(6056, "Workspace")),
             icon: workspaceIcon,
             description: ( localize(
-                5746,
+                6057,
                 "MCP servers configured in your workspace settings, shared with your team via version control."
             )),
             servers: []
         }, {
             scope: LocalMcpServerScope.User,
-            label: ( localize(5747, "User")),
+            label: ( localize(6058, "User")),
             icon: userIcon,
             description: ( localize(
-                5748,
+                6059,
                 "MCP servers configured in your user settings. Private to you and available across all projects."
             )),
             servers: []
         }];
         for (const server of this.filteredServers) {
+            const entry = {
+                server,
+                activeSessionServer: activeSessionMatcher.take(getWorkbenchServerMatchKeys(server)),
+                localServer: localServerMatcher.find(getWorkbenchServerMatchKeys(server))
+            };
             const scope = server.local?.scope;
             if (scope === LocalMcpServerScope.Workspace) {
-                groups[0].servers.push(server);
+                groups[0].servers.push(entry);
             } else {
-                groups[1].servers.push(server);
+                groups[1].servers.push(entry);
             }
         }
         const entries = [];
@@ -685,10 +844,16 @@ let McpListWidget = class McpListWidget extends Disposable {
                 collapsed
             });
             if (!collapsed) {
-                for (const server of group.servers) {
+                for (const {
+                    server,
+                    activeSessionServer,
+                    localServer
+                } of group.servers) {
                     entries.push({
                         type: "server-item",
-                        server
+                        server,
+                        activeSessionServer,
+                        localServer
                     });
                 }
             }
@@ -699,37 +864,76 @@ let McpListWidget = class McpListWidget extends Disposable {
         const extensionServers = [];
         const otherBuiltinServers = [];
         for (const server of builtinServers) {
+            const entry = {
+                server,
+                activeSessionServer: activeSessionMatcher.take(getRuntimeServerMatchKeys(server))
+            };
             const source = collectionSources.get(server.collection.id);
             if (server.collection.id.startsWith(PLUGIN_COLLECTION_PREFIX)) {
-                pluginServers.push(server);
+                pluginServers.push(entry);
             } else if (source instanceof ExtensionIdentifier && !isCopilotExtension(source)) {
-                extensionServers.push(server);
+                extensionServers.push(entry);
             } else {
-                otherBuiltinServers.push(server);
+                otherBuiltinServers.push(entry);
             }
         }
+        const activeSessionOnlyServers = activeSessionMatcher.unmatched(query);
+        if (this.filteredServers.length === 0 && builtinServers.length === 0 && activeSessionOnlyServers.length === 0) {
+            this.emptyContainer.style.display = "flex";
+            this.listContainer.style.display = "none";
+            if (this.searchQuery.trim()) {
+                this.emptyText.textContent = ( localize(6060, "No servers match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(6054, "Try a different search term"));
+            } else {
+                this.emptyText.textContent = ( localize(6061, "No MCP servers configured"));
+                this.emptySubtext.textContent = ( localize(6062, "Add an MCP server configuration to get started"));
+            }
+        } else {
+            this.emptyContainer.style.display = "none";
+            this.listContainer.style.display = "";
+        }
+        if (activeSessionOnlyServers.length > 0) {
+            const collapsed = ( this.collapsedGroups.has("active-session"));
+            entries.push({
+                type: "group-header",
+                id: "mcp-group-active-session",
+                scope: "active-session",
+                label: ( localize(6063, "Active Session")),
+                icon: mcpServerIcon,
+                count: activeSessionOnlyServers.length,
+                isFirst,
+                description: ( localize(6064, "MCP servers reported by the active session.")),
+                collapsed
+            });
+            if (!collapsed) {
+                for (const server of activeSessionOnlyServers) {
+                    entries.push({
+                        type: "session-server-item",
+                        server
+                    });
+                }
+            }
+            isFirst = false;
+        }
         if (pluginServers.length > 0) {
             const collapsed = ( this.collapsedGroups.has("plugin"));
             entries.push({
                 type: "group-header",
                 id: "mcp-group-plugin",
                 scope: "plugin",
-                label: ( localize(5749, "Plugins")),
+                label: ( localize(6065, "Plugins")),
                 icon: pluginIcon,
                 count: pluginServers.length,
                 isFirst,
-                description: ( localize(5750, "MCP servers provided by installed plugins.")),
+                description: ( localize(6066, "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
-                    });
+                for (const {
+                    server,
+                    activeSessionServer
+                } of pluginServers) {
+                    entries.push(createBuiltinEntry(server, activeSessionServer));
                 }
             }
             isFirst = false;
@@ -740,22 +944,19 @@ let McpListWidget = class McpListWidget extends Disposable {
                 type: "group-header",
                 id: "mcp-group-extension",
                 scope: "extension",
-                label: ( localize(5751, "Extensions")),
+                label: ( localize(6067, "Extensions")),
                 icon: extensionIcon,
                 count: extensionServers.length,
                 isFirst,
-                description: ( localize(5752, "MCP servers contributed by installed VS Code extensions.")),
+                description: ( localize(6068, "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
-                    });
+                for (const {
+                    server,
+                    activeSessionServer
+                } of extensionServers) {
+                    entries.push(createBuiltinEntry(server, activeSessionServer));
                 }
             }
             isFirst = false;
@@ -766,22 +967,19 @@ let McpListWidget = class McpListWidget extends Disposable {
                 type: "group-header",
                 id: "mcp-group-builtin",
                 scope: "builtin",
-                label: ( localize(5753, "Built-in")),
+                label: ( localize(6069, "Built-in")),
                 icon: builtinIcon,
                 count: otherBuiltinServers.length,
                 isFirst,
-                description: ( localize(5754, "MCP servers built into VS Code. These are available automatically.")),
+                description: ( localize(6070, "MCP servers built into VS Code. These are available automatically.")),
                 collapsed
             });
             if (!collapsed) {
-                for (const server of otherBuiltinServers) {
-                    entries.push({
-                        type: "builtin-item",
-                        id: `builtin-${server.definition.id}`,
-                        label: server.definition.label,
-                        description: "",
-                        collectionId: server.collection.id
-                    });
+                for (const {
+                    server,
+                    activeSessionServer
+                } of otherBuiltinServers) {
+                    entries.push(createBuiltinEntry(server, activeSessionServer));
                 }
             }
             isFirst = false;
@@ -789,10 +987,11 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.displayEntries = entries;
         this.list.splice(0, this.list.length, this.displayEntries);
         this.filteredBuiltinCount = builtinServers.length;
+        this.filteredActiveSessionCount = activeSessionOnlyServers.length;
         this._onDidChangeItemCount.fire(this.itemCount);
     }
     get itemCount() {
-        return this.filteredServers.length + this.filteredBuiltinCount;
+        return this.filteredServers.length + this.filteredBuiltinCount + this.filteredActiveSessionCount;
     }
     fireItemCount() {
         this._onDidChangeItemCount.fire(this.itemCount);
@@ -850,10 +1049,31 @@ let McpListWidget = class McpListWidget extends Disposable {
             this.list.setFocus([0]);
         }
     }
+    openActiveSessionServerOptions(server) {
+        void this.commandService.executeCommand(
+            McpCommandIds.AgentHostServerOptions,
+            this.customizationHarnessService.activeSessionResource.get(),
+            server.id
+        );
+    }
     onContextMenu(e) {
         if (!e.element) {
             return;
         }
+        if (e.element.type === "session-server-item") {
+            const disposables = ( new DisposableStore());
+            const optionsAction = disposables.add(getActiveSessionServerOptionsAction(
+                this.commandService,
+                this.customizationHarnessService.activeSessionResource.get(),
+                e.element.server
+            ));
+            this.contextMenuService.showContextMenu({
+                getAnchor: () => e.anchor,
+                getActions: () => [optionsAction],
+                onHide: () => disposables.dispose()
+            });
+            return;
+        }
         if (e.element.type === "builtin-item") {
             const collectionId = e.element.collectionId;
             const pluginUriStr = getPluginUriFromCollectionId(collectionId);
@@ -865,7 +1085,7 @@ let McpListWidget = class McpListWidget extends Disposable {
                 return;
             }
             const disposables = ( new DisposableStore());
-            const showPluginAction = disposables.add(( new Action("mcpServer.showPlugin", ( localize(5755, "Show Plugin")), undefined, true, async () => {
+            const showPluginAction = disposables.add(( new Action("mcpServer.showPlugin", ( localize(6071, "Show Plugin")), undefined, true, async () => {
                 const item = {
                     kind: AgentPluginItemKind.Installed,
                     name: plugin.label,
@@ -875,14 +1095,14 @@ let McpListWidget = class McpListWidget extends Disposable {
                 };
                 this._onDidRequestShowPlugin.fire(item);
             })));
-            const uninstallAction = disposables.add(( new Action("mcpServer.uninstallPlugin", ( localize(5756, "Uninstall Plugin")), undefined, true, async () => {
+            const uninstallAction = disposables.add(( new Action("mcpServer.uninstallPlugin", ( localize(6072, "Uninstall Plugin")), undefined, true, async () => {
                 const result = await this.dialogService.confirm({
-                    message: ( localize(5757, "This MCP server is provided by the plugin '{0}'", plugin.label)),
+                    message: ( localize(6073, "This MCP server is provided by the plugin '{0}'", plugin.label)),
                     detail: ( localize(
-                        5758,
+                        6074,
                         "Individual MCP servers from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"
                     )),
-                    primaryButton: ( localize(5759, "Uninstall Plugin")),
+                    primaryButton: ( localize(6075, "Uninstall Plugin")),
                     type: "question"
                 });
                 if (result.confirmed) {
@@ -923,6 +1143,6 @@ let McpListWidget = class McpListWidget extends Disposable {
         });
     }
 };
-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)), ( __param(11, IConfigurationService))], 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)), ( __param(11, IConfigurationService)), ( __param(12, ICustomizationHarnessService)), ( __param(13, IAgentHostCustomizationService)), ( __param(14, IAICustomizationWorkspaceService))], McpListWidget));
 
 export { McpListWidget };