@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

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

@@ -38,8 +38,6 @@ 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';
@@ -78,17 +76,10 @@ class McpServerItemDelegate {
     }
 }
 let McpServerItemRenderer = class McpServerItemRenderer {
-    constructor(
-        mcpService,
-        workspaceService,
-        agentPluginService,
-        harnessService,
-        hoverService
-    ) {
+    constructor(mcpService, workspaceService, agentPluginService, hoverService) {
         this.mcpService = mcpService;
         this.workspaceService = workspaceService;
         this.agentPluginService = agentPluginService;
-        this.harnessService = harnessService;
         this.hoverService = hoverService;
         this.templateId = "mcpServerItem";
     }
@@ -99,8 +90,6 @@ let McpServerItemRenderer = class McpServerItemRenderer {
         const details = append(container, $(".mcp-server-details"));
         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(5478, "Bridged"));
         const description = append(details, $(".mcp-server-description"));
         const status = append(container, $(".mcp-server-status"));
         return {
@@ -109,24 +98,11 @@ let McpServerItemRenderer = class McpServerItemRenderer {
             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(
-            5479,
-            "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 = formatDisplayName(element.label);
@@ -143,7 +119,7 @@ let McpServerItemRenderer = class McpServerItemRenderer {
                     const plugin = this.agentPluginService.plugins.get().find(p => ( p.uri.toString()) === pluginUriStr);
                     if (plugin) {
                         return {
-                            content: `${element.label}\n${( localize(5480, "Plugin: {0}", plugin.label))}`,
+                            content: `${element.label}\n${( localize(5582, "Plugin: {0}", plugin.label))}`,
                             appearance: {
                                 compact: true,
                                 skipFadeInAnimation: true
@@ -185,26 +161,26 @@ let McpServerItemRenderer = class McpServerItemRenderer {
         }
         statusElement.style.display = "";
         if (state === "disabled") {
-            statusElement.textContent = ( localize(5481, "Disabled"));
+            statusElement.textContent = ( localize(5583, "Disabled"));
             statusElement.classList.add("disabled");
             return;
         }
         switch (state) {
         case McpConnectionState.Kind.Running:
-            statusElement.textContent = ( localize(5482, "Running"));
+            statusElement.textContent = ( localize(5584, "Running"));
             statusElement.classList.add("running");
             break;
         case McpConnectionState.Kind.Starting:
-            statusElement.textContent = ( localize(5483, "Starting"));
+            statusElement.textContent = ( localize(5585, "Starting"));
             statusElement.classList.add("starting");
             break;
         case McpConnectionState.Kind.Error:
-            statusElement.textContent = ( localize(5484, "Error"));
+            statusElement.textContent = ( localize(5586, "Error"));
             statusElement.classList.add("error");
             break;
         case McpConnectionState.Kind.Stopped:
         default:
-            statusElement.textContent = ( localize(5485, "Stopped"));
+            statusElement.textContent = ( localize(5587, "Stopped"));
             statusElement.classList.add("stopped");
             break;
         }
@@ -213,7 +189,7 @@ let McpServerItemRenderer = class McpServerItemRenderer {
         templateData.disposables.dispose();
     }
 };
-McpServerItemRenderer = ( __decorate([( __param(0, IMcpService)), ( __param(1, IAICustomizationWorkspaceService)), ( __param(2, IAgentPluginService)), ( __param(3, ICustomizationHarnessService)), ( __param(4, IHoverService))], McpServerItemRenderer));
+McpServerItemRenderer = ( __decorate([( __param(0, IMcpService)), ( __param(1, IAICustomizationWorkspaceService)), ( __param(2, IAgentPluginService)), ( __param(3, IHoverService))], McpServerItemRenderer));
 class McpGalleryItemRenderer {
     constructor(mcpWorkbenchService) {
         this.mcpWorkbenchService = mcpWorkbenchService;
@@ -255,7 +231,7 @@ class McpGalleryItemRenderer {
         templateData.elementDisposables.add(templateData.installButton.onDidClick(async () => {
             const canInstall = this.mcpWorkbenchService.canInstall(element.server);
             if (canInstall === true) {
-                templateData.installButton.label = ( localize(5486, "Installing..."));
+                templateData.installButton.label = ( localize(5588, "Installing..."));
                 templateData.installButton.enabled = false;
                 await this.mcpWorkbenchService.install(element.server);
             }
@@ -269,15 +245,15 @@ class McpGalleryItemRenderer {
     updateInstallButton(button, server) {
         switch (server.installState) {
         case McpServerInstallState.Installed:
-            button.label = ( localize(5487, "Installed"));
+            button.label = ( localize(5589, "Installed"));
             button.enabled = false;
             break;
         case McpServerInstallState.Installing:
-            button.label = ( localize(5486, "Installing..."));
+            button.label = ( localize(5588, "Installing..."));
             button.enabled = false;
             break;
         default:
-            button.label = ( localize(5488, "Install"));
+            button.label = ( localize(5590, "Install"));
             button.enabled = true;
             break;
         }
@@ -330,6 +306,7 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.browseMode = false;
         this.lastHeight = 0;
         this.lastWidth = 0;
+        this._layoutDeferred = false;
         this.collapsedGroups = ( new Set());
         this.delayedFilter = ( new Delayer(200));
         this.delayedGallerySearch = ( new Delayer(400));
@@ -351,7 +328,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(5489, "Type to search...")),
+            placeholder: ( localize(5591, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
@@ -369,7 +346,7 @@ let McpListWidget = class McpListWidget extends Disposable {
             secondary: true,
             supportIcons: true
         })));
-        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5490, "Browse Marketplace"))}`;
+        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5592, "Browse Marketplace"))}`;
         this.browseButton.element.classList.add("list-add-button");
         this._register(this.browseButton.onDidClick(() => {
             this.toggleBrowseMode(!this.browseMode);
@@ -378,35 +355,17 @@ let McpListWidget = class McpListWidget extends Disposable {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(5491, "Add Server")),
-            ariaLabel: ( localize(5491, "Add Server"))
+            title: ( localize(5593, "Add Server")),
+            ariaLabel: ( localize(5593, "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(5492, "Add Server")))
+            this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), this.addButton.element, ( localize(5594, "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(5493, "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(5494, "Back to installed servers"));
-        this._register(addDisposableListener(this.backLink, "click", () => {
-            this.toggleBrowseMode(false);
-        }));
-        this._register(addDisposableListener(this.backLink, "keydown", e => {
-            if (e.key === "Enter" || e.key === " ") {
-                e.preventDefault();
-                this.toggleBrowseMode(false);
-            }
-        }));
-        this.backLink.style.display = "none";
         this.emptyContainer = append(this.element, $(".mcp-empty-state"));
         const emptyHeader = append(this.emptyContainer, $(".empty-state-header"));
         const emptyIcon = append(emptyHeader, $(".empty-icon"));
@@ -417,17 +376,17 @@ let McpListWidget = class McpListWidget extends Disposable {
         const disabledHeader = append(this.disabledContainer, $(".empty-state-header"));
         this.disabledIcon = append(disabledHeader, $(".empty-icon"));
         const disabledText = append(disabledHeader, $(".empty-text"));
-        disabledText.textContent = ( localize(5495, "MCP servers are disabled"));
+        disabledText.textContent = ( localize(5595, "MCP servers are disabled"));
         this.disabledMessage = append(this.disabledContainer, $(".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(
-            5496,
+            5596,
             "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(5497, "Learn more about MCP servers"));
+        this.sectionLink.textContent = ( localize(5597, "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();
@@ -451,23 +410,20 @@ let McpListWidget = class McpListWidget extends Disposable {
                 setRowLineHeight: false,
                 horizontalScrolling: false,
                 accessibilityProvider: {
-                    getAriaLabel(element) {
+                    getAriaLabel: element => {
                         if (element.type === "group-header") {
                             return localize(
-                                5498,
+                                5598,
                                 "{0}, {1} items, {2}",
                                 element.label,
                                 element.count,
-                                element.collapsed ? ( localize(5499, "collapsed")) : ( localize(5500, "expanded"))
+                                element.collapsed ? ( localize(5599, "collapsed")) : ( localize(5600, "expanded"))
                             );
                         }
-                        if (element.type === "builtin-item") {
-                            return element.label;
-                        }
-                        return element.server.label;
+                        return element.type === "builtin-item" ? element.label : element.server.label;
                     },
                     getWidgetAriaLabel() {
-                        return localize(5501, "MCP Servers");
+                        return localize(5601, "MCP Servers");
                     }
                 },
                 openOnSingleClick: true,
@@ -529,13 +485,13 @@ let McpListWidget = class McpListWidget extends Disposable {
             this.disabledLinkListener.clear();
             if (policyLocked) {
                 this.disabledMessage.textContent = ( localize(
-                    5502,
+                    5602,
                     "Access to MCP servers is disabled by your organization. Contact your organization administrator for more information."
                 ));
             } else {
-                this.disabledMessage.appendChild(createTextNode(( localize(5503, "MCP servers are disabled in settings. "))));
+                this.disabledMessage.appendChild(createTextNode(( localize(5603, "MCP servers are disabled in settings. "))));
                 const link = append(this.disabledMessage, $("a.mcp-disabled-settings-link"));
-                link.textContent = ( localize(5504, "Configure in settings."));
+                link.textContent = ( localize(5604, "Configure in settings."));
                 link.href = "#";
                 link.setAttribute("role", "button");
                 this.disabledLinkListener.value = addDisposableListener(link, "click", e => {
@@ -554,10 +510,9 @@ let McpListWidget = class McpListWidget extends Disposable {
         this.browseMode = browse;
         this.searchInput.value = "";
         this.searchQuery = "";
-        this.backLink.style.display = browse ? "" : "none";
         this.addButton.element.style.display = browse ? "none" : "";
         this.browseButton.element.parentElement.style.display = browse ? "none" : "";
-        this.searchInput.setPlaceHolder(browse ? ( localize(5505, "Search MCP marketplace...")) : ( localize(5489, "Type to search...")));
+        this.searchInput.setPlaceHolder(browse ? ( localize(5605, "Search MCP marketplace...")) : ( localize(5591, "Type to search...")));
         if (browse) {
             void this.queryGallery();
         } else {
@@ -574,7 +529,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(5506, "Loading marketplace..."));
+        this.emptyText.textContent = ( localize(5606, "Loading marketplace..."));
         this.emptySubtext.textContent = "";
         try {
             const pager = await this.mcpWorkbenchService.queryGallery({
@@ -590,8 +545,8 @@ let McpListWidget = class McpListWidget extends Disposable {
                 this.galleryServers = [];
                 this.emptyContainer.style.display = "flex";
                 this.listContainer.style.display = "none";
-                this.emptyText.textContent = ( localize(5507, "Unable to load marketplace"));
-                this.emptySubtext.textContent = ( localize(5508, "Check your connection and try again"));
+                this.emptyText.textContent = ( localize(5607, "Unable to load marketplace"));
+                this.emptySubtext.textContent = ( localize(5608, "Check your connection and try again"));
             }
         }
     }
@@ -600,10 +555,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(5509, "No servers match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5510, "Try a different search term"));
+                this.emptyText.textContent = ( localize(5609, "No servers match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(5610, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5511, "No MCP servers available"));
+                this.emptyText.textContent = ( localize(5611, "No MCP servers available"));
                 this.emptySubtext.textContent = "";
             }
         } else {
@@ -631,11 +586,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(5512, "No servers match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5510, "Try a different search term"));
+                this.emptyText.textContent = ( localize(5612, "No servers match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(5610, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5513, "No MCP servers configured"));
-                this.emptySubtext.textContent = ( localize(5514, "Add an MCP server configuration to get started"));
+                this.emptyText.textContent = ( localize(5613, "No MCP servers configured"));
+                this.emptySubtext.textContent = ( localize(5614, "Add an MCP server configuration to get started"));
             }
         } else {
             this.emptyContainer.style.display = "none";
@@ -643,19 +598,19 @@ let McpListWidget = class McpListWidget extends Disposable {
         }
         const groups = [{
             scope: LocalMcpServerScope.Workspace,
-            label: ( localize(5515, "Workspace")),
+            label: ( localize(5615, "Workspace")),
             icon: workspaceIcon,
             description: ( localize(
-                5516,
+                5616,
                 "MCP servers configured in your workspace settings, shared with your team via version control."
             )),
             servers: []
         }, {
             scope: LocalMcpServerScope.User,
-            label: ( localize(5517, "User")),
+            label: ( localize(5617, "User")),
             icon: userIcon,
             description: ( localize(
-                5518,
+                5618,
                 "MCP servers configured in your user settings. Private to you and available across all projects."
             )),
             servers: []
@@ -716,11 +671,11 @@ let McpListWidget = class McpListWidget extends Disposable {
                 type: "group-header",
                 id: "mcp-group-plugin",
                 scope: "plugin",
-                label: ( localize(5519, "Plugins")),
+                label: ( localize(5619, "Plugins")),
                 icon: pluginIcon,
                 count: pluginServers.length,
                 isFirst,
-                description: ( localize(5520, "MCP servers provided by installed plugins.")),
+                description: ( localize(5620, "MCP servers provided by installed plugins.")),
                 collapsed
             });
             if (!collapsed) {
@@ -742,11 +697,11 @@ let McpListWidget = class McpListWidget extends Disposable {
                 type: "group-header",
                 id: "mcp-group-extension",
                 scope: "extension",
-                label: ( localize(5521, "Extensions")),
+                label: ( localize(5621, "Extensions")),
                 icon: extensionIcon,
                 count: extensionServers.length,
                 isFirst,
-                description: ( localize(5522, "MCP servers contributed by installed VS Code extensions.")),
+                description: ( localize(5622, "MCP servers contributed by installed VS Code extensions.")),
                 collapsed
             });
             if (!collapsed) {
@@ -768,11 +723,11 @@ let McpListWidget = class McpListWidget extends Disposable {
                 type: "group-header",
                 id: "mcp-group-builtin",
                 scope: "builtin",
-                label: ( localize(5523, "Built-in")),
+                label: ( localize(5623, "Built-in")),
                 icon: builtinIcon,
                 count: otherBuiltinServers.length,
                 isFirst,
-                description: ( localize(5524, "MCP servers built into VS Code. These are available automatically.")),
+                description: ( localize(5624, "MCP servers built into VS Code. These are available automatically.")),
                 collapsed
             });
             if (!collapsed) {
@@ -810,18 +765,32 @@ let McpListWidget = class McpListWidget extends Disposable {
     prependToSearchRow(element) {
         this.searchAndButtonContainer.insertBefore(element, this.searchAndButtonContainer.firstChild);
     }
+    isInBrowseMode() {
+        return this.browseMode;
+    }
+    exitBrowseMode() {
+        if (this.browseMode) {
+            this.toggleBrowseMode(false);
+        }
+    }
     layout(height, width) {
         this.lastHeight = height;
         this.lastWidth = width;
         this.element.style.height = `${height}px`;
         const searchBarHeight = this.searchAndButtonContainer.offsetHeight;
-        if (searchBarHeight === 0) {
-            getWindow(this.element).requestAnimationFrame(() => this.layout(this.lastHeight, this.lastWidth));
+        if (searchBarHeight === 0 && !this._layoutDeferred) {
+            this._layoutDeferred = true;
+            getWindow(this.element).requestAnimationFrame(() => {
+                try {
+                    this.layout(this.lastHeight, this.lastWidth);
+                } finally {
+                    this._layoutDeferred = false;
+                }
+            });
             return;
         }
         const footerHeight = this.sectionHeader.offsetHeight;
-        const backLinkHeight = this.browseMode ? this.backLink.offsetHeight : 0;
-        const listHeight = Math.max(0, height - searchBarHeight - footerHeight - backLinkHeight);
+        const listHeight = Math.max(0, height - searchBarHeight - footerHeight);
         this.listContainer.style.height = `${listHeight}px`;
         this.list.layout(listHeight, width);
     }
@@ -855,7 +824,7 @@ let McpListWidget = class McpListWidget extends Disposable {
                 return;
             }
             const disposables = ( new DisposableStore());
-            const showPluginAction = disposables.add(( new Action("mcpServer.showPlugin", ( localize(5525, "Show Plugin")), undefined, true, async () => {
+            const showPluginAction = disposables.add(( new Action("mcpServer.showPlugin", ( localize(5625, "Show Plugin")), undefined, true, async () => {
                 const item = {
                     kind: AgentPluginItemKind.Installed,
                     name: plugin.label,
@@ -865,14 +834,14 @@ let McpListWidget = class McpListWidget extends Disposable {
                 };
                 this._onDidRequestShowPlugin.fire(item);
             })));
-            const uninstallAction = disposables.add(( new Action("mcpServer.uninstallPlugin", ( localize(5526, "Uninstall Plugin")), undefined, true, async () => {
+            const uninstallAction = disposables.add(( new Action("mcpServer.uninstallPlugin", ( localize(5626, "Uninstall Plugin")), undefined, true, async () => {
                 const result = await this.dialogService.confirm({
-                    message: ( localize(5527, "This MCP server is provided by the plugin '{0}'", plugin.label)),
+                    message: ( localize(5627, "This MCP server is provided by the plugin '{0}'", plugin.label)),
                     detail: ( localize(
-                        5528,
+                        5628,
                         "Individual MCP servers from a plugin cannot be removed separately. Would you like to uninstall the entire plugin?"
                     )),
-                    primaryButton: ( localize(5529, "Uninstall Plugin")),
+                    primaryButton: ( localize(5629, "Uninstall Plugin")),
                     type: "question"
                 });
                 if (result.confirmed) {