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

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

@@ -17,29 +17,36 @@ import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { InputBox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { IContextViewService, IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.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 { Action, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { dirname, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+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 { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
+import { isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
+import { getInstalledPluginContextMenuActions } from '../agentPluginActions.js';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
 import { AgentPluginItemKind } from '../agentPluginEditor/agentPluginItems.js';
 import { pluginIcon } from './aiCustomizationIcons.js';
+import { formatDisplayName } from './aiCustomizationListWidget.js';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { CUSTOMIZATION_GROUP_HEADER_HEIGHT, CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR, CustomizationGroupHeaderRenderer } from './customizationGroupHeaderRenderer.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 PLUGIN_ITEM_HEIGHT = 36;
-const PLUGIN_GROUP_HEADER_HEIGHT = 36;
-const PLUGIN_GROUP_HEADER_HEIGHT_WITH_SEPARATOR = 40;
 class PluginItemDelegate {
     getHeight(element) {
         if (element.type === "group-header") {
-            return element.isFirst ? PLUGIN_GROUP_HEADER_HEIGHT : PLUGIN_GROUP_HEADER_HEIGHT_WITH_SEPARATOR;
+            return element.isFirst ? CUSTOMIZATION_GROUP_HEADER_HEIGHT : CUSTOMIZATION_GROUP_HEADER_HEIGHT_WITH_SEPARATOR;
+        }
+        if (element.type === "marketplace-item") {
+            return 62;
         }
         return PLUGIN_ITEM_HEIGHT;
     }
@@ -53,70 +60,21 @@ class PluginItemDelegate {
         return "pluginInstalledItem";
     }
 }
-class PluginGroupHeaderRenderer {
-    constructor(hoverService) {
-        this.hoverService = hoverService;
-        this.templateId = "pluginGroupHeader";
-    }
-    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();
-    }
-}
 class PluginInstalledItemRenderer {
     constructor() {
         this.templateId = "pluginInstalledItem";
     }
     renderTemplate(container) {
         container.classList.add("mcp-server-item");
+        const typeIcon = append(container, $(".mcp-server-icon"));
+        typeIcon.classList.add(...ThemeIcon.asClassNameArray(pluginIcon));
         const details = append(container, $(".mcp-server-details"));
         const name = append(details, $(".mcp-server-name"));
         const description = append(details, $(".mcp-server-description"));
         const status = append(container, $(".mcp-server-status"));
         return {
             container,
+            typeIcon,
             name,
             description,
             status,
@@ -125,22 +83,23 @@ class PluginInstalledItemRenderer {
     }
     renderElement(element, _index, templateData) {
         templateData.disposables.clear();
-        templateData.name.textContent = element.item.name;
+        templateData.name.textContent = formatDisplayName(element.item.name);
         if (element.item.description) {
-            templateData.description.textContent = element.item.description;
+            templateData.description.textContent = truncateToFirstLine(element.item.description);
             templateData.description.style.display = "";
         } else {
             templateData.description.style.display = "none";
         }
         templateData.disposables.add(autorun(reader => {
-            const enabled = element.item.plugin.enabled.read(reader);
+            const enabled = isContributionEnabled(element.item.plugin.enablement.read(reader));
+            templateData.container.classList.toggle("disabled", !enabled);
             templateData.status.className = "mcp-server-status";
             if (enabled) {
-                templateData.status.textContent = ( localize(5354, "Enabled"));
+                templateData.status.textContent = ( localize(5442, "Enabled"));
                 templateData.status.classList.add("running");
             } else {
-                templateData.status.textContent = ( localize(5355, "Disabled"));
-                templateData.status.classList.add("stopped");
+                templateData.status.textContent = ( localize(5443, "Disabled"));
+                templateData.status.classList.add("disabled");
             }
         }));
     }
@@ -154,13 +113,16 @@ class PluginMarketplaceItemRenderer {
         this.templateId = "pluginMarketplaceItem";
     }
     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
@@ -181,12 +143,12 @@ class PluginMarketplaceItemRenderer {
     renderElement(element, _index, templateData) {
         templateData.elementDisposables.clear();
         templateData.name.textContent = element.item.name;
-        templateData.publisher.textContent = element.item.marketplace ? ( localize(5356, "by {0}", element.item.marketplace)) : "";
+        templateData.publisher.textContent = element.item.marketplace ? ( localize(5444, "by {0}", element.item.marketplace)) : "";
         templateData.description.textContent = element.item.description || "";
-        templateData.installButton.label = ( localize(5357, "Install"));
+        templateData.installButton.label = ( localize(5445, "Install"));
         templateData.installButton.enabled = true;
         templateData.elementDisposables.add(templateData.installButton.onDidClick(async () => {
-            templateData.installButton.label = ( localize(5358, "Installing..."));
+            templateData.installButton.label = ( localize(5446, "Installing..."));
             templateData.installButton.enabled = false;
             try {
                 await this.pluginInstallService.installPlugin({
@@ -200,9 +162,9 @@ class PluginMarketplaceItemRenderer {
                     marketplaceType: element.item.marketplaceType,
                     readmeUri: element.item.readmeUri
                 });
-                templateData.installButton.label = ( localize(5359, "Installed"));
+                templateData.installButton.label = ( localize(5447, "Installed"));
             } catch (_e) {
-                templateData.installButton.label = ( localize(5357, "Install"));
+                templateData.installButton.label = ( localize(5445, "Install"));
                 templateData.installButton.enabled = true;
             }
         }));
@@ -212,66 +174,6 @@ class PluginMarketplaceItemRenderer {
         templateData.templateDisposables.dispose();
     }
 }
-function getInstalledPluginContextMenuActions(plugin, instantiationService) {
-    const groups = [];
-    if (plugin.enabled.get()) {
-        groups.push([instantiationService.createInstance(DisablePluginAction, plugin)]);
-    } else {
-        groups.push([instantiationService.createInstance(EnablePluginAction, plugin)]);
-    }
-    groups.push([instantiationService.createInstance(OpenPluginFolderAction, plugin)]);
-    if (plugin.fromMarketplace) {
-        groups.push([( new UninstallPluginAction(plugin))]);
-    }
-    return groups;
-}
-let EnablePluginAction = class EnablePluginAction extends Action {
-    constructor(plugin, agentPluginService) {
-        super("pluginListWidget.enable", ( localize(5360, "Enable")));
-        this.plugin = plugin;
-        this.agentPluginService = agentPluginService;
-    }
-    async run() {
-        this.agentPluginService.setPluginEnabled(this.plugin.uri, true);
-    }
-};
-EnablePluginAction = ( __decorate([( __param(1, IAgentPluginService))], EnablePluginAction));
-let DisablePluginAction = class DisablePluginAction extends Action {
-    constructor(plugin, agentPluginService) {
-        super("pluginListWidget.disable", ( localize(5361, "Disable")));
-        this.plugin = plugin;
-        this.agentPluginService = agentPluginService;
-    }
-    async run() {
-        this.agentPluginService.setPluginEnabled(this.plugin.uri, false);
-    }
-};
-DisablePluginAction = ( __decorate([( __param(1, IAgentPluginService))], DisablePluginAction));
-let OpenPluginFolderAction = class OpenPluginFolderAction extends Action {
-    constructor(plugin, commandService, openerService) {
-        super("pluginListWidget.openFolder", ( localize(5362, "Open Plugin Folder")));
-        this.plugin = plugin;
-        this.commandService = commandService;
-        this.openerService = openerService;
-    }
-    async run() {
-        try {
-            await this.commandService.executeCommand("revealFileInOS", this.plugin.uri);
-        } catch {
-            await this.openerService.open(dirname(this.plugin.uri));
-        }
-    }
-};
-OpenPluginFolderAction = ( __decorate([( __param(1, ICommandService)), ( __param(2, IOpenerService))], OpenPluginFolderAction));
-class UninstallPluginAction extends Action {
-    constructor(plugin) {
-        super("pluginListWidget.uninstall", ( localize(5363, "Uninstall")));
-        this.plugin = plugin;
-    }
-    async run() {
-        this.plugin.remove();
-    }
-}
 function installedPluginToItem(plugin, labelService) {
     const name = plugin.label ?? basename(plugin.uri);
     const description = plugin.fromMarketplace?.description ?? labelService.getUriLabel(dirname(plugin.uri), {
@@ -309,7 +211,8 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         contextViewService,
         contextMenuService,
         hoverService,
-        labelService
+        labelService,
+        commandService
     ) {
         super();
         this.instantiationService = instantiationService;
@@ -321,13 +224,18 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this.contextMenuService = contextMenuService;
         this.hoverService = hoverService;
         this.labelService = labelService;
+        this.commandService = commandService;
         this._onDidSelectPlugin = this._register(( new Emitter()));
         this.onDidSelectPlugin = this._onDidSelectPlugin.event;
+        this._onDidChangeItemCount = this._register(( new Emitter()));
+        this.onDidChangeItemCount = this._onDidChangeItemCount.event;
         this.installedItems = [];
         this.displayEntries = [];
         this.marketplaceItems = [];
         this.searchQuery = "";
         this.browseMode = false;
+        this.lastHeight = 0;
+        this.lastWidth = 0;
         this.collapsedGroups = ( new Set());
         this.delayedFilter = ( new Delayer(200));
         this.delayedMarketplaceSearch = ( new Delayer(400));
@@ -343,7 +251,7 @@ let PluginListWidget = class PluginListWidget 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(5364, "Type to search...")),
+            placeholder: ( localize(5448, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
@@ -361,19 +269,35 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             secondary: true,
             supportIcons: true
         })));
-        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5365, "Browse Marketplace"))}`;
+        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(5449, "Browse Marketplace"))}`;
         this.browseButton.element.classList.add("list-add-button");
         this._register(this.browseButton.onDidClick(() => {
             this.toggleBrowseMode(!this.browseMode);
         }));
+        const installFromSourceButton = this._register(( new Button(buttonContainer, {
+            ...defaultButtonStyles,
+            secondary: true,
+            supportIcons: true
+        })));
+        installFromSourceButton.label = `$(${Codicon.add.id})`;
+        installFromSourceButton.setTitle(( localize(5450, "Install Plugin from Source")));
+        installFromSourceButton.element.classList.add("list-icon-button");
+        this._register(this.hoverService.setupManagedHover(
+            getDefaultHoverDelegate("element"),
+            installFromSourceButton.element,
+            ( localize(5451, "Install Plugin from Source"))
+        ));
+        this._register(installFromSourceButton.onDidClick(() => {
+            this.commandService.executeCommand("workbench.action.chat.installPluginFromSource");
+        }));
         this.backLink = append(this.element, $(".mcp-back-link"));
         this.backLink.setAttribute("role", "button");
         this.backLink.tabIndex = 0;
-        this.backLink.setAttribute("aria-label", ( localize(5366, "Back to installed plugins")));
+        this.backLink.setAttribute("aria-label", ( localize(5452, "Back to installed plugins")));
         const backIcon = append(this.backLink, $("span"));
         backIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.arrowLeft));
         const backText = append(this.backLink, $("span"));
-        backText.textContent = ( localize(5367, "Back to installed plugins"));
+        backText.textContent = ( localize(5453, "Back to installed plugins"));
         this._register(addDisposableListener(this.backLink, "click", () => {
             this.toggleBrowseMode(false);
         }));
@@ -385,20 +309,21 @@ let PluginListWidget = class PluginListWidget 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(pluginIcon));
-        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(
-            5368,
+            5454,
             "Extend your AI agent with plugins that add commands, skills, agents, hooks, and MCP servers from reusable packages."
         ));
         this.sectionLink = append(this.sectionHeader, $("a.section-footer-link"));
-        this.sectionLink.textContent = ( localize(5369, "Learn more about agent plugins"));
-        this.sectionLink.href = "https://code.visualstudio.com/docs/copilot/chat/agent-plugins";
+        this.sectionLink.textContent = ( localize(5455, "Learn more about agent plugins"));
+        this.sectionLink.href = "https://code.visualstudio.com/docs/copilot/customization/agent-plugins";
         this._register(addDisposableListener(this.sectionLink, "click", e => {
             e.preventDefault();
             const href = this.sectionLink.href;
@@ -407,7 +332,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             }
         }));
         const delegate = ( new PluginItemDelegate());
-        const groupHeaderRenderer = ( new PluginGroupHeaderRenderer(this.hoverService));
+        const groupHeaderRenderer = ( new CustomizationGroupHeaderRenderer("pluginGroupHeader", this.hoverService));
         const installedRenderer = ( new PluginInstalledItemRenderer());
         const marketplaceRenderer = ( new PluginMarketplaceItemRenderer(this.pluginInstallService));
         this.list = this._register(this.instantiationService.createInstance(
@@ -424,11 +349,11 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                     getAriaLabel(element) {
                         if (element.type === "group-header") {
                             return localize(
-                                5370,
+                                5456,
                                 "{0}, {1} items, {2}",
                                 element.label,
                                 element.count,
-                                element.collapsed ? ( localize(5371, "collapsed")) : ( localize(5372, "expanded"))
+                                element.collapsed ? ( localize(5457, "collapsed")) : ( localize(5458, "expanded"))
                             );
                         }
                         if (element.type === "marketplace-item") {
@@ -437,7 +362,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                         return element.item.name;
                     },
                     getWidgetAriaLabel() {
-                        return localize(5373, "Plugins");
+                        return localize(5459, "Plugins");
                     }
                 },
                 openOnSingleClick: true,
@@ -467,7 +392,10 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         }));
         this._register(this.list.onContextMenu(e => this.onContextMenu(e)));
         this._register(autorun(reader => {
-            this.agentPluginService.allPlugins.read(reader);
+            const plugins = this.agentPluginService.plugins.read(reader);
+            for (const plugin of plugins) {
+                plugin.enablement.read(reader);
+            }
             if (!this.browseMode) {
                 this.refresh();
             }
@@ -492,7 +420,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this.searchQuery = "";
         this.backLink.style.display = browse ? "" : "none";
         this.browseButton.element.parentElement.style.display = browse ? "none" : "";
-        this.searchInput.setPlaceHolder(browse ? ( localize(5374, "Search plugin marketplace...")) : ( localize(5364, "Type to search...")));
+        this.searchInput.setPlaceHolder(browse ? ( localize(5460, "Search plugin marketplace...")) : ( localize(5448, "Type to search...")));
         if (browse) {
             void this.queryMarketplace();
         } else {
@@ -500,13 +428,16 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.marketplaceItems = [];
             this.filterPlugins();
         }
+        if (this.lastHeight > 0) {
+            this.layout(this.lastHeight, this.lastWidth);
+        }
     }
     async queryMarketplace() {
         this.marketplaceCts?.dispose(true);
         const cts = this.marketplaceCts = ( new CancellationTokenSource());
         this.emptyContainer.style.display = "flex";
         this.listContainer.style.display = "none";
-        this.emptyText.textContent = ( localize(5375, "Loading marketplace..."));
+        this.emptyText.textContent = ( localize(5461, "Loading marketplace..."));
         this.emptySubtext.textContent = "";
         try {
             const plugins = await this.pluginMarketplaceService.fetchMarketplacePlugins(cts.token);
@@ -517,7 +448,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             const filtered = query ? plugins.filter(
                 p => p.name.toLowerCase().includes(query) || p.description.toLowerCase().includes(query)
             ) : plugins;
-            const installedUris = ( new Set(( this.agentPluginService.allPlugins.get().map(p => ( p.uri.toString())))));
+            const installedUris = ( new Set(( this.agentPluginService.plugins.get().map(p => ( p.uri.toString())))));
             this.marketplaceItems = ( filtered.filter(p => {
                 const expectedUri = this.pluginInstallService.getPluginInstallUri(p);
                 return !( installedUris.has(( expectedUri.toString())));
@@ -528,8 +459,8 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                 this.marketplaceItems = [];
                 this.emptyContainer.style.display = "flex";
                 this.listContainer.style.display = "none";
-                this.emptyText.textContent = ( localize(5376, "Unable to load marketplace"));
-                this.emptySubtext.textContent = ( localize(5377, "Check your connection and try again"));
+                this.emptyText.textContent = ( localize(5462, "Unable to load marketplace"));
+                this.emptySubtext.textContent = ( localize(5463, "Check your connection and try again"));
             }
         }
     }
@@ -538,10 +469,10 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.emptyContainer.style.display = "flex";
             this.listContainer.style.display = "none";
             if (this.searchQuery.trim()) {
-                this.emptyText.textContent = ( localize(5378, "No plugins match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5379, "Try a different search term"));
+                this.emptyText.textContent = ( localize(5464, "No plugins match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(5465, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5380, "No plugins available"));
+                this.emptyText.textContent = ( localize(5466, "No plugins available"));
                 this.emptySubtext.textContent = "";
             }
         } else {
@@ -556,7 +487,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     }
     filterPlugins() {
         const query = this.searchQuery.toLowerCase().trim();
-        const allPlugins = this.agentPluginService.allPlugins.get();
+        const allPlugins = this.agentPluginService.plugins.get();
         this.installedItems = ( allPlugins.map(p => installedPluginToItem(p, this.labelService))).filter(
             item => !query || item.name.toLowerCase().includes(query) || item.description.toLowerCase().includes(query)
         );
@@ -564,18 +495,18 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.emptyContainer.style.display = "flex";
             this.listContainer.style.display = "none";
             if (this.searchQuery.trim()) {
-                this.emptyText.textContent = ( localize(5381, "No plugins match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(5379, "Try a different search term"));
+                this.emptyText.textContent = ( localize(5467, "No plugins match '{0}'", this.searchQuery));
+                this.emptySubtext.textContent = ( localize(5465, "Try a different search term"));
             } else {
-                this.emptyText.textContent = ( localize(5382, "No plugins installed"));
-                this.emptySubtext.textContent = ( localize(5383, "Browse the marketplace to discover and install plugins"));
+                this.emptyText.textContent = ( localize(5468, "No plugins installed"));
+                this.emptySubtext.textContent = ( localize(5469, "Browse the marketplace to discover and install plugins"));
             }
         } else {
             this.emptyContainer.style.display = "none";
             this.listContainer.style.display = "";
         }
-        const enabledPlugins = this.installedItems.filter(item => item.plugin.enabled.get());
-        const disabledPlugins = this.installedItems.filter(item => !item.plugin.enabled.get());
+        const enabledPlugins = this.installedItems.filter(item => isContributionEnabled(item.plugin.enablement.get()));
+        const disabledPlugins = this.installedItems.filter(item => !isContributionEnabled(item.plugin.enablement.get()));
         const entries = [];
         let isFirst = true;
         if (enabledPlugins.length > 0) {
@@ -584,12 +515,12 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                 type: "group-header",
                 id: "plugin-group-enabled",
                 group: "enabled",
-                label: ( localize(5384, "Enabled")),
+                label: ( localize(5470, "Enabled")),
                 icon: pluginIcon,
                 count: enabledPlugins.length,
                 isFirst,
                 description: ( localize(
-                    5385,
+                    5471,
                     "Plugins that are currently active and providing commands, skills, agents, and other capabilities."
                 )),
                 collapsed
@@ -610,12 +541,12 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                 type: "group-header",
                 id: "plugin-group-disabled",
                 group: "disabled",
-                label: ( localize(5386, "Disabled")),
+                label: ( localize(5472, "Disabled")),
                 icon: pluginIcon,
                 count: disabledPlugins.length,
                 isFirst,
                 description: ( localize(
-                    5387,
+                    5473,
                     "Plugins that are installed but currently disabled. Enable them to use their capabilities."
                 )),
                 collapsed
@@ -631,6 +562,13 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         }
         this.displayEntries = entries;
         this.list.splice(0, this.list.length, this.displayEntries);
+        this._onDidChangeItemCount.fire(this.itemCount);
+    }
+    get itemCount() {
+        return this.installedItems.length;
+    }
+    fireItemCount() {
+        this._onDidChangeItemCount.fire(this.itemCount);
     }
     toggleGroup(entry) {
         if (( this.collapsedGroups.has(entry.group))) {
@@ -641,6 +579,8 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this.filterPlugins();
     }
     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;
@@ -697,6 +637,6 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         });
     }
 };
-PluginListWidget = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IAgentPluginService)), ( __param(2, IPluginMarketplaceService)), ( __param(3, IPluginInstallService)), ( __param(4, IOpenerService)), ( __param(5, IContextViewService)), ( __param(6, IContextMenuService)), ( __param(7, IHoverService)), ( __param(8, ILabelService))], PluginListWidget));
+PluginListWidget = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IAgentPluginService)), ( __param(2, IPluginMarketplaceService)), ( __param(3, IPluginInstallService)), ( __param(4, IOpenerService)), ( __param(5, IContextViewService)), ( __param(6, IContextMenuService)), ( __param(7, IHoverService)), ( __param(8, ILabelService)), ( __param(9, ICommandService))], PluginListWidget));
 
 export { PluginListWidget };

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.d.ts

@@ -1,7 +1,6 @@
 import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from "@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -14,11 +13,10 @@ import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vsco
 export declare class ChatAttachmentResolveService implements IChatAttachmentResolveService {
     private fileService;
     private editorService;
-    private textModelService;
     private extensionService;
     private dialogService;
     _serviceBrand: undefined;
-    constructor(fileService: IFileService, editorService: IEditorService, textModelService: ITextModelService, extensionService: IExtensionService, dialogService: IDialogService);
+    constructor(fileService: IFileService, editorService: IEditorService, extensionService: IExtensionService, dialogService: IDialogService);
     resolveEditorAttachContext(editor: EditorInput | IDraggedResourceEditorInput): Promise<IChatRequestVariableEntry | undefined>;
     resolveUntitledEditorAttachContext(editor: IDraggedResourceEditorInput): Promise<IChatRequestVariableEntry | undefined>;
     resolveResourceAttachContext(resource: URI, isDirectory: boolean): Promise<IChatRequestVariableEntry | undefined>;