@codingame/monaco-vscode-api 37.6.1 → 38.0.1

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

@@ -7,11 +7,13 @@ import { DisposableStore, Disposable, MutableDisposable, isDisposable } from '..
 import { Emitter } from '../../../../../base/common/event.js';
 import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
+import { WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js';
+import { RenderIndentGuides } from '../../../../../base/browser/ui/tree/abstractTree.js';
+import { ObjectTreeElementCollapseState } from '../../../../../base/browser/ui/tree/tree.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Button, ButtonWithDropdown } from '../../../../../base/browser/ui/button/button.js';
-import { defaultCheckboxStyles, defaultButtonStyles, getButtonStyles, defaultInputBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { getButtonStyles, defaultInputBoxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -26,7 +28,8 @@ import { IHoverService } from '../../../../../platform/hover/browser/hover.servi
 import { isWeb } from '../../../../../base/common/platform.js';
 import { IAgentPluginService } from '../../common/plugins/agentPluginService.service.js';
 import { isContributionEnabled, ContributionEnablementState } from '../../common/enablement.js';
-import { isPluginPolicyBlocked, getInstalledPluginContextMenuActions } from '../agentPluginActions.js';
+import { ICustomizationMarketplaceInstallService } from '../../common/customizationMarketplaceInstallService.service.js';
+import { getPluginPolicyEnablement, removePluginWithMarketplaceOwnership, getInstalledPluginContextMenuActions } from '../agentPluginActions.js';
 import { IPluginMarketplaceService } from '../../common/plugins/pluginMarketplaceService.service.js';
 import { IPluginInstallService } from '../../common/plugins/pluginInstallService.service.js';
 import { AgentPluginItemKind } from '../agentPluginEditor/agentPluginItems.js';
@@ -36,26 +39,34 @@ import { CUSTOMIZATION_GROUP_HEADER_HEIGHT, CUSTOMIZATION_GROUP_HEADER_HEIGHT_WI
 import { getCustomizationDisabledLabel, isPluginCustomizationItem } from '../../common/customizationHarnessService.js';
 import { ICustomizationHarnessService } from '../../common/customizationHarnessService.service.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { CustomizationMarketplaceConfiguration } from '../../../../../platform/customizationMarketplace/common/customizationMarketplaceSources.js';
+import { ICustomizationMarketplaceService } from '../../../../../platform/customizationMarketplace/common/customizationMarketplaceService.service.js';
 import { ChatConfiguration } from '../../common/constants.js';
 import { IAICustomizationItemsModel } from './aiCustomizationItemsModel.service.js';
 import { UpdateAgentPluginsCommandId } from '../chat.js';
-import { Switch } from '../../../../../base/browser/ui/toggle/switch.js';
-import { Checkbox } from '../../../../../base/browser/ui/toggle/toggle.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.service.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { getErrorMessage } from '../../../../../base/common/errors.js';
+import { IAICustomizationWorkspaceService } from '../../common/aiCustomizationWorkspaceService.service.js';
 import { getPluginInclusionLabel } from './aiCustomizationPresentation.js';
 import { status } from '../../../../../base/browser/ui/aria/aria.js';
-import { setVirtualizedRowActionsTabbable, createCustomizationCardPrimaryAction, setupCollapsibleSection, CustomizationCardListController, layoutVirtualizedSections, getVirtualizedSectionMinimumHeight, layoutVirtualizedSectionList, renderVirtualizedSectionLoadingPlaceholder } from './customizationCardList.js';
+import { setVirtualizedRowActionsTabbable, createCustomizationCardPrimaryAction, trackCustomizationCardPrimaryActionFocus, layoutVirtualizedSections, getVirtualizedSectionMinimumHeight, layoutVirtualizedSectionList } from './customizationCardList.js';
 import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { ScrollbarVisibility } from '../../../../../base/common/scrollable.js';
-import { truncateToFirstLine } from './aiCustomizationListWidgetUtils.js';
+import { asTreeRenderer, customizationTreeStyles, getCustomizationTreeContentHeight } from './customizationTree.js';
+import { CustomizationToggle } from './customizationToggle.js';
+import { affectsCustomizationDiscoveryAvailability, isCustomizationDiscoveryAvailable } from './customizationMarketplaceConfiguration.js';
+import { runCustomizationMarketplaceInstallWithTelemetry, getAvailableCustomizationMarketplaceInstallTelemetryContext } from '../../common/customizationMarketplaceInstallTelemetry.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
+import { getAICustomizationWorkspaceGroups, getAICustomizationWorkspaceGroupForResource, isAICustomizationWorkspaceGroupKey } from './aiCustomizationWorkspaceGroups.js';
 import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { truncateToFirstLine } from './aiCustomizationListWidgetUtils.js';
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 
 registerCss(aiCustomizationManagement, 1);
 const $ = $$1;
-const PLUGIN_ITEM_HEIGHT = 66;
-const PLUGIN_MARKETPLACE_ITEM_HEIGHT = 68;
+const PLUGIN_ITEM_HEIGHT = 58;
+const PLUGIN_MARKETPLACE_ITEM_HEIGHT = 58;
 class PluginMarketplaceSnapshotModel {
     constructor() {
         this._state = "uninitialized";
@@ -90,6 +101,12 @@ class PluginMarketplaceSnapshotModel {
 function shouldLoadPluginMarketplaceSnapshot(visible, state, marketplaceAvailable) {
     return visible && state === "uninitialized" && marketplaceAvailable;
 }
+function shouldShowLegacyPluginMarketplace(configurationService) {
+    return configurationService.getValue(CustomizationMarketplaceConfiguration.MarketplaceEnabled) !== true;
+}
+function shouldShowPluginTree(searchQuery, itemCount) {
+    return itemCount > 0 || searchQuery.trim().length === 0;
+}
 function isCurrentPluginMarketplaceRequest(
     requestQuery,
     currentQuery,
@@ -100,6 +117,12 @@ function isCurrentPluginMarketplaceRequest(
 ) {
     return isActiveRequest && !isCancellationRequested && requestQuery === currentQuery && requestBrowseMode === currentBrowseMode;
 }
+function getRemotePluginEntryId(entry) {
+    return entry.item.itemKey ?? `remote-${entry.item.groupKey ?? "default"}-${( entry.item.uri.toString())}`;
+}
+function getMarketplacePluginEntryId(entry) {
+    return `marketplace-${entry.item.marketplaceReference.canonicalId}/${entry.item.source}`;
+}
 class PluginItemDelegate {
     getHeight(element) {
         if (element.type === "group-header") {
@@ -148,17 +171,16 @@ class PluginSearchHeaderRenderer {
     disposeTemplate() {}
 }
 class PluginInstalledItemRenderer {
-    constructor(_harnessService, _renderActions, _showSyncCheckbox = true) {
+    constructor(_harnessService, _renderActions, _showSyncToggle = true) {
         this._harnessService = _harnessService;
         this._renderActions = _renderActions;
-        this._showSyncCheckbox = _showSyncCheckbox;
+        this._showSyncToggle = _showSyncToggle;
         this.templateId = "pluginInstalledItem";
         this._templates = ( new Set());
-        this._focusedIndex = -1;
     }
     renderTemplate(container) {
         container.classList.add("plugin-list-item", "plugin-installed-item");
-        const syncCheckboxContainer = append(container, $(".item-sync-checkbox"));
+        const syncToggleContainer = append(container, $(".item-sync-toggle"));
         const details = append(container, $(".plugin-list-item-details"));
         const nameRow = append(details, $(".plugin-list-item-name-row"));
         const name = append(nameRow, $(".plugin-list-item-name"));
@@ -168,24 +190,24 @@ class PluginInstalledItemRenderer {
         const actions = append(container, $(".plugin-list-item-action"));
         const template = {
             container,
-            syncCheckboxContainer,
+            syncToggleContainer,
             name,
             source,
             description,
             metadata,
             actions,
             disposables: ( new DisposableStore()),
-            currentIndex: -1
+            currentItemId: undefined
         };
         this._templates.add(template);
         return template;
     }
-    renderElement(element, index, templateData) {
+    renderElement(element, _index, templateData) {
         templateData.disposables.clear();
-        templateData.currentIndex = index;
+        templateData.currentItemId = ( element.item.plugin.uri.toString());
         templateData.name.textContent = formatDisplayName(element.item.name);
-        templateData.source.textContent = element.item.marketplace ? "" : ( localize(9170, "Local"));
-        templateData.source.title = element.item.marketplace ? "" : ( localize(9171, "Installed from a local source"));
+        templateData.source.textContent = element.item.marketplace ? "" : ( localize(11143, "Local"));
+        templateData.source.title = element.item.marketplace ? "" : ( localize(11144, "Installed from a local source"));
         templateData.source.style.display = element.item.marketplace ? "none" : "";
         if (element.item.description) {
             templateData.description.textContent = truncateToFirstLine(element.item.description);
@@ -199,20 +221,23 @@ class PluginInstalledItemRenderer {
             const enabled = isContributionEnabled(element.item.plugin.enablement.read(reader));
             templateData.container.classList.toggle("disabled", !enabled);
         }));
-        const syncProvider = this._showSyncCheckbox ? this._harnessService.getActiveDescriptor().syncProvider : undefined;
+        const syncProvider = this._showSyncToggle ? this._harnessService.getActiveDescriptor().syncProvider : undefined;
         if (syncProvider) {
-            templateData.syncCheckboxContainer.style.display = "";
+            templateData.syncToggleContainer.style.display = "";
             const pluginUri = element.item.plugin.uri;
             const disabled = syncProvider.isDisabled(pluginUri);
-            const title = disabled ? ( localize(9172, "Enable {0} for sync", element.item.name)) : ( localize(9173, "Disable {0} from sync", element.item.name));
-            const checkbox = templateData.disposables.add(( new Checkbox(title, !disabled, defaultCheckboxStyles)));
-            templateData.syncCheckboxContainer.replaceChildren(checkbox.domNode);
-            templateData.disposables.add(checkbox.onChange(() => {
-                syncProvider.setDisabled(pluginUri, !checkbox.checked);
+            const title = disabled ? ( localize(11145, "Enable {0} for sync", element.item.name)) : ( localize(11146, "Disable {0} from sync", element.item.name));
+            const toggle = templateData.disposables.add(( new CustomizationToggle({
+                ariaLabel: title,
+                checked: !disabled
+            })));
+            templateData.syncToggleContainer.replaceChildren(toggle.domNode);
+            templateData.disposables.add(toggle.onChange(checked => {
+                syncProvider.setDisabled(pluginUri, !checked);
             }));
         } else {
-            templateData.syncCheckboxContainer.style.display = "none";
-            templateData.syncCheckboxContainer.replaceChildren();
+            templateData.syncToggleContainer.style.display = "none";
+            templateData.syncToggleContainer.replaceChildren();
         }
         clearNode(templateData.actions);
         this._renderActions(
@@ -221,12 +246,12 @@ class PluginInstalledItemRenderer {
             templateData.actions,
             templateData.disposables
         );
-        setVirtualizedRowActionsTabbable(templateData.actions, index === this._focusedIndex);
+        setVirtualizedRowActionsTabbable(templateData.actions, templateData.currentItemId === this._focusedItemId);
     }
-    setFocusedIndex(index) {
-        this._focusedIndex = index;
+    setFocusedItemId(itemId) {
+        this._focusedItemId = itemId;
         for (const template of this._templates) {
-            setVirtualizedRowActionsTabbable(template.actions, template.currentIndex === index);
+            setVirtualizedRowActionsTabbable(template.actions, template.currentItemId === itemId);
         }
     }
     disposeTemplate(templateData) {
@@ -239,13 +264,12 @@ class PluginRemoteItemRenderer {
         this._renderActions = _renderActions;
         this.templateId = "pluginRemoteItem";
         this._templates = ( new Set());
-        this._focusedIndex = -1;
     }
     renderTemplate(container) {
         container.classList.add("plugin-list-item", "plugin-remote-item");
         const details = append(container, $(".plugin-list-item-details"));
         const nameRow = append(details, $(".plugin-list-item-name-row"));
-        const name = append(nameRow, $("span"));
+        const name = append(nameRow, $("span.plugin-list-item-name"));
         const badge = append(nameRow, $(".inline-badge.item-badge"));
         const description = append(details, $(".plugin-list-item-description"));
         const metadata = append(details, $(".plugin-list-item-metadata"));
@@ -260,14 +284,14 @@ class PluginRemoteItemRenderer {
             status,
             actions,
             disposables: ( new DisposableStore()),
-            currentIndex: -1
+            currentItemId: undefined
         };
         this._templates.add(template);
         return template;
     }
-    renderElement(element, index, templateData) {
+    renderElement(element, _index, templateData) {
         templateData.disposables.clear();
-        templateData.currentIndex = index;
+        templateData.currentItemId = getRemotePluginEntryId(element);
         templateData.name.textContent = formatDisplayName(element.item.name);
         if (element.item.badge) {
             templateData.badge.textContent = element.item.badge;
@@ -286,7 +310,7 @@ class PluginRemoteItemRenderer {
             templateData.description.style.display = "none";
         }
         templateData.container.classList.toggle("disabled", element.item.enabled === false);
-        templateData.metadata.textContent = ( localize(9174, "Remote agent host"));
+        templateData.metadata.textContent = ( localize(11147, "Remote agent host"));
         templateData.status.className = "plugin-list-item-status";
         if (element.item.enabled === false) {
             templateData.status.textContent = getRemotePluginDisabledLabel(element.item);
@@ -316,12 +340,12 @@ class PluginRemoteItemRenderer {
         }
         clearNode(templateData.actions);
         this._renderActions(element.item, templateData.actions, templateData.disposables);
-        setVirtualizedRowActionsTabbable(templateData.actions, index === this._focusedIndex);
+        setVirtualizedRowActionsTabbable(templateData.actions, templateData.currentItemId === this._focusedItemId);
     }
-    setFocusedIndex(index) {
-        this._focusedIndex = index;
+    setFocusedItemId(itemId) {
+        this._focusedItemId = itemId;
         for (const template of this._templates) {
-            setVirtualizedRowActionsTabbable(template.actions, template.currentIndex === index);
+            setVirtualizedRowActionsTabbable(template.actions, template.currentItemId === itemId);
         }
     }
     disposeTemplate(templateData) {
@@ -348,7 +372,6 @@ class PluginMarketplaceItemRenderer {
         this.showRecommendedBadge = showRecommendedBadge;
         this.templateId = PLUGIN_MARKETPLACE_ITEM_TEMPLATE_ID;
         this._templates = ( new Set());
-        this._focusedIndex = -1;
     }
     renderTemplate(container) {
         container.classList.add("plugin-list-item", "plugin-marketplace-item");
@@ -356,12 +379,17 @@ class PluginMarketplaceItemRenderer {
         const nameRow = append(details, $(".plugin-list-item-name-row"));
         const name = append(nameRow, $(".plugin-list-item-name"));
         const recommendedBadge = append(nameRow, $(".inline-badge.plugin-recommended-badge"));
-        recommendedBadge.textContent = ( localize(9175, "Recommended"));
+        recommendedBadge.textContent = ( localize(11148, "Recommended"));
         const description = append(details, $(".plugin-list-item-description"));
         const publisher = append(details, $(".plugin-list-item-source"));
         const metadata = append(details, $(".plugin-list-item-metadata"));
         const actionContainer = append(container, $(".plugin-list-item-action"));
-        const installButton = ( new Button(actionContainer, defaultButtonStyles));
+        const installButton = ( new Button(actionContainer, {
+            ...getButtonStyles({
+                buttonSecondaryHoverBackground: undefined
+            }),
+            secondary: true
+        }));
         installButton.element.classList.add("plugin-list-item-install-button");
         const templateDisposables = ( new DisposableStore());
         templateDisposables.add(installButton);
@@ -378,14 +406,14 @@ class PluginMarketplaceItemRenderer {
             installButton,
             elementDisposables: ( new DisposableStore()),
             templateDisposables,
-            currentIndex: -1
+            currentItemId: undefined
         };
         this._templates.add(template);
         return template;
     }
-    renderElement(element, index, templateData) {
+    renderElement(element, _index, templateData) {
         templateData.elementDisposables.clear();
-        templateData.currentIndex = index;
+        templateData.currentItemId = getMarketplacePluginEntryId(element);
         templateData.name.textContent = element.item.name;
         templateData.recommendedBadge.style.display = this.showRecommendedBadge && this.isRecommended(element.item) ? "" : "none";
         templateData.publisher.textContent = "";
@@ -405,17 +433,17 @@ class PluginMarketplaceItemRenderer {
         });
         const isAlreadyInstalled = ( this.agentPluginService.plugins.get().some(p => isEqual(p.uri, installUri)));
         if (isAlreadyInstalled) {
-            templateData.installButton.label = ( localize(9176, "Installed"));
+            templateData.installButton.label = ( localize(11149, "Installed"));
             templateData.installButton.enabled = false;
             this.updateInstallButtonTabbability(templateData);
             return;
         }
-        templateData.installButton.label = ( localize(9177, "Install"));
+        templateData.installButton.label = ( localize(11150, "Install"));
         templateData.installButton.enabled = true;
         this.updateInstallButtonTabbability(templateData);
         templateData.elementDisposables.add(templateData.installButton.onDidClick(async event => {
             EventHelper.stop(event, true);
-            templateData.installButton.label = ( localize(9178, "Installing..."));
+            templateData.installButton.label = ( localize(11151, "Installing..."));
             templateData.installButton.enabled = false;
             try {
                 await this.pluginInstallService.installPlugin({
@@ -429,24 +457,24 @@ class PluginMarketplaceItemRenderer {
                     marketplaceType: element.item.marketplaceType,
                     readmeUri: element.item.readmeUri
                 });
-                templateData.installButton.label = ( localize(9176, "Installed"));
+                templateData.installButton.label = ( localize(11149, "Installed"));
                 this.updateInstallButtonTabbability(templateData);
             } catch (error) {
-                templateData.installButton.label = ( localize(9177, "Install"));
+                templateData.installButton.label = ( localize(11150, "Install"));
                 templateData.installButton.enabled = true;
                 this.updateInstallButtonTabbability(templateData);
-                this.notificationService.error(( localize(9179, "Unable to install plugin: {0}", getErrorMessage(error))));
+                this.notificationService.error(( localize(11152, "Unable to install plugin: {0}", getErrorMessage(error))));
             }
         }));
     }
-    setFocusedIndex(index) {
-        this._focusedIndex = index;
+    setFocusedItemId(itemId) {
+        this._focusedItemId = itemId;
         for (const template of this._templates) {
             this.updateInstallButtonTabbability(template);
         }
     }
     updateInstallButtonTabbability(templateData) {
-        templateData.installButton.element.tabIndex = templateData.installButton.enabled && templateData.currentIndex === this._focusedIndex ? 0 : -1;
+        templateData.installButton.element.tabIndex = templateData.installButton.enabled && templateData.currentItemId === this._focusedItemId ? 0 : -1;
     }
     isRecommended(item) {
         return ( this.pluginMarketplaceService.recommendedPlugins.get().has(getMarketplaceRecommendationKey(item)));
@@ -491,6 +519,16 @@ function getMarketplaceRecommendationKey(plugin) {
 function compareInstalledPluginItems(a, b) {
     return formatDisplayName(a.name).localeCompare(formatDisplayName(b.name));
 }
+function partitionInstalledPluginItemsByScope(items) {
+    const workspace = items.filter(item => {
+        const state = item.plugin.enablement.get();
+        return state === ContributionEnablementState.EnabledWorkspace || state === ContributionEnablementState.DisabledWorkspace;
+    });
+    return {
+        user: items.filter(item => !workspace.includes(item)),
+        workspace
+    };
+}
 function getInstalledPluginMetadata(item) {
     const metadata = [];
     const contributionSummary = getInstalledPluginContributionSummary(item);
@@ -504,34 +542,34 @@ function getInstalledPluginContributionEntries(item) {
     const entries = [];
     appendContributionEntry(
         entries,
-        formatContributionLabel(plugin.agents.get().length, ( localize(9180, "1 agent")), ( localize(9181, "{0} agents", plugin.agents.get().length))),
+        formatContributionLabel(plugin.agents.get().length, ( localize(11153, "1 agent")), ( localize(11154, "{0} agents", plugin.agents.get().length))),
         plugin.agents.get()
     );
     appendContributionEntry(
         entries,
-        formatContributionLabel(plugin.skills.get().length, ( localize(9182, "1 skill")), ( localize(9183, "{0} skills", plugin.skills.get().length))),
+        formatContributionLabel(plugin.skills.get().length, ( localize(11155, "1 skill")), ( localize(11156, "{0} skills", plugin.skills.get().length))),
         plugin.skills.get()
     );
     appendContributionEntry(
         entries,
-        formatContributionLabel(plugin.commands.get().length, ( localize(9184, "1 command")), ( localize(9185, "{0} commands", plugin.commands.get().length))),
+        formatContributionLabel(plugin.commands.get().length, ( localize(11157, "1 command")), ( localize(11158, "{0} commands", plugin.commands.get().length))),
         plugin.commands.get()
     );
     appendContributionEntry(
         entries,
-        formatContributionLabel(plugin.instructions.get().length, ( localize(9186, "1 instruction")), ( localize(9187, "{0} instructions", plugin.instructions.get().length))),
+        formatContributionLabel(plugin.instructions.get().length, ( localize(11159, "1 instruction")), ( localize(11160, "{0} instructions", plugin.instructions.get().length))),
         plugin.instructions.get()
     );
     appendContributionEntry(
         entries,
-        formatContributionLabel(plugin.mcpServerDefinitions.get().length, ( localize(9188, "1 MCP server")), ( localize(9189, "{0} MCP servers", plugin.mcpServerDefinitions.get().length))),
+        formatContributionLabel(plugin.mcpServerDefinitions.get().length, ( localize(11161, "1 MCP server")), ( localize(11162, "{0} MCP servers", plugin.mcpServerDefinitions.get().length))),
         plugin.mcpServerDefinitions.get().map(server => ({
             name: server.name
         }))
     );
-    appendContributionEntry(entries, formatContributionLabel(plugin.hooks.get().length, ( localize(9190, "1 hook")), ( localize(9191, "{0} hooks", plugin.hooks.get().length))), plugin.hooks.get().map(hook => ({
+    appendContributionEntry(entries, formatContributionLabel(plugin.hooks.get().length, ( localize(11163, "1 hook")), ( localize(11164, "{0} hooks", plugin.hooks.get().length))), plugin.hooks.get().map(hook => ({
         name: hook.originalId,
-        description: ( localize(9192, "{0} commands", hook.hooks.length))
+        description: ( localize(11165, "{0} commands", hook.hooks.length))
     })));
     return entries;
 }
@@ -555,13 +593,13 @@ function getRemotePluginStatusLabel(item) {
     }
     switch (item.status) {
     case "loading":
-        return localize(9193, "Loading");
+        return localize(11166, "Loading");
     case "loaded":
-        return localize(9194, "Loaded");
+        return localize(11167, "Loaded");
     case "degraded":
-        return localize(9195, "Warning");
+        return localize(11168, "Warning");
     case "error":
-        return localize(9196, "Error");
+        return localize(11169, "Error");
     default:
         return "";
     }
@@ -581,6 +619,10 @@ function getToggledPluginEnablementState(state) {
         return ContributionEnablementState.EnabledProfile;
     }
 }
+function setPluginEnablementAndReadEffective(model, key, state) {
+    model.setEnabled(key, state);
+    return model.readEnabled(key);
+}
 let PluginListWidget = class PluginListWidget extends Disposable {
     constructor(
         marketplaceBrowsingAvailable = !isWeb,
@@ -595,9 +637,14 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         labelService,
         commandService,
         harnessService,
+        workspaceService,
         itemsModel,
         configurationService,
-        notificationService
+        customizationMarketplaceService,
+        notificationService,
+        marketplaceInstallService,
+        telemetryService,
+        workspaceContextService
     ) {
         super();
         this.marketplaceBrowsingAvailable = marketplaceBrowsingAvailable;
@@ -612,25 +659,31 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this.labelService = labelService;
         this.commandService = commandService;
         this.harnessService = harnessService;
+        this.workspaceService = workspaceService;
         this.itemsModel = itemsModel;
         this.configurationService = configurationService;
+        this.customizationMarketplaceService = customizationMarketplaceService;
         this.notificationService = notificationService;
+        this.marketplaceInstallService = marketplaceInstallService;
+        this.telemetryService = telemetryService;
+        this.workspaceContextService = workspaceContextService;
         this._onDidSelectPlugin = this._register(( new Emitter()));
         this.onDidSelectPlugin = this._onDidSelectPlugin.event;
         this._onDidChangeItemCount = this._register(( new Emitter()));
         this.onDidChangeItemCount = this._onDidChangeItemCount.event;
+        this._onDidRequestBrowse = this._register(( new Emitter()));
+        this.onDidRequestBrowse = this._onDidRequestBrowse.event;
         this.disabledLinkListener = this._register(( new MutableDisposable()));
-        this.addDropdownActions = this._register(( new DisposableStore()));
         this.cardDisposables = this._register(( new DisposableStore()));
         this.pendingSectionLayout = this._register(( new MutableDisposable()));
         this.cardListControllers = ( new WeakMap());
         this.sectionLists = [];
-        this.collapsedSections = ( new Set());
         this.installedItems = [];
         this.remoteItems = [];
         this.marketplaceItems = [];
         this.marketplaceSnapshot = ( new PluginMarketplaceSnapshotModel());
         this.searchQuery = "";
+        this.currentTreeGroups = [];
         this.browseMode = false;
         this.visible = false;
         this.narrowLayout = false;
@@ -640,8 +693,6 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this.lastHeaderHeight = 0;
         this._layoutDeferred = false;
         this.revealLastItemScheduler = this._register(( new MutableDisposable()));
-        this.collapsedGroups = ( new Set());
-        this.sectionScrollPositions = ( new Map());
         this.delayedFilter = ( new Delayer(200));
         this.delayedMarketplaceSearch = ( new Delayer(400));
         this.filterGeneration = 0;
@@ -658,7 +709,25 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             if (e.affectsConfiguration(ChatConfiguration.PluginsEnabled)) {
                 this.updateAccessState();
             }
+            if (affectsCustomizationDiscoveryAvailability(e, this.customizationMarketplaceService)) {
+                this.marketplaceCts?.dispose(true);
+                this.marketplaceSnapshotCts?.dispose(true);
+                this.marketplaceSnapshot.reset();
+                this.marketplaceItems = [];
+                if (!shouldShowLegacyPluginMarketplace(this.configurationService) && this.browseMode) {
+                    this.toggleBrowseMode(false);
+                }
+                void this.refresh();
+            }
         }));
+        if (this.customizationMarketplaceService.onDidChangeSources) {
+            this._register(
+                this.customizationMarketplaceService.onDidChangeSources(() => void this.refresh())
+            );
+        }
+        this._register(
+            this.workspaceContextService.onDidChangeWorkspaceFolders(() => this.renderPluginTree())
+        );
         this._register({
             dispose: () => {
                 this.delayedFilter.cancel();
@@ -674,16 +743,16 @@ let PluginListWidget = class PluginListWidget 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(9197, "Plugins"));
+        sectionTitle.textContent = ( localize(11170, "Plugins"));
         const sectionTitleDescription = append(this.sectionTitleHeader, $("p.section-title-description"));
         const sectionTitleDescriptionText = append(sectionTitleDescription, $("span.section-title-description-text"));
         sectionTitleDescriptionText.textContent = ( localize(
-            9198,
+            11171,
             "Extend your AI agent with plugins that add commands, skills, agents, hooks, and MCP servers from reusable packages."
         ));
         sectionTitleDescription.appendChild(createTextNode(" "));
         this.sectionLink = append(sectionTitleDescription, $("a.section-title-link"));
-        this.sectionLink.textContent = ( localize(9199, "Learn more about agent plugins"));
+        this.sectionLink.textContent = ( localize(11172, "Learn more about agent plugins"));
         this.sectionLink.href = "https://code.visualstudio.com/docs/agent-customization/agent-plugins?referrer=in-product";
         this._register(addDisposableListener(this.sectionLink, "click", e => {
             e.preventDefault();
@@ -708,7 +777,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this._register(headerObserver.observe(this.sectionTitleHeader));
         this.marketplaceBackContainer = append(this.element, $(".plugin-marketplace-back-container"));
         this.marketplaceBackContainer.style.display = "none";
-        const backToInstalledLabel = ( localize(9200, "Back to Installed"));
+        const backToInstalledLabel = ( localize(11173, "Back to Installed"));
         this.backButtonContainer = append(this.marketplaceBackContainer, $(".list-add-button-container"));
         this.backButton = this._register(( new Button(this.backButtonContainer, {
             ...getButtonStyles({
@@ -728,7 +797,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(9201, "Type to search...")),
+            placeholder: ( localize(11174, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
@@ -746,52 +815,6 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                 this.delayedFilter.trigger(() => this.filterPlugins());
             }
         }));
-        this.buttonContainer = append(this.searchAndButtonContainer, $(".list-button-group"));
-        const browseButtonContainer = append(this.buttonContainer, $(".list-add-button-container"));
-        const browseMarketplaceLabel = ( localize(9202, "Browse Marketplace"));
-        this.browseButton = this._register(( new Button(browseButtonContainer, {
-            ...defaultButtonStyles,
-            secondary: true,
-            supportIcons: true,
-            title: browseMarketplaceLabel,
-            ariaLabel: browseMarketplaceLabel
-        })));
-        this.browseButton.element.classList.add("list-add-button");
-        browseButtonContainer.style.display = "none";
-        this.addButtonContainer = append(this.buttonContainer, $(".list-add-button-container"));
-        const addPluginLabel = ( localize(9203, "Add Plugin"));
-        this.addButtonSimple = this._register(( new Button(this.addButtonContainer, {
-            ...defaultButtonStyles,
-            secondary: true,
-            title: addPluginLabel,
-            ariaLabel: addPluginLabel
-        })));
-        this.addButtonSimple.element.classList.add("list-add-button");
-        this._register(this.addButtonSimple.onDidClick(() => this.runPrimaryAddAction()));
-        this.addButton = this._register(( new ButtonWithDropdown(this.addButtonContainer, {
-            ...defaultButtonStyles,
-            secondary: true,
-            contextMenuProvider: this.contextMenuService,
-            addPrimaryActionToDropdown: false,
-            actions: {
-                getActions: () => this.getAddDropdownActions()
-            },
-            title: addPluginLabel,
-            ariaLabel: addPluginLabel
-        })));
-        this.addButton.element.classList.add("list-add-button");
-        this._register(this.addButton.onDidClick(() => this.runPrimaryAddAction()));
-        const updatePluginsLabel = ( localize(9204, "Update Plugins"));
-        this.updatePluginsButton = this._register(( new Button(this.buttonContainer, {
-            ...defaultButtonStyles,
-            secondary: true,
-            supportIcons: true,
-            title: updatePluginsLabel,
-            ariaLabel: updatePluginsLabel
-        })));
-        this.updatePluginsButton.element.classList.add("list-icon-button");
-        this.updatePluginsButton.label = `$(${Codicon.refresh.id})`;
-        this._register(this.updatePluginsButton.onDidClick(() => this.runUpdatePluginsAction()));
         this.emptyContainer = append(this.element, $(".mcp-empty-state"));
         const emptyHeader = append(this.emptyContainer, $(".empty-state-header"));
         this.emptyText = append(emptyHeader, $(".empty-text"));
@@ -800,7 +823,7 @@ let PluginListWidget = class PluginListWidget 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(9205, "Plugins are disabled"));
+        disabledText.textContent = ( localize(11175, "Plugins are disabled"));
         this.disabledMessage = append(this.disabledContainer, $(".empty-subtext"));
         this.cardContainer = $(".plugin-card-container");
         this.cardScrollable = this._register(( new DomScrollableElement(this.cardContainer, {
@@ -823,13 +846,18 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             new DisposableResizeObserver("PluginListWidget.cardScrollable", () => this.cardScrollable.scanDomNode())
         );
         this._register(cardResizeObserver.observe(this.cardScrollableNode));
-        this.listContainer = append(this.element, $(".mcp-list-container"));
+        this.listContainer = append(this.element, $(".mcp-list-container.customization-tree-container"));
         const delegate = ( new PluginItemDelegate());
-        const groupHeaderRenderer = ( new CustomizationGroupHeaderRenderer("pluginGroupHeader", this.hoverService));
+        const groupHeaderRenderer = ( new CustomizationGroupHeaderRenderer(
+            "pluginGroupHeader",
+            this.hoverService,
+            (entry, container, disposables) => this.renderPluginTreeGroupActions(entry, container, disposables)
+        ));
         const searchHeaderRenderer = ( new PluginSearchHeaderRenderer());
         const installedRenderer = ( new PluginInstalledItemRenderer(
             this.harnessService,
-            (item, container, actions, disposables) => this.renderInstalledListActions(item, container, actions, disposables)
+            (item, container, actions, disposables) => this.renderInstalledListActions(item, container, actions, disposables),
+            false
         ));
         const remoteRenderer = ( new PluginRemoteItemRenderer(
             (item, actions, disposables) => this.renderRemoteListActions(item, actions, disposables)
@@ -840,79 +868,42 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.pluginMarketplaceService,
             this.notificationService
         ));
-        this.list = this._register(
-            this.instantiationService.createInstance(WorkbenchList, "PluginManagementList", this.listContainer, delegate, [
-                groupHeaderRenderer,
-                searchHeaderRenderer,
-                installedRenderer,
-                remoteRenderer,
-                marketplaceRenderer
-            ], {
+        this.list = this._register(this.instantiationService.createInstance(
+            WorkbenchObjectTree,
+            "PluginManagementList",
+            this.listContainer,
+            delegate,
+            [
+                asTreeRenderer(groupHeaderRenderer),
+                asTreeRenderer(searchHeaderRenderer),
+                asTreeRenderer(installedRenderer),
+                asTreeRenderer(remoteRenderer),
+                asTreeRenderer(marketplaceRenderer)
+            ],
+            {
+                indent: 8,
+                renderIndentGuides: RenderIndentGuides.None,
+                hideTwistiesOfChildlessElements: false,
+                overrideStyles: customizationTreeStyles,
                 multipleSelectionSupport: false,
                 setRowLineHeight: false,
                 horizontalScrolling: false,
                 accessibilityProvider: {
-                    getAriaLabel: element => {
-                        if (element.type === "group-header") {
-                            return localize(
-                                9206,
-                                "{0}, {1} items, {2}",
-                                element.label,
-                                element.count,
-                                element.collapsed ? ( localize(9207, "collapsed")) : ( localize(9208, "expanded"))
-                            );
-                        }
-                        if (element.type === "search-header") {
-                            return element.label;
-                        }
-                        const name = formatDisplayName(element.item.name);
-                        const description = element.item.description ? truncateToFirstLine(element.item.description) : undefined;
-                        const nameAndDesc = description ? ( localize(9209, "{0}. {1}", name, description)) : name;
-                        if (element.type === "plugin-item") {
-                            const enabled = isContributionEnabled(element.item.plugin.enablement.get());
-                            const metadata = getInstalledPluginMetadata(element.item);
-                            const withMetadata = metadata ? ( localize(9210, "{0}. {1}", nameAndDesc, metadata)) : nameAndDesc;
-                            return enabled ? ( localize(9211, "{0}. Enabled", withMetadata)) : ( localize(9212, "{0}. Disabled", withMetadata));
-                        }
-                        if (element.type === "remote-item") {
-                            const status = getRemotePluginStatusLabel(element.item);
-                            return status ? ( localize(9213, "{0}. Remote agent host. Status: {1}", nameAndDesc, status)) : ( localize(9214, "{0}. Remote agent host", nameAndDesc));
-                        }
-                        if (element.type === "marketplace-item") {
-                            const recommended = ( this.pluginMarketplaceService.recommendedPlugins.get().has(getMarketplaceRecommendationKey(element.item)));
-                            const label = ( localize(9215, "{0}. From {1}", nameAndDesc, element.item.marketplace));
-                            return recommended ? ( localize(9216, "{0}. Recommended for this workspace", label)) : label;
-                        }
-                        return nameAndDesc;
-                    },
+                    getAriaLabel: element => this.getPluginEntryAriaLabel(element),
                     getWidgetAriaLabel: () => {
-                        return localize(9217, "Plugins");
+                        return localize(11176, "Plugins");
                     }
                 },
                 openOnSingleClick: true,
                 identityProvider: {
-                    getId(element) {
-                        if (element.type === "group-header") {
-                            return element.id;
-                        }
-                        if (element.type === "search-header") {
-                            return element.id;
-                        }
-                        if (element.type === "marketplace-item") {
-                            return `marketplace-${element.item.marketplaceReference.canonicalId}/${element.item.source}`;
-                        }
-                        if (element.type === "remote-item") {
-                            return element.item.itemKey ?? `remote-${element.item.groupKey ?? "default"}-${( element.item.uri.toString())}`;
-                        }
-                        return ( element.item.plugin.uri.toString());
-                    }
+                    getId: element => this.getPluginEntryId(element)
                 }
-            })
-        );
+            }
+        ));
         this._register(this.list.onDidOpen(e => {
             if (e.element) {
                 if (e.element.type === "group-header") {
-                    this.toggleGroup(e.element);
+                    return;
                 } else if (e.element.type === "search-header")
                     ; else if (e.element.type === "plugin-item") {
                     this._onDidSelectPlugin.fire(e.element.item);
@@ -923,10 +914,12 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             }
         }));
         this._register(this.list.onDidChangeFocus(event => {
-            const index = event.indexes[0] ?? -1;
-            installedRenderer.setFocusedIndex(index);
-            remoteRenderer.setFocusedIndex(index);
-            marketplaceRenderer.setFocusedIndex(index);
+            const entry = event.elements[0];
+            installedRenderer.setFocusedItemId(entry?.type === "plugin-item" ? ( entry.item.plugin.uri.toString()) : undefined);
+            remoteRenderer.setFocusedItemId(entry?.type === "remote-item" ? getRemotePluginEntryId(entry) : undefined);
+            marketplaceRenderer.setFocusedItemId(
+                entry?.type === "marketplace-item" ? getMarketplacePluginEntryId(entry) : undefined
+            );
         }));
         this._register(this.list.onContextMenu(e => this.onContextMenu(e)));
         this._register(autorun(reader => {
@@ -995,13 +988,13 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.disabledLinkListener.clear();
             if (policyLocked) {
                 this.disabledMessage.textContent = ( localize(
-                    9218,
+                    11177,
                     "Plugin integration in chat is disabled by your organization. Contact your organization administrator for more information."
                 ));
             } else {
-                this.disabledMessage.appendChild(createTextNode(( localize(9219, "Plugins are disabled in settings. "))));
+                this.disabledMessage.appendChild(createTextNode(( localize(11178, "Plugins are disabled in settings. "))));
                 const link = append(this.disabledMessage, $("a.mcp-disabled-settings-link"));
-                link.textContent = ( localize(9220, "Configure in settings."));
+                link.textContent = ( localize(11179, "Configure in settings."));
                 link.href = "#";
                 link.setAttribute("role", "button");
                 this.disabledLinkListener.value = addDisposableListener(link, "click", e => {
@@ -1026,20 +1019,11 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.toggleBrowseMode(false);
         }
         this.marketplaceBackContainer.style.display = this.browseMode ? "" : "none";
-        this.browseButton.element.parentElement.style.display = "none";
-        this.browseButton.label = `$(${Codicon.library.id}) ${( localize(9202, "Browse Marketplace"))}`;
-        this.browseButton.enabled = browseMarketplaceAvailable;
-        const browseTitle = browseMarketplaceAvailable ? ( localize(9202, "Browse Marketplace")) : ( localize(9221, "Browse Marketplace is not available in VS Code for the Web."));
-        this.browseButton.setTitle(browseTitle);
-        this.browseButton.element.setAttribute("aria-label", browseTitle);
-        this.addButton.element.style.display = "none";
-        this.addButtonSimple.element.style.display = "none";
-        this.updatePluginsButton.element.style.display = "none";
         this.updateInstalledCreateButtonLabel();
     }
     updateInstalledCreateButtonLabel() {
         if (this.installedCreateButton) {
-            this.installedCreateButton.label = this.narrowLayout ? ( localize(9222, "Create")) : ( localize(9223, "Create Plugin"));
+            this.installedCreateButton.label = this.narrowLayout ? ( localize(11180, "Create")) : ( localize(11181, "Create Plugin"));
         }
     }
     updateResponsiveLayout(width) {
@@ -1064,8 +1048,8 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     buildAddActions() {
         return [...this.pluginActions, {
             id: "plugin.installFromSource",
-            label: ( localize(9224, "Install from Source")),
-            tooltip: ( localize(9225, "Install Plugin from Source")),
+            label: ( localize(11182, "Install from Source")),
+            tooltip: ( localize(11183, "Install Plugin from Source")),
             run: async () => {
                 const installed = await this.commandService.executeCommand("workbench.action.chat.installPluginFromSource", {
                     skipReveal: true
@@ -1076,29 +1060,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             }
         }];
     }
-    getAddDropdownActions() {
-        this.addDropdownActions.clear();
-        return this.buildAddActions().slice(1).map((action, index) => this.addDropdownActions.add(( new Action(
-            `plugin_add_${index}`,
-            this.formatActionLabel(action),
-            undefined,
-            action.enabled !== false,
-            () => this.runPluginAction(action)
-        ))));
-    }
-    async runPrimaryAddAction() {
-        const [primary] = this.buildAddActions();
-        if (primary) {
-            await this.runPluginAction(primary);
-        }
-    }
-    async runCreatePluginAction() {
-        await this.commandService.executeCommand("workbench.action.chat.createPlugin");
-    }
-    async runInstallFromSourceAction() {
-        await this.commandService.executeCommand("workbench.action.chat.installPluginFromSource");
-    }
-    async runUpdatePluginsAction(button = this.updatePluginsButton) {
+    async runUpdatePluginsAction(button) {
         button.enabled = false;
         try {
             await this.commandService.executeCommand(UpdateAgentPluginsCommandId);
@@ -1111,171 +1073,51 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             await action.run();
         }
     }
-    showCardSurface() {
-        this.emptyContainer.style.display = "none";
-        this.listContainer.style.display = "none";
-        this.cardScrollableNode.style.display = "";
-    }
     showEmptySurface() {
         this.cardScrollableNode.style.display = "none";
         this.listContainer.style.display = "none";
         this.emptyContainer.style.display = "flex";
     }
-    createCardScrollContent(...classNames) {
-        const content = append(this.cardContainer, $(".plugin-card-scroll.plugin-card-scroll-content"));
-        content.classList.add(...classNames);
-        this.sectionLayoutContainer = classNames.includes("distributed-section-layout") ? content : undefined;
-        const resizeObserver = this.cardDisposables.add(new DisposableResizeObserver(
-            "PluginListWidget.cardScrollContent",
-            () => this.schedulePluginSectionLayout()
-        ));
-        this.cardDisposables.add(resizeObserver.observe(content));
-        return content;
-    }
     addSurfaceActivation(surface, label, callback, ...classNames) {
         const primaryAction = createCustomizationCardPrimaryAction(surface, label, ...classNames);
+        trackCustomizationCardPrimaryActionFocus(
+            primaryAction,
+            surface.closest(".plugin-home-row") ?? surface,
+            this.cardDisposables
+        );
         this.rememberCardFocusElement(primaryAction);
         this.cardDisposables.add(addDisposableListener(primaryAction, "click", callback));
         return primaryAction;
     }
-    renderCardSection(parent, title, description, className, count, renderActions) {
-        const section = append(parent, $(".plugin-card-section"));
-        if (className) {
-            section.classList.add(className);
-        }
-        const header = append(section, $(".plugin-card-section-header"));
-        const text = append(header, $(".plugin-card-section-text"));
-        const headingRow = append(text, $(".plugin-card-section-heading-row"));
-        const heading = append(headingRow, $("h3.plugin-card-section-title"));
-        heading.textContent = title;
-        if (count !== undefined) {
-            const countEl = append(headingRow, $(".plugin-card-section-count"));
-            countEl.textContent = String(count);
-        }
-        if (description) {
-            const descriptionEl = append(text, $(".plugin-card-section-description"));
-            descriptionEl.textContent = description;
-        }
-        renderActions?.(header);
-        const list = append(section, $(".plugin-card-grid"));
-        const sectionKey = className ?? title;
-        list.dataset.virtualizedSectionKey = sectionKey;
-        const collapsedSections = this.collapsedSections ??= ( new Set());
-        setupCollapsibleSection(headingRow, list, title, this.cardDisposables, ( collapsedSections.has(sectionKey)), collapsed => {
-            if (collapsed) {
-                collapsedSections.add(sectionKey);
-            } else {
-                collapsedSections.delete(sectionKey);
-            }
-            this.schedulePluginSectionLayout();
-        });
-        this.cardListControllers.set(list, this.cardDisposables.add(( new CustomizationCardListController(list, title))));
-        return list;
-    }
-    createPluginSectionList(container, label, entries, showRecommendedBadge = true) {
-        const key = container.dataset.virtualizedSectionKey ?? label;
-        const delegate = ( new PluginItemDelegate());
-        container.style.height = `${entries.length > 0 ? delegate.getHeight(entries[0]) : PLUGIN_ITEM_HEIGHT}px`;
-        container.classList.add("virtualized-section-list");
-        this.cardListControllers.get(container)?.dispose();
-        this.cardListControllers.delete(container);
-        container.removeAttribute("role");
-        container.removeAttribute("aria-label");
-        const installedRenderer = ( new PluginInstalledItemRenderer(
-            this.harnessService,
-            (item, row, actions, disposables) => this.renderInstalledListActions(item, row, actions, disposables),
-            false
-        ));
-        const remoteRenderer = ( new PluginRemoteItemRenderer(
-            (item, actions, disposables) => this.renderRemoteListActions(item, actions, disposables)
-        ));
-        const marketplaceRenderer = ( new PluginMarketplaceItemRenderer(
-            this.pluginInstallService,
-            this.agentPluginService,
-            this.pluginMarketplaceService,
-            this.notificationService,
-            showRecommendedBadge
-        ));
-        const list = this.cardDisposables.add(this.instantiationService.createInstance(
-            WorkbenchList,
-            `PluginManagementList.${label}`,
-            container,
-            delegate,
-            [installedRenderer, remoteRenderer, marketplaceRenderer],
-            {
-                multipleSelectionSupport: false,
-                setRowLineHeight: false,
-                horizontalScrolling: false,
-                accessibilityProvider: {
-                    getAriaLabel: element => this.getPluginEntryAriaLabel(element),
-                    getWidgetAriaLabel: () => label,
-                    getSetSize: (_element, _index, listLength) => listLength,
-                    getPosInSet: (_element, index) => index + 1
-                },
-                openOnSingleClick: true,
-                identityProvider: {
-                    getId: element => this.getPluginEntryId(element)
-                }
-            }
-        ));
-        list.splice(0, 0, entries);
-        list.scrollTop = this.sectionScrollPositions.get(key) ?? 0;
-        this.cardDisposables.add(list.onDidOpen(event => {
-            const entry = event.element;
-            if (entry?.type === "plugin-item" || entry?.type === "marketplace-item") {
-                this._onDidSelectPlugin.fire(entry.item);
-            }
-        }));
-        this.cardDisposables.add(list.onContextMenu(event => this.onContextMenu(event)));
-        this.cardDisposables.add(list.onDidChangeFocus(event => {
-            const index = event.indexes[0] ?? -1;
-            installedRenderer.setFocusedIndex(index);
-            remoteRenderer.setFocusedIndex(index);
-            marketplaceRenderer.setFocusedIndex(index);
-        }));
-        this.cardDisposables.add(list.onDidFocus(() => {
-            if (list.getFocus().length === 0 && entries.length > 0) {
-                list.setFocus([0]);
-            }
-        }));
-        this.sectionLists.push({
-            list,
-            entries,
-            container,
-            key
-        });
-    }
-    captureSectionScrollPositions() {
-        for (const section of this.sectionLists) {
-            this.sectionScrollPositions.set(section.key, section.list.scrollTop);
-        }
-    }
     getPluginEntryAriaLabel(element) {
-        if (element.type === "group-header" || element.type === "search-header") {
+        if (element.type === "group-header") {
+            return localize(11184, "{0}, {1} items", element.label, element.count);
+        }
+        if (element.type === "search-header") {
             return element.label;
         }
         const name = formatDisplayName(element.item.name);
         const description = element.item.description ? truncateToFirstLine(element.item.description) : undefined;
-        const nameAndDescription = description ? ( localize(9209, "{0}. {1}", name, description)) : name;
+        const nameAndDescription = description ? ( localize(11185, "{0}. {1}", name, description)) : name;
         if (element.type === "plugin-item") {
             const metadata = getInstalledPluginMetadata(element.item);
-            const withMetadata = metadata ? ( localize(9210, "{0}. {1}", nameAndDescription, metadata)) : nameAndDescription;
+            const withMetadata = metadata ? ( localize(11186, "{0}. {1}", nameAndDescription, metadata)) : nameAndDescription;
             return derived(
                 this,
-                reader => isContributionEnabled(element.item.plugin.enablement.read(reader)) ? ( localize(9211, "{0}. Enabled", withMetadata)) : ( localize(9212, "{0}. Disabled", withMetadata))
+                reader => isContributionEnabled(element.item.plugin.enablement.read(reader)) ? ( localize(11187, "{0}. Enabled", withMetadata)) : ( localize(11188, "{0}. Disabled", withMetadata))
             );
         }
         if (element.type === "remote-item") {
             const statusLabel = getRemotePluginStatusLabel(element.item);
             return statusLabel ? ( localize(
-                9213,
+                11189,
                 "{0}. Remote agent host. Status: {1}",
                 nameAndDescription,
                 statusLabel
-            )) : ( localize(9214, "{0}. Remote agent host", nameAndDescription));
+            )) : ( localize(11190, "{0}. Remote agent host", nameAndDescription));
         }
-        const marketplaceLabel = ( localize(9215, "{0}. From {1}", nameAndDescription, element.item.marketplace));
-        return ( this.pluginMarketplaceService.recommendedPlugins.get().has(getMarketplaceRecommendationKey(element.item))) ? ( localize(9216, "{0}. Recommended for this workspace", marketplaceLabel)) : marketplaceLabel;
+        const marketplaceLabel = ( localize(11191, "{0}. From {1}", nameAndDescription, element.item.marketplace));
+        return ( this.pluginMarketplaceService.recommendedPlugins.get().has(getMarketplaceRecommendationKey(element.item))) ? ( localize(11192, "{0}. Recommended for this workspace", marketplaceLabel)) : marketplaceLabel;
     }
     getPluginEntryId(element) {
         if (element.type === "group-header" || element.type === "search-header") {
@@ -1291,45 +1133,52 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     }
     renderInstalledListActions(item, row, actions, disposables) {
         let renderedState = item.plugin.enablement.get();
-        const toggle = disposables.add(( new Switch({
+        const toggle = disposables.add(this.instantiationService.createInstance(CustomizationToggle, {
             ariaLabel: item.name,
             checked: isContributionEnabled(renderedState)
-        })));
+        }));
         append(actions, toggle.domNode);
         disposables.add(
             addDisposableGenericMouseDownListener(toggle.domNode, event => EventHelper.stop(event, true))
         );
-        const update = (state, blocked) => {
+        const update = (state, policyEnablement) => {
             renderedState = state;
             const checked = isContributionEnabled(state);
+            const managed = policyEnablement !== undefined;
             const workspaceScope = state === ContributionEnablementState.EnabledWorkspace || state === ContributionEnablementState.DisabledWorkspace;
-            const toggleLabel = checked ? (workspaceScope ? ( localize(9226, "Exclude {0} from Workspace", item.name)) : ( localize(9227, "Exclude {0} from Profile", item.name))) : (workspaceScope ? ( localize(9228, "Include {0} in Workspace", item.name)) : ( localize(9229, "Include {0} for Profile", item.name)));
-            toggle.disabled = blocked;
+            const toggleLabel = checked ? (workspaceScope ? ( localize(11193, "Exclude {0} from Workspace", item.name)) : ( localize(11194, "Exclude {0} from Profile", item.name))) : (workspaceScope ? ( localize(11195, "Include {0} in Workspace", item.name)) : ( localize(11196, "Include {0} for Profile", item.name)));
+            toggle.disabled = managed;
             toggle.checked = checked;
-            toggle.setAriaLabel(blocked ? ( localize(9230, "{0} is managed by your organization", item.name)) : toggleLabel, blocked ? ( localize(9231, "This plugin is managed by your organization.")) : toggleLabel);
-            row.classList.toggle("disabled", !checked || blocked);
+            toggle.setAriaLabel(managed ? ( localize(11197, "{0} is managed by your organization", item.name)) : toggleLabel, managed ? ( localize(11198, "This plugin is managed by your organization.")) : toggleLabel);
+            row.classList.toggle("disabled", !checked);
         };
         disposables.add(autorun(reader => update(
             item.plugin.enablement.read(reader),
-            item.plugin.policyBlocked?.read(reader) === true
+            getPluginPolicyEnablement(item.plugin, reader)
         )));
         disposables.add(toggle.onChange(() => {
+            const policyEnablement = getPluginPolicyEnablement(item.plugin);
+            if (policyEnablement !== undefined) {
+                update(renderedState, policyEnablement);
+                return;
+            }
             const nextState = getToggledPluginEnablementState(renderedState);
-            update(nextState, isPluginPolicyBlocked(item.plugin));
-            this.agentPluginService.enablementModel.setEnabled(( item.plugin.uri.toString()), nextState);
-            status(( localize(9232, "{0}. {1}.", item.name, getPluginInclusionLabel(item.plugin))));
+            const effectiveState = setPluginEnablementAndReadEffective(this.agentPluginService.enablementModel, ( item.plugin.uri.toString()), nextState);
+            update(effectiveState, getPluginPolicyEnablement(item.plugin));
+            status(( localize(11199, "{0}. {1}.", item.name, getPluginInclusionLabel(item.plugin))));
         }));
         const more = disposables.add(( new Button(actions, {
             ...getButtonStyles({
                 buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
                 buttonSecondaryBorder: undefined
             }),
             secondary: true,
-            supportIcons: true,
-            ariaLabel: ( localize(9233, "More actions for {0}", item.name))
+            ariaLabel: ( localize(11200, "More actions for {0}", item.name))
         })));
         more.element.classList.add("plugin-card-icon-button");
-        more.label = `$(${Codicon.ellipsis.id})`;
+        more.icon = Codicon.ellipsis;
         disposables.add(
             addDisposableGenericMouseDownListener(more.element, event => EventHelper.stop(event, true))
         );
@@ -1347,14 +1196,15 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         const more = disposables.add(( new Button(actions, {
             ...getButtonStyles({
                 buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
                 buttonSecondaryBorder: undefined
             }),
             secondary: true,
-            supportIcons: true,
-            ariaLabel: ( localize(9233, "More actions for {0}", item.name))
+            ariaLabel: ( localize(11200, "More actions for {0}", item.name))
         })));
         more.element.classList.add("plugin-card-icon-button");
-        more.label = `$(${Codicon.ellipsis.id})`;
+        more.icon = Codicon.ellipsis;
         disposables.add(
             addDisposableGenericMouseDownListener(more.element, event => EventHelper.stop(event, true))
         );
@@ -1391,157 +1241,280 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.cardScrollable.scanDomNode();
         });
     }
-    renderPluginHome() {
-        if (this.browseMode || this.searchQuery.trim()) {
+    renderPluginTree() {
+        if (!this.list) {
             return;
         }
-        this.captureSectionScrollPositions();
-        this.cardDisposables.clear();
-        this.sectionLists = [];
-        this.installedCreateButton = undefined;
-        this.firstCardFocusElement = undefined;
-        clearNode(this.cardContainer);
-        this.showCardSurface();
-        const content = this.createCardScrollContent("distributed-section-layout");
-        const installedPlugins = this.installedItems;
-        const hasMarketplaceInstalledPlugins = this.pluginMarketplaceService.installedPlugins.get().length > 0;
-        if (shouldLoadPluginMarketplaceSnapshot(
-            this.visible,
-            this.marketplaceSnapshot.state,
-            this.isBrowseMarketplaceAvailable()
-        )) {
-            void this.queryMarketplaceSnapshot();
-        }
-        const installedList = this.renderCardSection(content, ( localize(9234, "Installed")), undefined, "installed-plugins-section", installedPlugins.length, header => this.renderInstalledSectionActions(header, hasMarketplaceInstalledPlugins));
-        installedList.classList.add("plugin-inventory-list");
-        if (installedPlugins.length === 0) {
-            const empty = append(installedList, $(".plugin-inventory-empty"));
-            empty.textContent = ( localize(9235, "No plugins are installed."));
-        } else {
-            this.createPluginSectionList(installedList, ( localize(9234, "Installed")), installedPlugins.map(item => ({
+        const partitionedInstalledItems = partitionInstalledPluginItemsByScope(this.installedItems);
+        const workspaceGroups = getAICustomizationWorkspaceGroups(this.workspaceContextService);
+        const workspaceDefinitions = workspaceGroups.length > 0 ? workspaceGroups.map(group => ({
+            id: group.key,
+            label: group.label,
+            description: ( localize(11201, "Plugins included or excluded specifically for this workspace.")),
+            icon: Codicon.folder,
+            children: partitionedInstalledItems.workspace.filter(
+                item => getAICustomizationWorkspaceGroupForResource(item.plugin.uri, this.workspaceContextService)?.key === group.key
+            ).map(item => ({
                 type: "plugin-item",
                 item
-            })));
-        }
+            }))
+        })) : [{
+            id: "workspace",
+            label: ( localize(11202, "Workspace")),
+            description: ( localize(11201, "Plugins included or excluded specifically for this workspace.")),
+            icon: Codicon.folder,
+            children: partitionedInstalledItems.workspace.map(item => ({
+                type: "plugin-item",
+                item
+            }))
+        }];
+        const userEntries = partitionedInstalledItems.user.map(item => ({
+            type: "plugin-item",
+            item
+        }));
         const installedNames = ( new Set(this.installedItems.map(item => item.name.toLowerCase())));
-        const remoteItems = this.remoteItems.filter(
+        const remoteEntries = this.remoteItems.filter(
             item => item.groupKey !== "remote-client" && (!item.name || !( installedNames.has(item.name.toLowerCase())))
+        ).map(item => ({
+            type: "remote-item",
+            item
+        }));
+        const showLegacyMarketplace = shouldShowLegacyPluginMarketplace(this.configurationService);
+        const availableItems = !showLegacyMarketplace ? [] : this.browseMode || this.searchQuery.trim() ? this.marketplaceItems : this.getUninstalledMarketplaceItems(this.marketplaceSnapshot.items);
+        const availableEntries = availableItems.map(item => ({
+            type: "marketplace-item",
+            item
+        }));
+        const definitions = [{
+            id: "user",
+            label: ( localize(11203, "User")),
+            description: ( localize(
+                11204,
+                "Plugins installed for your profile and available across workspaces."
+            )),
+            icon: Codicon.account,
+            children: userEntries
+        }, ...workspaceDefinitions, {
+            id: "remote",
+            label: ( localize(11205, "Remote Session")),
+            description: ( localize(11206, "Plugins configured directly on the active remote agent host.")),
+            icon: Codicon.remote,
+            children: remoteEntries
+        }, {
+            id: "available",
+            label: ( localize(11207, "Available")),
+            description: ( localize(11208, "Browse and install plugins from your marketplaces.")),
+            icon: Codicon.extensions,
+            children: availableEntries
+        }].filter(
+            group => group.id === "available" ? showLegacyMarketplace : group.id === "user" || group.id === "workspace" || ( workspaceGroups.some(workspace => workspace.key === group.id)) || group.children.length > 0
         );
-        if (remoteItems.length > 0) {
-            const remoteList = this.renderCardSection(content, ( localize(9236, "Remote session plugins")), ( localize(9237, "Plugins configured directly on the active remote agent host.")), "remote-plugins-section", remoteItems.length);
-            remoteList.classList.add("plugin-inventory-list");
-            this.createPluginSectionList(remoteList, ( localize(9236, "Remote session plugins")), remoteItems.map(item => ({
-                type: "remote-item",
-                item
-            })));
-        }
-        this.renderAvailablePlugins(
-            content,
-            this.getUninstalledMarketplaceItems(this.marketplaceSnapshot.items),
-            true
+        this.currentTreeGroups = definitions.map((group, index) => {
+            const element = {
+                type: "group-header",
+                id: `plugin-group-${group.id}`,
+                group: group.id,
+                label: group.label,
+                icon: group.icon,
+                count: group.children.length,
+                isFirst: index === 0,
+                description: group.description,
+                collapsed: false
+            };
+            return {
+                id: group.id,
+                label: group.label,
+                description: group.description,
+                count: group.children.length,
+                element,
+                children: group.children
+            };
+        });
+        this.cardScrollableNode.style.display = "none";
+        const children = this.currentTreeGroups.map(group => ({
+            element: group.element,
+            collapsible: true,
+            collapsed: ObjectTreeElementCollapseState.PreserveOrExpanded,
+            children: group.children.map(element => ({
+                element
+            }))
+        }));
+        this.list.setChildren(null);
+        this.list.setChildren(null, children);
+        this.updateToolbarActions();
+        this.updatePluginTreeEmptyState(
+            this.currentTreeGroups.reduce((count, group) => count + group.children.length, 0)
         );
-        this.schedulePluginSectionLayout();
     }
-    renderInstalledSectionActions(header, hasInstalledPlugins) {
-        const actions = append(header, $(".plugin-card-section-actions"));
-        const createLabel = ( localize(9223, "Create Plugin"));
-        const create = this.installedCreateButton = this.cardDisposables.add(( new Button(actions, {
-            ...defaultButtonStyles,
-            secondary: true,
-            ariaLabel: createLabel
-        })));
-        create.element.classList.add("plugin-installed-action");
-        this.updateInstalledCreateButtonLabel();
-        this.rememberCardFocusElement(create.element);
-        this.cardDisposables.add(create.onDidClick(() => this.runCreatePluginAction()));
-        if (hasInstalledPlugins) {
-            const updateLabel = ( localize(9238, "Check for and apply updates"));
-            const update = this.cardDisposables.add(( new Button(actions, {
-                ...defaultButtonStyles,
-                secondary: true,
-                supportIcons: true,
-                title: updateLabel,
-                ariaLabel: updateLabel
-            })));
-            update.element.classList.add("plugin-card-icon-button", "plugin-update-button");
-            update.label = `$(${Codicon.refresh.id})`;
-            this.cardDisposables.add(update.onDidClick(() => this.runUpdatePluginsAction(update)));
+    renderPluginTreeGroupActions(entry, container, disposables) {
+        const actions = append(container, $(".plugin-card-section-actions"));
+        if (entry.group === "user" || entry.group === "workspace" || isAICustomizationWorkspaceGroupKey(entry.group)) {
+            if (this.pluginMarketplaceService.installedPlugins.get().length > 0) {
+                this.renderPluginUpdateAction(actions, disposables);
+            }
+            this.renderPluginAddAction(actions, disposables);
+            if (entry.group === "user" && isCustomizationDiscoveryAvailable(this.configurationService, this.customizationMarketplaceService)) {
+                this.renderBrowseCustomizationsAction(actions, disposables);
+            }
+        } else if (entry.group === "available") {
+            this.renderPluginAddAction(actions, disposables);
+            if (this.isBrowseMarketplaceAvailable()) {
+                this.renderBrowseMarketplaceAction(actions, disposables);
+            }
         }
     }
-    renderAvailablePlugins(
-        parent,
-        items,
-        showActions,
-        title = ( localize(9239, "Available")),
-        description = ( localize(9240, "Browse and install plugins from your marketplaces."))
-    ) {
-        const availableList = this.renderCardSection(
-            parent,
-            title,
-            description,
-            "available-plugins-section",
-            items.length,
-            showActions ? header => this.renderAvailableSectionActions(header) : undefined
-        );
-        availableList.classList.add("plugin-inventory-list");
-        if (items.length === 0) {
-            if (this.marketplaceSnapshot.state === "loading") {
-                renderVirtualizedSectionLoadingPlaceholder(availableList, ( localize(9241, "Loading marketplace...")), PLUGIN_MARKETPLACE_ITEM_HEIGHT);
-            } else {
-                const empty = append(availableList, $(".plugin-inventory-empty"));
-                empty.textContent = ( localize(9242, "No marketplace plugins are available."));
-            }
-            this.cardListControllers.get(availableList)?.finalize();
+    renderPluginAddAction(container, disposables) {
+        const actions = this.buildAddActions();
+        const [primary, ...secondary] = actions;
+        if (!primary) {
             return;
         }
-        this.createPluginSectionList(availableList, title, items.map(item => ({
-            type: "marketplace-item",
-            item
-        })));
-    }
-    renderAvailableSectionActions(header) {
-        const actions = append(header, $(".plugin-card-section-actions"));
-        const installLabel = ( localize(9224, "Install from Source"));
-        const installTooltip = ( localize(9225, "Install Plugin from Source"));
-        if (this.pluginActions.length > 0) {
-            const install = this.cardDisposables.add(( new ButtonWithDropdown(actions, {
-                ...defaultButtonStyles,
+        const actionLabel = primary.tooltip ?? primary.label;
+        if (secondary.length > 0) {
+            const secondaryActions = secondary.map((action, index) => disposables.add(( new Action(
+                `plugin_tree_add_${index}`,
+                this.formatActionLabel(action),
+                undefined,
+                action.enabled !== false,
+                () => this.runPluginAction(action)
+            ))));
+            const button = disposables.add(( new ButtonWithDropdown(container, {
+                ...getButtonStyles({
+                    buttonSecondaryBackground: undefined,
+                    buttonSecondaryForeground: undefined,
+                    buttonSecondaryHoverBackground: undefined,
+                    buttonSecondaryBorder: undefined
+                }),
                 secondary: true,
+                supportIcons: true,
                 contextMenuProvider: this.contextMenuService,
                 addPrimaryActionToDropdown: false,
                 actions: {
-                    getActions: () => {
-                        this.addDropdownActions.clear();
-                        return this.pluginActions.map((action, index) => this.addDropdownActions.add(( new Action(
-                            `plugin_provider_add_${index}`,
-                            this.formatActionLabel(action),
-                            undefined,
-                            action.enabled !== false,
-                            () => this.runPluginAction(action)
-                        ))));
-                    }
+                    getActions: () => secondaryActions
                 },
-                title: installTooltip,
-                ariaLabel: installTooltip
+                title: actionLabel,
+                ariaLabel: actionLabel
             })));
-            install.element.classList.add("plugin-available-action");
-            install.label = installLabel;
-            this.cardDisposables.add(install.onDidClick(() => this.runInstallFromSourceAction()));
+            button.element.classList.add("plugin-installed-action");
+            button.primaryButton.element.classList.add("plugin-card-ghost-button");
+            button.dropdownButton.element.classList.add("plugin-card-ghost-button");
+            button.primaryButton.element.classList.add("plugin-card-icon-button");
+            button.dropdownButton.element.classList.add("plugin-card-icon-button");
+            button.icon = Codicon.add;
+            button.enabled = primary.enabled !== false;
+            disposables.add(button.onDidClick(() => this.runPluginAction(primary)));
+            return;
+        }
+        const button = disposables.add(( new Button(container, {
+            ...getButtonStyles({
+                buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
+                buttonSecondaryBorder: undefined
+            }),
+            secondary: true,
+            supportIcons: true,
+            title: actionLabel,
+            ariaLabel: actionLabel
+        })));
+        button.element.classList.add(
+            "plugin-installed-action",
+            "plugin-card-ghost-button",
+            "plugin-card-icon-button"
+        );
+        button.icon = Codicon.add;
+        button.enabled = primary.enabled !== false;
+        disposables.add(button.onDidClick(() => this.runPluginAction(primary)));
+    }
+    renderPluginUpdateAction(container, disposables) {
+        const label = ( localize(11209, "Check for and Apply Updates"));
+        const button = disposables.add(( new Button(container, {
+            ...getButtonStyles({
+                buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
+                buttonSecondaryBorder: undefined
+            }),
+            secondary: true,
+            supportIcons: true,
+            title: label,
+            ariaLabel: label
+        })));
+        button.element.classList.add(
+            "plugin-card-icon-button",
+            "plugin-card-ghost-button",
+            "plugin-update-button"
+        );
+        if (this.workspaceService.isSessionsWindow) {
+            button.icon = Codicon.refresh;
         } else {
-            const install = this.cardDisposables.add(( new Button(actions, {
-                ...defaultButtonStyles,
-                secondary: true,
-                title: installTooltip,
-                ariaLabel: installTooltip
-            })));
-            install.element.classList.add("plugin-available-action");
-            install.label = installLabel;
-            this.cardDisposables.add(install.onDidClick(() => this.runInstallFromSourceAction()));
+            button.label = `$(${Codicon.refresh.id})`;
+        }
+        disposables.add(button.onDidClick(() => this.runUpdatePluginsAction(button)));
+    }
+    renderBrowseMarketplaceAction(container, disposables) {
+        const label = ( localize(11210, "Browse Marketplace"));
+        const button = disposables.add(( new Button(container, {
+            ...getButtonStyles({
+                buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
+                buttonSecondaryBorder: undefined
+            }),
+            secondary: true,
+            supportIcons: true,
+            title: label,
+            ariaLabel: label
+        })));
+        button.element.classList.add("plugin-installed-action", "plugin-card-ghost-button");
+        button.label = `$(${Codicon.library.id}) ${label}`;
+        disposables.add(button.onDidClick(() => this.toggleBrowseMode(true)));
+    }
+    renderBrowseCustomizationsAction(container, disposables) {
+        const label = ( localize(11211, "Browse Plugins"));
+        const button = disposables.add(( new Button(container, {
+            ...getButtonStyles({
+                buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
+                buttonSecondaryBorder: undefined
+            }),
+            secondary: true,
+            title: label,
+            ariaLabel: label
+        })));
+        button.element.classList.add("plugin-installed-action", "plugin-card-ghost-button");
+        button.label = label;
+        disposables.add(button.onDidClick(() => this._onDidRequestBrowse.fire()));
+    }
+    updatePluginTreeEmptyState(itemCount) {
+        const showTree = shouldShowPluginTree(this.searchQuery, itemCount);
+        this.listContainer.style.display = showTree ? "" : "none";
+        this.emptyContainer.style.display = showTree ? "none" : "flex";
+        if (!showTree) {
+            this.emptyText.textContent = ( localize(11212, "No plugins match '{0}'", this.searchQuery));
+            this.emptySubtext.textContent = ( localize(11213, "Try a different search term"));
+        }
+    }
+    getVisiblePluginEntries() {
+        return this.currentTreeGroups.flatMap(group => [group.element, ...group.children]);
+    }
+    renderPluginHome() {
+        if (this.browseMode || this.searchQuery.trim()) {
+            return;
+        }
+        this.renderPluginTree();
+        if (shouldLoadPluginMarketplaceSnapshot(
+            this.visible,
+            this.marketplaceSnapshot.state,
+            this.isBrowseMarketplaceAvailable() && shouldShowLegacyPluginMarketplace(this.configurationService)
+        )) {
+            void this.queryMarketplaceSnapshot();
         }
     }
     appendInstalledPluginRow(parent, item) {
         const row = append(parent, $(".plugin-list-item.plugin-home-row.plugin-installed-item"));
-        const primaryAction = this.addSurfaceActivation(row, ( localize(9243, "{0}. {1}", item.name, getPluginInclusionLabel(item.plugin))), () => this._onDidSelectPlugin.fire(item));
+        const primaryAction = this.addSurfaceActivation(row, ( localize(11214, "{0}. {1}", item.name, getPluginInclusionLabel(item.plugin))), () => this._onDidSelectPlugin.fire(item));
         const details = append(primaryAction, $(".plugin-list-item-details"));
         const nameRow = append(details, $(".plugin-list-item-name-row"));
         const name = append(nameRow, $(".plugin-list-item-name"));
@@ -1549,11 +1522,11 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         name.title = item.name;
         if (!item.marketplace) {
             const source = append(nameRow, $(".inline-badge.plugin-source-badge"));
-            source.textContent = ( localize(9170, "Local"));
-            source.title = ( localize(9171, "Installed from a local source"));
+            source.textContent = ( localize(11143, "Local"));
+            source.title = ( localize(11144, "Installed from a local source"));
         }
         const description = append(details, $(".plugin-list-item-description"));
-        description.textContent = truncateToFirstLine(item.description || ( localize(9244, "No description provided.")));
+        description.textContent = truncateToFirstLine(item.description || ( localize(11215, "No description provided.")));
         const metadata = append(details, $(".plugin-list-item-metadata"));
         metadata.textContent = getInstalledPluginMetadata(item);
         metadata.style.display = metadata.textContent ? "" : "none";
@@ -1562,14 +1535,15 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         const more = this.cardDisposables.add(( new Button(actions, {
             ...getButtonStyles({
                 buttonSecondaryBackground: undefined,
+                buttonSecondaryForeground: undefined,
+                buttonSecondaryHoverBackground: undefined,
                 buttonSecondaryBorder: undefined
             }),
             secondary: true,
-            supportIcons: true,
-            ariaLabel: ( localize(9233, "More actions for {0}", item.name))
+            ariaLabel: ( localize(11200, "More actions for {0}", item.name))
         })));
         more.element.classList.add("plugin-card-icon-button");
-        more.label = `$(${Codicon.ellipsis.id})`;
+        more.icon = Codicon.ellipsis;
         this.cardDisposables.add(more.onDidClick(() => this.showInstalledPluginActions(item, more.element)));
         this.cardListControllers.get(parent)?.addItem({
             row,
@@ -1581,52 +1555,57 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     }
     appendInstalledPluginToggle(parent, row, primaryAction, item) {
         let renderedState = item.plugin.enablement.get();
-        const toggle = this.cardDisposables.add(( new Switch({
+        const toggle = this.cardDisposables.add(this.instantiationService.createInstance(CustomizationToggle, {
             ariaLabel: item.name
-        })));
+        }));
         const switchElement = toggle.domNode;
         append(parent, switchElement);
-        const update = (state, blocked) => {
+        const update = (state, policyEnablement) => {
             renderedState = state;
             const checked = isContributionEnabled(state);
+            const managed = policyEnablement !== undefined;
             const workspaceScope = state === ContributionEnablementState.EnabledWorkspace || state === ContributionEnablementState.DisabledWorkspace;
-            const toggleLabel = checked ? (workspaceScope ? ( localize(9226, "Exclude {0} from Workspace", item.name)) : ( localize(9227, "Exclude {0} from Profile", item.name))) : (workspaceScope ? ( localize(9228, "Include {0} in Workspace", item.name)) : ( localize(9229, "Include {0} for Profile", item.name)));
-            const accessibleLabel = blocked ? ( localize(9230, "{0} is managed by your organization", item.name)) : toggleLabel;
-            toggle.disabled = blocked;
+            const toggleLabel = checked ? (workspaceScope ? ( localize(11193, "Exclude {0} from Workspace", item.name)) : ( localize(11194, "Exclude {0} from Profile", item.name))) : (workspaceScope ? ( localize(11195, "Include {0} in Workspace", item.name)) : ( localize(11196, "Include {0} for Profile", item.name)));
+            const accessibleLabel = managed ? ( localize(11197, "{0} is managed by your organization", item.name)) : toggleLabel;
+            toggle.disabled = managed;
             toggle.checked = checked;
-            toggle.setAriaLabel(accessibleLabel, blocked ? ( localize(9231, "This plugin is managed by your organization.")) : toggleLabel);
-            row.classList.toggle("disabled", !checked || blocked);
-            primaryAction.setAttribute("aria-label", ( localize(9243, "{0}. {1}", item.name, getPluginInclusionLabel(item.plugin))));
+            toggle.setAriaLabel(accessibleLabel, managed ? ( localize(11198, "This plugin is managed by your organization.")) : toggleLabel);
+            row.classList.toggle("disabled", !checked);
+            primaryAction.setAttribute("aria-label", ( localize(11214, "{0}. {1}", item.name, getPluginInclusionLabel(item.plugin))));
         };
         this.cardDisposables.add(autorun(reader => {
             const state = item.plugin.enablement.read(reader);
-            const blocked = item.plugin.policyBlocked?.read(reader) === true;
-            update(state, blocked);
+            update(state, getPluginPolicyEnablement(item.plugin, reader));
         }));
         this.cardDisposables.add(toggle.onChange(() => {
+            const policyEnablement = getPluginPolicyEnablement(item.plugin);
+            if (policyEnablement !== undefined) {
+                update(renderedState, policyEnablement);
+                return;
+            }
             const nextState = getToggledPluginEnablementState(renderedState);
-            update(nextState, isPluginPolicyBlocked(item.plugin));
-            this.agentPluginService.enablementModel.setEnabled(( item.plugin.uri.toString()), nextState);
-            status(( localize(9232, "{0}. {1}.", item.name, getPluginInclusionLabel(item.plugin))));
+            const effectiveState = setPluginEnablementAndReadEffective(this.agentPluginService.enablementModel, ( item.plugin.uri.toString()), nextState);
+            update(effectiveState, getPluginPolicyEnablement(item.plugin));
+            status(( localize(11199, "{0}. {1}.", item.name, getPluginInclusionLabel(item.plugin))));
         }));
         return switchElement;
     }
     appendRemotePluginRow(parent, item) {
         const row = append(parent, $(".plugin-list-item.plugin-home-row.plugin-remote-item"));
         row.setAttribute("role", "listitem");
-        row.setAttribute("aria-label", ( localize(9245, "{0}. Remote plugin", item.name)));
+        row.setAttribute("aria-label", ( localize(11216, "{0}. Remote plugin", item.name)));
         row.classList.toggle("disabled", item.enabled === false);
         const details = append(row, $(".plugin-list-item-details"));
         const nameRow = append(details, $(".plugin-list-item-name-row"));
         const name = append(nameRow, $(".plugin-list-item-name"));
         name.textContent = formatDisplayName(item.name);
         const source = append(nameRow, $(".inline-badge.plugin-source-badge"));
-        source.textContent = ( localize(9246, "Remote"));
-        source.title = ( localize(9174, "Remote agent host"));
+        source.textContent = ( localize(11217, "Remote"));
+        source.title = ( localize(11147, "Remote agent host"));
         const description = append(details, $(".plugin-list-item-description"));
-        description.textContent = item.description || ( localize(9244, "No description provided."));
+        description.textContent = item.description || ( localize(11215, "No description provided."));
         const metadata = append(details, $(".plugin-list-item-metadata"));
-        metadata.textContent = ( localize(9247, "Configured on the active remote agent host"));
+        metadata.textContent = ( localize(11218, "Configured on the active remote agent host"));
         const status = append(row, $(".plugin-list-item-status"));
         const statusLabel = getRemotePluginStatusLabel(item);
         if (statusLabel) {
@@ -1642,13 +1621,17 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         if (item.actions?.length) {
             const actions = append(row, $(".plugin-list-item-action"));
             const moreButton = this.cardDisposables.add(( new Button(actions, {
-                ...defaultButtonStyles,
+                ...getButtonStyles({
+                    buttonSecondaryBackground: undefined,
+                    buttonSecondaryForeground: undefined,
+                    buttonSecondaryHoverBackground: undefined,
+                    buttonSecondaryBorder: undefined
+                }),
                 secondary: true,
-                supportIcons: true,
-                ariaLabel: ( localize(9233, "More actions for {0}", item.name))
+                ariaLabel: ( localize(11200, "More actions for {0}", item.name))
             })));
             moreButton.element.classList.add("plugin-card-icon-button");
-            moreButton.label = `$(${Codicon.ellipsis.id})`;
+            moreButton.icon = Codicon.ellipsis;
             this.rememberCardFocusElement(moreButton.element);
             this.cardDisposables.add(
                 moreButton.onDidClick(() => this.showRemotePluginActions(item, moreButton.element))
@@ -1665,21 +1648,24 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     }
     appendMarketplacePluginRow(parent, item) {
         const row = append(parent, $(".plugin-list-item.plugin-home-row.plugin-marketplace-home-row"));
-        const primaryAction = this.addSurfaceActivation(row, ( localize(9248, "{0}. Available to install from {1}.", item.name, item.marketplace)), () => this._onDidSelectPlugin.fire(item));
+        const primaryAction = this.addSurfaceActivation(row, ( localize(11219, "{0}. Available to install from {1}.", item.name, item.marketplace)), () => this._onDidSelectPlugin.fire(item));
         const details = append(primaryAction, $(".plugin-list-item-details"));
         const nameRow = append(details, $(".plugin-list-item-name-row"));
         const name = append(nameRow, $(".plugin-list-item-name"));
         name.textContent = item.name;
         name.title = item.name;
         const description = append(details, $(".plugin-list-item-description"));
-        description.textContent = truncateToFirstLine(item.description || ( localize(9244, "No description provided.")));
+        description.textContent = truncateToFirstLine(item.description || ( localize(11215, "No description provided.")));
         const actions = append(row, $(".plugin-list-item-action"));
         const install = this.cardDisposables.add(( new Button(actions, {
-            ...defaultButtonStyles,
-            ariaLabel: ( localize(9249, "Install {0}", item.name))
+            ...getButtonStyles({
+                buttonSecondaryHoverBackground: undefined
+            }),
+            secondary: true,
+            ariaLabel: ( localize(11220, "Install {0}", item.name))
         })));
         install.element.classList.add("plugin-list-item-install-button");
-        install.label = ( localize(9177, "Install"));
+        install.label = ( localize(11150, "Install"));
         this.cardDisposables.add(install.onDidClick(() => this.installMarketplacePlugin(item, install)));
         this.cardListControllers.get(parent)?.addItem({
             row,
@@ -1691,43 +1677,6 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     rememberCardFocusElement(element) {
         this.firstCardFocusElement ??= element;
     }
-    renderBrowseMarketplaceCards() {
-        this.captureSectionScrollPositions();
-        this.cardDisposables.clear();
-        this.sectionLists = [];
-        this.installedCreateButton = undefined;
-        this.firstCardFocusElement = undefined;
-        clearNode(this.cardContainer);
-        const marketplaceItems = this.getUninstalledMarketplaceItems();
-        if (marketplaceItems.length === 0) {
-            this.showEmptySurface();
-            this.emptyText.textContent = ( localize(9250, "No plugins available"));
-            this.emptySubtext.textContent = "";
-            return;
-        }
-        this.showCardSurface();
-        const content = this.createCardScrollContent("distributed-section-layout");
-        const recommendedKeys = this.pluginMarketplaceService.recommendedPlugins.get();
-        const recommended = marketplaceItems.filter(item => ( recommendedKeys.has(getMarketplaceRecommendationKey(item))));
-        const allPlugins = marketplaceItems.filter(item => !( recommendedKeys.has(getMarketplaceRecommendationKey(item))));
-        if (recommended.length > 0) {
-            const recommendedGrid = this.renderCardSection(content, ( localize(9251, "Recommended for this workspace")), ( localize(9252, "Plugins recommended by workspace configuration.")), "plugin-marketplace-recommended-section");
-            recommendedGrid.classList.add("plugin-inventory-list");
-            this.createPluginSectionList(recommendedGrid, ( localize(9251, "Recommended for this workspace")), recommended.map(item => ({
-                type: "marketplace-item",
-                item
-            })));
-        }
-        const allGrid = this.renderCardSection(content, ( localize(9253, "All plugins")), ( localize(9254, "Plugins available from configured marketplaces.")), "plugin-marketplace-all-section");
-        allGrid.classList.add("plugin-inventory-list");
-        this.createPluginSectionList(allGrid, ( localize(9253, "All plugins")), allPlugins.map(item => ({
-            type: "marketplace-item",
-            item
-        })));
-        this.layoutPluginSectionLists();
-        this.cardScrollable.scanDomNode();
-        this.schedulePluginSectionLayout();
-    }
     getUninstalledMarketplaceItems(items = this.marketplaceItems) {
         const installedUris = ( new Set(this.agentPluginService.plugins.get().map(p => ( p.uri.toString()))));
         return items.filter(item => {
@@ -1745,26 +1694,32 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         });
     }
     async installMarketplacePlugin(item, button) {
-        button.label = ( localize(9178, "Installing..."));
+        button.label = ( localize(11151, "Installing..."));
         button.enabled = false;
         try {
-            await this.pluginInstallService.installPlugin({
-                name: item.name,
-                description: item.description,
-                version: item.version ?? "",
-                sourceDescriptor: item.sourceDescriptor,
-                source: item.source,
-                marketplace: item.marketplace,
-                marketplaceReference: item.marketplaceReference,
-                marketplaceType: item.marketplaceType,
-                readmeUri: item.readmeUri
-            });
-            button.label = ( localize(9176, "Installed"));
+            await runCustomizationMarketplaceInstallWithTelemetry(
+                this.telemetryService,
+                getAvailableCustomizationMarketplaceInstallTelemetryContext("plugin"),
+                async () => {
+                    await this.pluginInstallService.installPlugin({
+                        name: item.name,
+                        description: item.description,
+                        version: item.version ?? "",
+                        sourceDescriptor: item.sourceDescriptor,
+                        source: item.source,
+                        marketplace: item.marketplace,
+                        marketplaceReference: item.marketplaceReference,
+                        marketplaceType: item.marketplaceType,
+                        readmeUri: item.readmeUri
+                    });
+                }
+            );
+            button.label = ( localize(11149, "Installed"));
             void this.refresh();
         } catch (error) {
-            button.label = ( localize(9177, "Install"));
+            button.label = ( localize(11150, "Install"));
             button.enabled = true;
-            this.notificationService.error(( localize(9179, "Unable to install plugin: {0}", getErrorMessage(error))));
+            this.notificationService.error(( localize(11152, "Unable to install plugin: {0}", getErrorMessage(error))));
         }
     }
     async queryMarketplaceSnapshot() {
@@ -1796,7 +1751,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         }
     }
     showBrowseMarketplace() {
-        if (!this.isBrowseMarketplaceAvailable()) {
+        if (!this.isBrowseMarketplaceAvailable() || !shouldShowLegacyPluginMarketplace(this.configurationService)) {
             return;
         }
         if (!this.browseMode) {
@@ -1821,7 +1776,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         this.searchInput.value = "";
         this.searchQuery = "";
         this.updateToolbarActions();
-        this.searchInput.setPlaceHolder(browse ? ( localize(9255, "Search plugin marketplace...")) : ( localize(9201, "Type to search...")));
+        this.searchInput.setPlaceHolder(browse ? ( localize(11221, "Search plugin marketplace...")) : ( localize(11174, "Type to search...")));
         if (browse) {
             void this.queryMarketplace();
         } else {
@@ -1833,12 +1788,15 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         }
     }
     async queryMarketplace() {
+        if (!shouldShowLegacyPluginMarketplace(this.configurationService)) {
+            return;
+        }
         this.marketplaceCts?.dispose(true);
         const cts = this.marketplaceCts = ( new CancellationTokenSource());
         const query = this.searchQuery.toLowerCase().trim();
         const browseMode = this.browseMode;
         this.showEmptySurface();
-        this.emptyText.textContent = ( localize(9241, "Loading marketplace..."));
+        this.emptyText.textContent = ( localize(11222, "Loading marketplace..."));
         this.emptySubtext.textContent = "";
         try {
             const plugins = await this.pluginMarketplaceService.fetchMarketplacePlugins(cts.token);
@@ -1874,13 +1832,13 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             if (this.isCurrentMarketplaceRequest(cts, query, browseMode)) {
                 this.marketplaceItems = [];
                 this.showEmptySurface();
-                this.emptyText.textContent = ( localize(9256, "Unable to load marketplace"));
-                this.emptySubtext.textContent = ( localize(9257, "Check your connection and try again"));
+                this.emptyText.textContent = ( localize(11223, "Unable to load marketplace"));
+                this.emptySubtext.textContent = ( localize(11224, "Check your connection and try again"));
             }
         }
     }
     async queryPluginSearch() {
-        if (!this.isBrowseMarketplaceAvailable()) {
+        if (!this.isBrowseMarketplaceAvailable() || !shouldShowLegacyPluginMarketplace(this.configurationService)) {
             this.marketplaceItems = [];
             await this.filterPlugins();
             return;
@@ -1925,7 +1883,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.marketplaceItems = [];
             this.searchInput.showMessage({
                 content: ( localize(
-                    9258,
+                    11225,
                     "Marketplace results are unavailable. Showing installed plugins only."
                 )),
                 type: MessageType.WARNING
@@ -1949,64 +1907,10 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         );
     }
     updateMarketplaceList() {
-        if (this.marketplaceItems.length === 0) {
-            this.showEmptySurface();
-            if (this.searchQuery.trim()) {
-                this.emptyText.textContent = ( localize(9259, "No plugins match '{0}'", this.searchQuery));
-                this.emptySubtext.textContent = ( localize(9260, "Try a different search term"));
-            } else {
-                this.emptyText.textContent = ( localize(9250, "No plugins available"));
-                this.emptySubtext.textContent = "";
-            }
-            this.list.splice(0, this.list.length, []);
-            return;
-        }
-        const query = this.searchQuery.trim();
-        if (!query) {
-            this.renderBrowseMarketplaceCards();
-            this.list.splice(0, this.list.length, []);
-            return;
-        } else {
-            this.updateSearchResultsList();
-        }
+        this.renderPluginTree();
     }
     updateSearchResultsList() {
-        const installedNames = ( new Set(this.installedItems.map(item => item.name.toLowerCase())));
-        const remoteItems = this.remoteItems.filter(
-            item => item.groupKey !== "remote-client" && (!item.name || !( installedNames.has(item.name.toLowerCase())))
-        );
-        const installedCount = this.installedItems.length + remoteItems.length;
-        if (installedCount === 0 && this.marketplaceItems.length === 0) {
-            this.showEmptySurface();
-            this.emptyText.textContent = ( localize(9261, "No plugins match '{0}'", this.searchQuery));
-            this.emptySubtext.textContent = ( localize(9260, "Try a different search term"));
-            this.list.splice(0, this.list.length, []);
-            return;
-        }
-        this.captureSectionScrollPositions();
-        this.cardDisposables.clear();
-        this.sectionLists = [];
-        this.installedCreateButton = undefined;
-        this.firstCardFocusElement = undefined;
-        clearNode(this.cardContainer);
-        this.showCardSurface();
-        const content = this.createCardScrollContent("plugin-search-results", "distributed-section-layout");
-        if (installedCount > 0) {
-            const installedList = this.renderCardSection(content, ( localize(9262, "Installed")), undefined, "installed-plugins-section", installedCount);
-            installedList.classList.add("plugin-inventory-list");
-            this.createPluginSectionList(installedList, ( localize(9262, "Installed")), [...this.installedItems.map(item => ({
-                type: "plugin-item",
-                item
-            })), ...remoteItems.map(item => ({
-                type: "remote-item",
-                item
-            }))]);
-        }
-        if (this.marketplaceItems.length > 0) {
-            this.renderAvailablePlugins(content, this.marketplaceItems, false, ( localize(9263, "Available to install")), undefined);
-        }
-        this.schedulePluginSectionLayout();
-        this.list.splice(0, this.list.length, []);
+        this.renderPluginTree();
     }
     async getRemotePluginItems(query) {
         if (!this.harnessService.getActiveDescriptor().itemProvider) {
@@ -2058,14 +1962,6 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     fireItemCount() {
         this._onDidChangeItemCount.fire(this.itemCount);
     }
-    toggleGroup(entry) {
-        if (( this.collapsedGroups.has(entry.group))) {
-            this.collapsedGroups.delete(entry.group);
-        } else {
-            this.collapsedGroups.add(entry.group);
-        }
-        void this.filterPlugins();
-    }
     isInBrowseMode() {
         return this.browseMode;
     }
@@ -2096,8 +1992,7 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         }
         const headerHeight = this.sectionTitleHeader.offsetHeight;
         this.lastHeaderHeight = headerHeight;
-        const backHeight = this.marketplaceBackContainer.offsetHeight;
-        const listHeight = Math.max(0, height - searchBarHeight - headerHeight - backHeight);
+        const listHeight = getCustomizationTreeContentHeight(this.element, this.listContainer, height);
         this.cardScrollableNode.style.height = `${listHeight}px`;
         this.listContainer.style.height = `${listHeight}px`;
         this.list.layout(listHeight, width);
@@ -2106,6 +2001,9 @@ let PluginListWidget = class PluginListWidget extends Disposable {
     focusSearch() {
         this.searchInput.focus();
     }
+    setSearchQuery(query) {
+        this.searchInput.value = query;
+    }
     revealLastItem() {
         if (this.cardScrollableNode.style.display !== "none") {
             const reveal = () => {
@@ -2122,9 +2020,32 @@ let PluginListWidget = class PluginListWidget extends Disposable {
             this.revealLastItemScheduler.value = scheduleAtNextAnimationFrame(getWindow(this.element), reveal);
             return;
         }
-        if (this.list.length > 0) {
-            this.list.reveal(this.list.length - 1);
+        const entries = this.getVisiblePluginEntries();
+        if (entries.length > 0) {
+            this.list.reveal(entries[entries.length - 1]);
+        }
+    }
+    async revealAndSelectItemByUri(uri) {
+        if (this.browseMode) {
+            this.toggleBrowseMode(false);
+        }
+        if (this.searchQuery) {
+            this.searchInput.value = "";
+            this.searchQuery = "";
+            this.delayedFilter.cancel();
         }
+        await this.filterPlugins();
+        const entry = this.getVisiblePluginEntries().find(
+            entry => entry.type === "plugin-item" && isEqual(entry.item.plugin.uri, uri) || entry.type === "remote-item" && isEqual(entry.item.uri, uri)
+        );
+        if (!entry) {
+            return false;
+        }
+        this.list.reveal(entry);
+        this.list.setFocus([entry]);
+        this.list.setSelection([entry]);
+        this.list.domFocus();
+        return true;
     }
     focus() {
         if (this.cardScrollableNode.style.display !== "none") {
@@ -2137,14 +2058,22 @@ let PluginListWidget = class PluginListWidget extends Disposable {
                     section.list.domFocus();
                 }
             }
-        } else if (this.list.length > 0) {
+        } else {
+            const entries = this.getVisiblePluginEntries();
+            if (entries.length === 0) {
+                return;
+            }
             this.list.domFocus();
-            this.list.setFocus([0]);
+            const firstItem = entries.find(entry => entry.type !== "group-header");
+            if (firstItem) {
+                this.list.setFocus([firstItem]);
+            }
         }
     }
     getInstalledPluginActions(item, disposables) {
         const actions = [];
-        const groups = getInstalledPluginContextMenuActions(item.plugin, this.instantiationService);
+        const removePlugin = () => removePluginWithMarketplaceOwnership(item.plugin, this.marketplaceInstallService);
+        const groups = getInstalledPluginContextMenuActions(item.plugin, this.instantiationService, removePlugin);
         for (const menuActions of groups) {
             for (const menuAction of menuActions) {
                 actions.push(menuAction);
@@ -2200,6 +2129,6 @@ let PluginListWidget = class PluginListWidget extends Disposable {
         });
     }
 };
-PluginListWidget = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IAgentPluginService)), ( __param(3, IPluginMarketplaceService)), ( __param(4, IPluginInstallService)), ( __param(5, IOpenerService)), ( __param(6, IContextViewService)), ( __param(7, IContextMenuService)), ( __param(8, IHoverService)), ( __param(9, ILabelService)), ( __param(10, ICommandService)), ( __param(11, ICustomizationHarnessService)), ( __param(12, IAICustomizationItemsModel)), ( __param(13, IConfigurationService)), ( __param(14, INotificationService))], PluginListWidget));
+PluginListWidget = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IAgentPluginService)), ( __param(3, IPluginMarketplaceService)), ( __param(4, IPluginInstallService)), ( __param(5, IOpenerService)), ( __param(6, IContextViewService)), ( __param(7, IContextMenuService)), ( __param(8, IHoverService)), ( __param(9, ILabelService)), ( __param(10, ICommandService)), ( __param(11, ICustomizationHarnessService)), ( __param(12, IAICustomizationWorkspaceService)), ( __param(13, IAICustomizationItemsModel)), ( __param(14, IConfigurationService)), ( __param(15, ICustomizationMarketplaceService)), ( __param(16, INotificationService)), ( __param(17, ICustomizationMarketplaceInstallService)), ( __param(18, ITelemetryService)), ( __param(19, IWorkspaceContextService))], PluginListWidget));
 
-export { PluginListWidget, PluginMarketplaceSnapshotModel, getInstalledPluginMetadata, getRemotePluginDisabledLabel, getToggledPluginEnablementState, isCurrentPluginMarketplaceRequest, shouldLoadPluginMarketplaceSnapshot };
+export { PluginListWidget, PluginMarketplaceSnapshotModel, getInstalledPluginMetadata, getRemotePluginDisabledLabel, getToggledPluginEnablementState, isCurrentPluginMarketplaceRequest, partitionInstalledPluginItemsByScope, setPluginEnablementAndReadEffective, shouldLoadPluginMarketplaceSnapshot, shouldShowLegacyPluginMarketplace, shouldShowPluginTree };