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

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

@@ -3,13 +3,15 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as aiCustomizationManagement from './media/aiCustomizationManagement.css';
 import { $ as $$1, append, addDisposableListener, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { basename, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isEqual, basename, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -17,8 +19,9 @@ import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { workspaceIcon, userIcon, extensionIcon, pluginIcon, agentIcon, promptIcon, hookIcon, instructionsIcon, skillIcon } from './aiCustomizationIcons.js';
-import { AICustomizationManagementItemMenuId } from './aiCustomizationManagement.js';
+import { promptIcon, hookIcon, instructionsIcon, skillIcon, agentIcon, pluginIcon, extensionIcon, userIcon, workspaceIcon, builtinIcon } from './aiCustomizationIcons.js';
+import { AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_ITEM_DISABLED_KEY, AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, AICustomizationManagementItemMenuId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement';
+import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { InputBox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { defaultInputBoxStyles, defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -29,23 +32,34 @@ import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { Button, ButtonWithDropdown } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { createActionViewItem, getContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { AICustomizationManagementSection, applyStorageSourceFilter } from '../../common/aiCustomizationWorkspaceService.js';
+import { AICustomizationManagementSection, BUILTIN_STORAGE, applyStorageSourceFilter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
 import { Separator, Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { generateCustomizationDebugReport } from './aiCustomizationDebugPanel.js';
+import { getCustomizationSecondaryText } from './aiCustomizationListWidgetUtils.js';
+export { truncateToFirstLine } from './aiCustomizationListWidgetUtils.js';
 import { parseHooksFromFile } from '../../common/promptSyntax/hookCompatibility.js';
 import { formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import { HOOK_METADATA, HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { matchesWorkspaceSubpath, matchesInstructionFileFilter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService';
+import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { isInClaudeRulesFolder, getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { evaluateApplyToPattern } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(aiCustomizationManagement);
@@ -116,10 +130,54 @@ class GroupHeaderRenderer {
         templateData.disposables.dispose();
     }
 }
+function promptTypeToIcon(type) {
+    switch (type) {
+    case PromptsType.agent:
+        return agentIcon;
+    case PromptsType.skill:
+        return skillIcon;
+    case PromptsType.instructions:
+        return instructionsIcon;
+    case PromptsType.prompt:
+        return promptIcon;
+    case PromptsType.hook:
+        return hookIcon;
+    default:
+        return promptIcon;
+    }
+}
+function storageToIcon(storage) {
+    switch (storage) {
+    case PromptsStorage.local:
+        return workspaceIcon;
+    case PromptsStorage.user:
+        return userIcon;
+    case PromptsStorage.extension:
+        return extensionIcon;
+    case PromptsStorage.plugin:
+        return pluginIcon;
+    default:
+        return instructionsIcon;
+    }
+}
+function formatDisplayName(name) {
+    return name.replace(/\.md$/i, "").replace(/[-_]/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+}
 let AICustomizationItemRenderer = class AICustomizationItemRenderer {
-    constructor(hoverService, labelService) {
+    constructor(
+        hoverService,
+        labelService,
+        menuService,
+        contextKeyService,
+        instantiationService,
+        agentPluginService
+    ) {
         this.hoverService = hoverService;
         this.labelService = labelService;
+        this.menuService = menuService;
+        this.contextKeyService = contextKeyService;
+        this.instantiationService = instantiationService;
+        this.agentPluginService = agentPluginService;
         this.templateId = "aiCustomizationItem";
     }
     renderTemplate(container) {
@@ -127,14 +185,23 @@ let AICustomizationItemRenderer = class AICustomizationItemRenderer {
         const elementDisposables = ( new DisposableStore());
         container.classList.add("ai-customization-list-item");
         const leftSection = append(container, $(".item-left"));
+        const typeIcon = append(leftSection, $(".item-type-icon"));
         const textContainer = append(leftSection, $(".item-text"));
-        const nameLabel = disposables.add(( new HighlightedLabel(append(textContainer, $(".item-name")))));
+        const nameRow = append(textContainer, $(".item-name-row"));
+        const nameLabel = disposables.add(( new HighlightedLabel(append(nameRow, $(".item-name")))));
+        const badge = append(nameRow, $(".inline-badge.item-badge"));
         const description = disposables.add(( new HighlightedLabel(append(textContainer, $(".item-description")))));
         const actionsContainer = append(container, $(".item-right"));
+        const actionBar = disposables.add(( new ActionBar(actionsContainer, {
+            actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
+        })));
         return {
             container,
             actionsContainer,
+            actionBar,
+            typeIcon,
             nameLabel,
+            badge,
             description,
             disposables,
             elementDisposables
@@ -143,38 +210,116 @@ let AICustomizationItemRenderer = class AICustomizationItemRenderer {
     renderElement(entry, index, templateData) {
         templateData.elementDisposables.clear();
         const element = entry.item;
+        templateData.typeIcon.className = "item-type-icon";
+        templateData.typeIcon.classList.add(
+            ...ThemeIcon.asClassNameArray(element.typeIcon ?? promptTypeToIcon(element.promptType))
+        );
         templateData.elementDisposables.add(this.hoverService.setupDelayedHover(templateData.container, () => {
             const uriLabel = this.labelService.getUriLabel(element.uri, {
                 relative: false
             });
+            let content = `${element.name}\n${uriLabel}`;
+            if (element.badgeTooltip) {
+                content += `\n\n${element.badgeTooltip}`;
+            }
+            const plugin = element.pluginUri && this.agentPluginService.plugins.get().find(p => isEqual(p.uri, element.pluginUri));
+            if (plugin) {
+                content += `\n${( localize(5274, "Plugin: {0}", plugin.label))}`;
+            }
             return {
-                content: `${element.name}\n${uriLabel}`,
+                content,
                 appearance: {
                     compact: true,
                     skipFadeInAnimation: true
                 }
             };
         }));
-        templateData.nameLabel.set(element.name, element.nameMatches);
-        const secondaryText = element.description || element.filename;
+        templateData.container.classList.toggle("disabled", element.disabled);
+        const displayName = element.displayName ?? formatDisplayName(element.name);
+        templateData.nameLabel.set(displayName, element.nameMatches);
+        if (element.badge) {
+            templateData.badge.textContent = element.badge;
+            templateData.badge.style.display = "";
+            if (element.badgeTooltip) {
+                templateData.elementDisposables.add(
+                    this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), templateData.badge, element.badgeTooltip)
+                );
+            }
+        } else {
+            templateData.badge.textContent = "";
+            templateData.badge.style.display = "none";
+        }
+        const secondaryText = getCustomizationSecondaryText(element.description, element.filename, element.promptType);
+        let secondaryTextMatches;
+        if (secondaryText && element.description && element.descriptionMatches) {
+            if (secondaryText === element.description) {
+                secondaryTextMatches = element.descriptionMatches;
+            } else {
+                const maxLength = secondaryText.length;
+                const clampedMatches = ( element.descriptionMatches.map(match => {
+                    if (match.start >= maxLength || match.end <= 0) {
+                        return undefined;
+                    }
+                    const clampedStart = Math.max(0, match.start);
+                    const clampedEnd = Math.min(match.end, maxLength);
+                    return clampedEnd > clampedStart ? {
+                        start: clampedStart,
+                        end: clampedEnd
+                    } : undefined;
+                })).filter(match => !!match);
+                secondaryTextMatches = clampedMatches.length ? clampedMatches : undefined;
+            }
+        }
         if (secondaryText) {
-            templateData.description.set(
-                secondaryText,
-                element.description ? element.descriptionMatches : undefined
-            );
+            templateData.description.set(secondaryText, secondaryTextMatches);
             templateData.description.element.style.display = "";
             templateData.description.element.classList.toggle("is-filename", !element.description);
         } else {
             templateData.description.set("", undefined);
             templateData.description.element.style.display = "none";
         }
+        const context = {
+            uri: ( element.uri.toString()),
+            name: element.name,
+            promptType: element.promptType,
+            storage: element.storage,
+            pluginUri: element.pluginUri?.toString()
+        };
+        const overlayPairs = [
+            [AI_CUSTOMIZATION_ITEM_TYPE_KEY, element.promptType],
+            [AI_CUSTOMIZATION_ITEM_STORAGE_KEY, element.storage],
+            [AI_CUSTOMIZATION_ITEM_URI_KEY, ( element.uri.toString())],
+            [AI_CUSTOMIZATION_ITEM_DISABLED_KEY, element.disabled]
+        ];
+        if (element.pluginUri) {
+            overlayPairs.push([AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, ( element.pluginUri.toString())]);
+        }
+        const overlay = this.contextKeyService.createOverlay(overlayPairs);
+        const menu = templateData.elementDisposables.add(this.menuService.createMenu(AICustomizationManagementItemMenuId, overlay));
+        const updateActions = () => {
+            const actions = menu.getActions({
+                arg: context,
+                shouldForwardArgs: true
+            });
+            const {
+                primary
+            } = getContextMenuActions(actions, "inline");
+            templateData.actionBar.clear();
+            templateData.actionBar.push(primary, {
+                icon: true,
+                label: false
+            });
+        };
+        updateActions();
+        templateData.elementDisposables.add(menu.onDidChange(updateActions));
+        templateData.actionBar.context = context;
     }
     disposeTemplate(templateData) {
         templateData.elementDisposables.dispose();
         templateData.disposables.dispose();
     }
 };
-AICustomizationItemRenderer = ( __decorate([( __param(0, IHoverService)), ( __param(1, ILabelService))], AICustomizationItemRenderer));
+AICustomizationItemRenderer = ( __decorate([( __param(0, IHoverService)), ( __param(1, ILabelService)), ( __param(2, IMenuService)), ( __param(3, IContextKeyService)), ( __param(4, IInstantiationService)), ( __param(5, IAgentPluginService))], AICustomizationItemRenderer));
 function sectionToPromptType(section) {
     switch (section) {
     case AICustomizationManagementSection.Agents:
@@ -205,7 +350,12 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         clipboardService,
         hoverService,
         fileService,
-        pathService
+        pathService,
+        telemetryService,
+        harnessService,
+        agentPluginService,
+        commandService,
+        productService
     ) {
         super();
         this.instantiationService = instantiationService;
@@ -222,6 +372,11 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         this.hoverService = hoverService;
         this.fileService = fileService;
         this.pathService = pathService;
+        this.telemetryService = telemetryService;
+        this.harnessService = harnessService;
+        this.agentPluginService = agentPluginService;
+        this.commandService = commandService;
+        this.productService = productService;
         this.currentSection = AICustomizationManagementSection.Agents;
         this.allItems = [];
         this.displayEntries = [];
@@ -247,17 +402,30 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             this.updateAddButton();
             this.refresh();
         }));
+        this._register(autorun(reader => {
+            this.harnessService.activeHarness.read(reader);
+            this.updateAddButton();
+            this.refresh();
+        }));
     }
     create() {
         this.searchAndButtonContainer = append(this.element, $(".list-search-and-button-container"));
         this.searchContainer = append(this.searchAndButtonContainer, $(".list-search-container"));
         this.searchInput = this._register(( new InputBox(this.searchContainer, this.contextViewService, {
-            placeholder: ( localize(5231, "Type to search...")),
+            placeholder: ( localize(5275, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
             this.searchQuery = this.searchInput.value;
-            this.delayedFilter.trigger(() => this.filterItems());
+            this.delayedFilter.trigger(() => {
+                const matchCount = this.filterItems();
+                if (this.searchQuery.trim()) {
+                    this.telemetryService.publicLog2("chatCustomizationEditor.search", {
+                        section: this.currentSection,
+                        resultCount: matchCount
+                    });
+                }
+            });
         }));
         this.addButtonContainer = append(this.searchAndButtonContainer, $(".list-add-button-container"));
         this.addButtonSimple = this._register(( new Button(this.addButtonContainer, {
@@ -280,8 +448,9 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         this.updateAddButton();
         this.listContainer = append(this.element, $(".list-container"));
         this.emptyStateContainer = append(this.element, $(".list-empty-state"));
-        this.emptyStateIcon = append(this.emptyStateContainer, $(".empty-state-icon"));
-        this.emptyStateText = append(this.emptyStateContainer, $(".empty-state-text"));
+        const emptyStateHeader = append(this.emptyStateContainer, $(".empty-state-header"));
+        this.emptyStateIcon = append(emptyStateHeader, $(".empty-state-icon"));
+        this.emptyStateText = append(emptyStateHeader, $(".empty-state-text"));
         this.emptyStateSubtext = append(this.emptyStateContainer, $(".empty-state-subtext"));
         this.emptyStateContainer.style.display = "none";
         this.list = this._register(this.instantiationService.createInstance(
@@ -298,16 +467,17 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     getAriaLabel: entry => {
                         if (entry.type === "group-header") {
                             return localize(
-                                5232,
+                                5276,
                                 "{0}, {1} items, {2}",
                                 entry.label,
                                 entry.count,
-                                entry.collapsed ? ( localize(5233, "collapsed")) : ( localize(5234, "expanded"))
+                                entry.collapsed ? ( localize(5277, "collapsed")) : ( localize(5278, "expanded"))
                             );
                         }
-                        return entry.item.description ? ( localize(5235, "{0}, {1}", entry.item.name, entry.item.description)) : entry.item.name;
+                        const nameAndDesc = entry.item.description ? ( localize(5279, "{0}, {1}", entry.item.name, entry.item.description)) : entry.item.name;
+                        return entry.item.disabled ? ( localize(5280, "{0}, disabled", nameAndDesc)) : nameAndDesc;
                     },
-                    getWidgetAriaLabel: () => ( localize(5236, "Chat Customizations"))
+                    getWidgetAriaLabel: () => ( localize(5281, "Chat Customizations"))
                 },
                 keyboardNavigationLabelProvider: {
                     getKeyboardNavigationLabel: entry => entry.type === "group-header" ? entry.label : entry.item.name
@@ -328,6 +498,12 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         this._register(this.list.onContextMenu(e => this.onContextMenu(e)));
         this._register(this.promptsService.onDidChangeCustomAgents(() => this.refresh()));
         this._register(this.promptsService.onDidChangeSlashCommands(() => this.refresh()));
+        this._register(this.promptsService.onDidChangeSkills(() => this.refresh()));
+        this._register(this.fileService.onDidFilesChange(e => {
+            if (e.gotDeleted()) {
+                this.refresh();
+            }
+        }));
         this.sectionHeader = append(this.element, $(".section-footer"));
         this.sectionDescription = append(this.sectionHeader, $("p.section-footer-description"));
         this.sectionLink = append(this.sectionHeader, $("a.section-footer-link"));
@@ -349,16 +525,29 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             uri: ( item.uri.toString()),
             name: item.name,
             promptType: item.promptType,
-            storage: item.storage
+            storage: item.storage,
+            pluginUri: item.pluginUri?.toString()
         };
-        const actions = this.menuService.getMenuActions(AICustomizationManagementItemMenuId, this.contextKeyService, {
+        const overlayPairs = [
+            [AI_CUSTOMIZATION_ITEM_TYPE_KEY, item.promptType],
+            [AI_CUSTOMIZATION_ITEM_STORAGE_KEY, item.storage],
+            [AI_CUSTOMIZATION_ITEM_URI_KEY, ( item.uri.toString())],
+            [AI_CUSTOMIZATION_ITEM_DISABLED_KEY, item.disabled]
+        ];
+        if (item.pluginUri) {
+            overlayPairs.push([AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, ( item.pluginUri.toString())]);
+        }
+        const overlay = this.contextKeyService.createOverlay(overlayPairs);
+        const actions = this.menuService.getMenuActions(AICustomizationManagementItemMenuId, overlay, {
             arg: context,
             shouldForwardArgs: true
         });
-        const flatActions = getFlatContextMenuActions(actions);
-        const copyActions = [( new Separator()), ( new Action("copyFullPath", ( localize(5237, "Copy Full Path")), undefined, true, async () => {
+        const {
+            secondary
+        } = getContextMenuActions(actions, "inline");
+        const copyActions = [( new Separator()), ( new Action("copyFullPath", ( localize(5282, "Copy Full Path")), undefined, true, async () => {
             await this.clipboardService.writeText(item.uri.fsPath);
-        })), ( new Action("copyRelativePath", ( localize(5238, "Copy Relative Path")), undefined, true, async () => {
+        })), ( new Action("copyRelativePath", ( localize(5283, "Copy Relative Path")), undefined, true, async () => {
             const basePath = this.workspaceService.getActiveProjectRoot();
             if (basePath && item.uri.fsPath.startsWith(basePath.fsPath)) {
                 const relative = item.uri.fsPath.substring(basePath.fsPath.length + 1);
@@ -372,7 +561,7 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         }))];
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
-            getActions: () => [...flatActions, ...copyActions]
+            getActions: () => [...secondary, ...copyActions]
         });
     }
     async setSection(section) {
@@ -388,41 +577,41 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         switch (this.currentSection) {
         case AICustomizationManagementSection.Agents:
             description = ( localize(
-                5239,
+                5284,
                 "Configure the AI to adopt different personas tailored to specific development tasks. Each agent has its own instructions, tools, and behavior."
             ));
             docsUrl = "https://code.visualstudio.com/docs/copilot/customization/custom-agents";
-            learnMoreLabel = ( localize(5240, "Learn more about custom agents"));
+            learnMoreLabel = ( localize(5285, "Learn more about custom agents"));
             break;
         case AICustomizationManagementSection.Skills:
             description = ( localize(
-                5241,
+                5286,
                 "Folders of instructions, scripts, and resources that Copilot loads when relevant to perform specialized tasks."
             ));
             docsUrl = "https://code.visualstudio.com/docs/copilot/customization/agent-skills";
-            learnMoreLabel = ( localize(5242, "Learn more about agent skills"));
+            learnMoreLabel = ( localize(5287, "Learn more about agent skills"));
             break;
         case AICustomizationManagementSection.Instructions:
             description = ( localize(
-                5243,
+                5288,
                 "Define common guidelines and rules that automatically influence how AI generates code and handles development tasks."
             ));
             docsUrl = "https://code.visualstudio.com/docs/copilot/customization/custom-instructions";
-            learnMoreLabel = ( localize(5244, "Learn more about custom instructions"));
+            learnMoreLabel = ( localize(5289, "Learn more about custom instructions"));
             break;
         case AICustomizationManagementSection.Hooks:
-            description = ( localize(5245, "Prompts executed at specific points during an agentic lifecycle."));
+            description = ( localize(5290, "Prompts executed at specific points during an agentic lifecycle."));
             docsUrl = "https://code.visualstudio.com/docs/copilot/customization/hooks";
-            learnMoreLabel = ( localize(5246, "Learn more about hooks"));
+            learnMoreLabel = ( localize(5291, "Learn more about hooks"));
             break;
         case AICustomizationManagementSection.Prompts:
         default:
             description = ( localize(
-                5247,
+                5292,
                 "Reusable prompts for common development tasks like generating code, performing reviews, or scaffolding components."
             ));
             docsUrl = "https://code.visualstudio.com/docs/copilot/customization/prompt-files";
-            learnMoreLabel = ( localize(5248, "Learn more about prompt files"));
+            learnMoreLabel = ( localize(5293, "Learn more about prompt files"));
             break;
         }
         this.sectionDescription.textContent = description;
@@ -430,145 +619,197 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         this.sectionLink.href = docsUrl;
     }
     updateAddButton() {
-        const typeLabel = this.getTypeLabel();
-        const dropdownActions = this.getDropdownActions();
-        const hasDropdown = dropdownActions.length > 0;
+        const actions = this.buildCreateActions();
+        const [primary, ...dropdown] = actions;
+        const hasDropdown = dropdown.length > 0;
         this.addButton.element.style.display = hasDropdown ? "" : "none";
         this.addButtonSimple.element.style.display = hasDropdown ? "none" : "";
-        if (this.workspaceService.isSessionsWindow) {
-            const hasWorkspace = this.hasActiveWorkspace();
-            const label = `$(${Codicon.add.id}) New ${typeLabel} (Workspace)`;
-            if (hasDropdown) {
-                this.addButton.label = label;
-                this.addButton.enabled = hasWorkspace;
-                this.addButton.primaryButton.setTitle("");
-                this.addButton.dropdownButton.setTitle("");
-                if (!hasWorkspace) {
-                    const disabledTitle = ( localize(5249, "Open a workspace folder to create customizations."));
-                    this.addButton.primaryButton.setTitle(disabledTitle);
-                    this.addButton.dropdownButton.setTitle(disabledTitle);
-                }
-            } else {
-                this.addButtonSimple.label = label;
-                this.addButtonSimple.enabled = hasWorkspace;
-                if (!hasWorkspace) {
-                    this.addButtonSimple.setTitle(( localize(5249, "Open a workspace folder to create customizations.")));
-                } else {
-                    this.addButtonSimple.setTitle("");
-                }
-            }
+        if (!primary) {
+            this.addButtonSimple.element.style.display = "none";
+            this.addButton.element.style.display = "none";
+            return;
+        }
+        if (hasDropdown) {
+            this.addButton.label = primary.label;
+            this.addButton.enabled = primary.enabled;
+            this.addButton.primaryButton.setTitle(primary.tooltip ?? "");
+            this.addButton.dropdownButton.setTitle("");
         } else {
-            const label = `$(${Codicon.sparkle.id}) Generate ${typeLabel}`;
-            if (hasDropdown) {
-                this.addButton.label = label;
-                this.addButton.enabled = true;
-                this.addButton.primaryButton.setTitle("");
-                this.addButton.dropdownButton.setTitle("");
-            } else {
-                this.addButtonSimple.label = label;
-                this.addButtonSimple.enabled = true;
-                this.addButtonSimple.setTitle("");
-            }
+            this.addButtonSimple.label = primary.label;
+            this.addButtonSimple.enabled = primary.enabled;
+            this.addButtonSimple.setTitle(primary.tooltip ?? "");
         }
     }
-    getDropdownActions() {
-        this.dropdownActionDisposables.clear();
+    buildCreateActions() {
         const typeLabel = this.getTypeLabel();
-        const actions = [];
         const promptType = sectionToPromptType(this.currentSection);
+        const descriptor = this.harnessService.getActiveDescriptor();
+        const override = descriptor.sectionOverrides?.get(this.currentSection);
+        const hasWorkspace = this.hasActiveWorkspace();
+        if (override?.commandId) {
+            return [{
+                label: `$(${Codicon.add.id}) ${override.label}`,
+                enabled: true,
+                run: () => {
+                    this.commandService.executeCommand(override.commandId);
+                }
+            }];
+        }
+        const createTypeLabel = override?.typeLabel ?? typeLabel;
+        const actions = [];
+        const addedTargets = ( new Set());
+        if (override?.rootFile && hasWorkspace) {
+            actions.push({
+                label: `$(${Codicon.add.id}) ${override.label}`,
+                enabled: true,
+                run: () => {
+                    this._onDidRequestCreateManual.fire({
+                        type: promptType,
+                        target: "workspace-root"
+                    });
+                }
+            });
+            addedTargets.add("workspace-root");
+        }
         if (promptType === PromptsType.hook) {
-            if (this.workspaceService.isSessionsWindow)
-                ; else {
-                if (this.hasActiveWorkspace()) {
-                    actions.push(this.dropdownActionDisposables.add(( new Action(
-                        "configureHooks",
-                        `$(${Codicon.add.id}) Configure Hooks`,
-                        undefined,
-                        true,
-                        () => {
+            if (!this.workspaceService.isSessionsWindow && !descriptor.hideGenerateButton) {
+                actions.push({
+                    label: `$(${Codicon.sparkle.id}) Generate ${typeLabel}`,
+                    enabled: true,
+                    run: () => {
+                        this._onDidRequestCreate.fire(promptType);
+                    }
+                });
+                if (hasWorkspace) {
+                    actions.push({
+                        label: `$(${Codicon.add.id}) Configure Hooks`,
+                        enabled: true,
+                        run: () => {
                             this._onDidRequestCreateManual.fire({
                                 type: promptType,
                                 target: "workspace"
                             });
                         }
-                    ))));
+                    });
                 }
+            } else if (!override?.commandId) {
+                actions.push({
+                    label: `$(${Codicon.add.id}) New ${typeLabel} (Workspace)`,
+                    enabled: hasWorkspace,
+                    tooltip: hasWorkspace ? undefined : ( localize(5294, "Open a workspace folder to create customizations.")),
+                    run: () => {
+                        this._onDidRequestCreateManual.fire({
+                            type: promptType,
+                            target: "workspace"
+                        });
+                    }
+                });
             }
             return actions;
         }
-        if (this.workspaceService.isSessionsWindow) {
-            actions.push(this.dropdownActionDisposables.add(( new Action(
-                "createUser",
-                `$(${Codicon.account.id}) New ${typeLabel} (User)`,
-                undefined,
-                true,
-                () => {
-                    this._onDidRequestCreateManual.fire({
-                        type: promptType,
-                        target: "user"
-                    });
-                }
-            ))));
-        } else {
-            if (this.hasActiveWorkspace()) {
-                actions.push(this.dropdownActionDisposables.add(( new Action(
-                    "createWorkspace",
-                    `$(${Codicon.folder.id}) New ${typeLabel} (Workspace)`,
-                    undefined,
-                    true,
-                    () => {
+        if (!override?.rootFile) {
+            if (!this.workspaceService.isSessionsWindow && !descriptor.hideGenerateButton) {
+                actions.push({
+                    label: `$(${Codicon.sparkle.id}) Generate ${typeLabel}`,
+                    enabled: true,
+                    run: () => {
+                        this._onDidRequestCreate.fire(promptType);
+                    }
+                });
+            } else if (hasWorkspace) {
+                actions.push({
+                    label: `$(${Codicon.add.id}) New ${createTypeLabel} (Workspace)`,
+                    enabled: true,
+                    run: () => {
                         this._onDidRequestCreateManual.fire({
                             type: promptType,
                             target: "workspace"
                         });
                     }
-                ))));
-            }
-            actions.push(this.dropdownActionDisposables.add(( new Action(
-                "createUser",
-                `$(${Codicon.account.id}) New ${typeLabel} (User)`,
-                undefined,
-                true,
-                () => {
+                });
+                addedTargets.add("workspace");
+            } else {
+                actions.push({
+                    label: `$(${Codicon.add.id}) New ${createTypeLabel} (User)`,
+                    enabled: true,
+                    run: () => {
+                        this._onDidRequestCreateManual.fire({
+                            type: promptType,
+                            target: "user"
+                        });
+                    }
+                });
+                addedTargets.add("user");
+            }
+        }
+        if (hasWorkspace && !( addedTargets.has("workspace"))) {
+            actions.push({
+                label: `$(${Codicon.folder.id}) New ${createTypeLabel} (Workspace)`,
+                enabled: true,
+                run: () => {
+                    this._onDidRequestCreateManual.fire({
+                        type: promptType,
+                        target: "workspace"
+                    });
+                }
+            });
+        }
+        if (!( addedTargets.has("user"))) {
+            actions.push({
+                label: `$(${Codicon.account.id}) New ${createTypeLabel} (User)`,
+                enabled: true,
+                run: () => {
                     this._onDidRequestCreateManual.fire({
                         type: promptType,
                         target: "user"
                     });
                 }
-            ))));
+            });
+        }
+        if (hasWorkspace && override?.rootFileShortcuts && !( addedTargets.has("workspace-root"))) {
+            for (const fileName of override.rootFileShortcuts) {
+                actions.push({
+                    label: `$(${Codicon.file.id}) New ${fileName}`,
+                    enabled: true,
+                    run: () => {
+                        this._onDidRequestCreateManual.fire({
+                            type: promptType,
+                            target: "workspace-root",
+                            rootFileName: fileName
+                        });
+                    }
+                });
+            }
         }
         return actions;
     }
+    getDropdownActions() {
+        this.dropdownActionDisposables.clear();
+        const allActions = this.buildCreateActions();
+        return ( allActions.slice(1).map((a, i) => this.dropdownActionDisposables.add(( new Action(`create_${i}`, a.label, undefined, a.enabled, () => a.run())))));
+    }
     hasActiveWorkspace() {
         return !!this.workspaceService.getActiveProjectRoot();
     }
     executePrimaryCreateAction() {
-        const promptType = sectionToPromptType(this.currentSection);
-        if (this.workspaceService.isSessionsWindow) {
-            if (!this.hasActiveWorkspace()) {
-                return;
-            }
-            this._onDidRequestCreateManual.fire({
-                type: promptType,
-                target: "workspace"
-            });
-        } else {
-            this._onDidRequestCreate.fire(promptType);
+        const actions = this.buildCreateActions();
+        if (actions.length > 0 && actions[0].enabled) {
+            actions[0].run();
         }
     }
     getTypeLabel() {
         switch (this.currentSection) {
         case AICustomizationManagementSection.Agents:
-            return localize(5250, "Agent");
+            return localize(5295, "Agent");
         case AICustomizationManagementSection.Skills:
-            return localize(5251, "Skill");
+            return localize(5296, "Skill");
         case AICustomizationManagementSection.Instructions:
-            return localize(5252, "Instructions");
+            return localize(5297, "Instructions");
         case AICustomizationManagementSection.Hooks:
-            return localize(5253, "Hook");
+            return localize(5298, "Hook");
         case AICustomizationManagementSection.Prompts:
         default:
-            return localize(5254, "Prompt");
+            return localize(5299, "Prompt");
         }
     }
     async refresh() {
@@ -577,8 +818,48 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
     }
     async loadItems() {
         const section = this.currentSection;
+        const items = await this.fetchItemsForSection(section);
+        if (this.currentSection !== section) {
+            return;
+        }
+        this.allItems = items;
+        this.filterItems();
+        this._onDidChangeItemCount.fire(items.length);
+    }
+    async computeItemCountForSection(section) {
+        const items = await this.fetchItemsForSection(section);
+        return items.length;
+    }
+    isChatExtensionItem(extensionId) {
+        const chatExtensionId = this.productService.defaultChatAgent?.chatExtensionId;
+        return !!chatExtensionId && ExtensionIdentifier.equals(extensionId, chatExtensionId);
+    }
+    resolveExtensionGroupKey(extensionId) {
+        if (extensionId && this.isChatExtensionItem(extensionId)) {
+            return BUILTIN_STORAGE;
+        }
+        return undefined;
+    }
+    applyBuiltinGroupKeys(items, extensionIdByUri) {
+        for (const item of items) {
+            if (item.groupKey !== undefined) {
+                continue;
+            }
+            if (item.storage !== PromptsStorage.extension) {
+                continue;
+            }
+            const extId = extensionIdByUri.get(( item.uri.toString()));
+            const override = this.resolveExtensionGroupKey(extId);
+            if (override) {
+                item.groupKey = override;
+            }
+        }
+    }
+    async fetchItemsForSection(section) {
         const promptType = sectionToPromptType(section);
         const items = [];
+        const disabledUris = this.promptsService.getDisabledPromptFiles(promptType);
+        const extensionIdByUri = ( new Map());
         if (promptType === PromptsType.agent) {
             const agents = await this.promptsService.getCustomAgents(CancellationToken.None);
             for (const agent of agents) {
@@ -590,14 +871,27 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     filename,
                     description: agent.description,
                     storage: agent.source.storage,
-                    promptType
+                    promptType,
+                    pluginUri: agent.source.storage === PromptsStorage.plugin ? agent.source.pluginUri : undefined,
+                    disabled: ( disabledUris.has(agent.uri))
                 });
+                if (agent.source.storage === PromptsStorage.extension) {
+                    extensionIdByUri.set(( agent.uri.toString()), agent.source.extensionId);
+                }
             }
         } else if (promptType === PromptsType.skill) {
             const skills = await this.promptsService.findAgentSkills(CancellationToken.None);
+            const allSkillFiles = await this.promptsService.listPromptFiles(PromptsType.skill, CancellationToken.None);
+            for (const file of allSkillFiles) {
+                if (file.extension) {
+                    extensionIdByUri.set(( file.uri.toString()), file.extension.identifier);
+                }
+            }
+            const seenUris = ( new ResourceSet());
             for (const skill of skills || []) {
                 const filename = basename(skill.uri);
                 const skillName = skill.name || basename(dirname(skill.uri)) || filename;
+                seenUris.add(skill.uri);
                 items.push({
                     id: ( skill.uri.toString()),
                     uri: skill.uri,
@@ -605,9 +899,28 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     filename,
                     description: skill.description,
                     storage: skill.storage,
-                    promptType
+                    promptType,
+                    pluginUri: skill.storage === PromptsStorage.plugin ? this.findPluginUri(skill.uri) : undefined,
+                    disabled: false
                 });
             }
+            if (disabledUris.size > 0) {
+                for (const file of allSkillFiles) {
+                    if (!( seenUris.has(file.uri)) && ( disabledUris.has(file.uri))) {
+                        const filename = basename(file.uri);
+                        items.push({
+                            id: ( file.uri.toString()),
+                            uri: file.uri,
+                            name: file.name || basename(dirname(file.uri)) || filename,
+                            filename,
+                            description: file.description,
+                            storage: file.storage,
+                            promptType,
+                            disabled: true
+                        });
+                    }
+                }
+            }
         } else if (promptType === PromptsType.prompt) {
             const commands = await this.promptsService.getPromptSlashCommands(CancellationToken.None);
             for (const command of commands) {
@@ -622,8 +935,13 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     filename,
                     description: command.description,
                     storage: command.promptPath.storage,
-                    promptType
+                    promptType,
+                    pluginUri: command.promptPath.storage === PromptsStorage.plugin ? command.promptPath.pluginUri : undefined,
+                    disabled: ( disabledUris.has(command.promptPath.uri))
                 });
+                if (command.promptPath.extension) {
+                    extensionIdByUri.set(( command.promptPath.uri.toString()), command.promptPath.extension.identifier);
+                }
             }
         } else if (promptType === PromptsType.hook) {
             const hookFiles = await this.promptsService.listPromptFiles(PromptsType.hook, CancellationToken.None);
@@ -631,6 +949,20 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             const userHomeUri = await this.pathService.userHome();
             const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
             for (const hookFile of hookFiles) {
+                if (hookFile.storage === PromptsStorage.plugin) {
+                    const filename = basename(hookFile.uri);
+                    items.push({
+                        id: ( hookFile.uri.toString()) + ":" + hookFile.name,
+                        uri: hookFile.uri,
+                        name: hookFile.name || this.getFriendlyName(filename),
+                        filename,
+                        storage: hookFile.storage,
+                        promptType,
+                        pluginUri: hookFile.pluginUri,
+                        disabled: ( disabledUris.has(hookFile.uri))
+                    });
+                    continue;
+                }
                 let parsedHooks = false;
                 try {
                     const content = await this.fileService.readFile(hookFile.uri);
@@ -651,9 +983,10 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                                     uri: hookFile.uri,
                                     name: hookMeta?.label ?? entry.originalId,
                                     filename: basename(hookFile.uri),
-                                    description: truncatedCmd || ( localize(5255, "(unset)")),
+                                    description: truncatedCmd || ( localize(5300, "(unset)")),
                                     storage: hookFile.storage,
-                                    promptType
+                                    promptType,
+                                    disabled: ( disabledUris.has(hookFile.uri))
                                 });
                             }
                         }
@@ -664,10 +997,11 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     items.push({
                         id: ( hookFile.uri.toString()),
                         uri: hookFile.uri,
-                        name: this.getFriendlyName(filename),
+                        name: hookFile.name || this.getFriendlyName(filename),
                         filename,
                         storage: hookFile.storage,
-                        promptType
+                        promptType,
+                        disabled: ( disabledUris.has(hookFile.uri))
                     });
                 }
             }
@@ -691,67 +1025,146 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                             uri: agent.uri,
                             name: hookMeta?.label ?? hookType,
                             filename: basename(agent.uri),
-                            description: `${agent.name}: ${truncatedCmd || ( localize(5255, "(unset)"))}`,
+                            description: `${agent.name}: ${truncatedCmd || ( localize(5300, "(unset)"))}`,
                             storage: agent.source.storage,
                             groupKey: "agents",
-                            promptType
+                            promptType,
+                            pluginUri: agent.source.storage === PromptsStorage.plugin ? agent.source.pluginUri : undefined,
+                            disabled: ( disabledUris.has(agent.uri))
                         });
                     }
                 }
             }
         } else {
             const promptFiles = await this.promptsService.listPromptFiles(promptType, CancellationToken.None);
-            const allItems = [...promptFiles];
-            if (promptType === PromptsType.instructions) {
-                const agentInstructions = await this.promptsService.listAgentInstructions(CancellationToken.None, undefined);
-                const workspaceFolderUris = ( this.workspaceContextService.getWorkspace().folders.map(f => f.uri));
-                const activeRoot = this.workspaceService.getActiveProjectRoot();
-                if (activeRoot) {
-                    workspaceFolderUris.push(activeRoot);
+            for (const file of promptFiles) {
+                if (file.extension) {
+                    extensionIdByUri.set(( file.uri.toString()), file.extension.identifier);
+                }
+            }
+            const agentInstructionFiles = await this.promptsService.listAgentInstructions(CancellationToken.None, undefined);
+            const agentInstructionUris = ( new ResourceSet(( agentInstructionFiles.map(f => f.uri))));
+            const workspaceFolderUris = ( this.workspaceContextService.getWorkspace().folders.map(f => f.uri));
+            const activeRoot = this.workspaceService.getActiveProjectRoot();
+            if (activeRoot) {
+                workspaceFolderUris.push(activeRoot);
+            }
+            for (const file of agentInstructionFiles) {
+                const storage = PromptsStorage.local;
+                const filename = basename(file.uri);
+                items.push({
+                    id: ( file.uri.toString()),
+                    uri: file.uri,
+                    name: filename,
+                    filename: this.labelService.getUriLabel(file.uri, {
+                        relative: true
+                    }),
+                    displayName: filename,
+                    storage,
+                    promptType,
+                    typeIcon: storageToIcon(storage),
+                    groupKey: "agent-instructions",
+                    disabled: ( disabledUris.has(file.uri))
+                });
+            }
+            const promptFilesToParse = promptFiles.filter(item => !( agentInstructionUris.has(item.uri)));
+            const parseResults = await Promise.all(( promptFilesToParse.map(async item => {
+                try {
+                    const parsed = await this.promptsService.parseNew(item.uri, CancellationToken.None);
+                    return {
+                        item,
+                        parsed
+                    };
+                } catch {
+                    return {
+                        item,
+                        parsed: undefined
+                    };
                 }
-                for (const file of agentInstructions) {
-                    const isWorkspaceFile = ( workspaceFolderUris.some(root => isEqualOrParent(file.uri, root)));
-                    allItems.push({
-                        uri: file.uri,
-                        storage: isWorkspaceFile ? PromptsStorage.local : PromptsStorage.user,
-                        type: PromptsType.instructions,
-                        name: basename(file.uri)
+            })));
+            for (const {
+                item,
+                parsed
+            } of parseResults) {
+                const applyTo = evaluateApplyToPattern(parsed?.header, isInClaudeRulesFolder(item.uri));
+                const name = parsed?.header?.name;
+                let description = parsed?.header?.description;
+                const friendlyName = this.getFriendlyName(name || item.name || getCleanPromptName(item.uri));
+                description = description || item.description;
+                if (applyTo !== undefined) {
+                    const badge = applyTo === "**" ? ( localize(5301, "always added")) : applyTo;
+                    const badgeTooltip = applyTo === "**" ? ( localize(5302, "This instruction is automatically included in every interaction.")) : ( localize(
+                        5303,
+                        "This instruction is automatically included when files matching '{0}' are in context.",
+                        applyTo
+                    ));
+                    items.push({
+                        id: ( item.uri.toString()),
+                        uri: item.uri,
+                        name: friendlyName,
+                        filename: this.labelService.getUriLabel(item.uri, {
+                            relative: true
+                        }),
+                        displayName: friendlyName,
+                        badge,
+                        badgeTooltip,
+                        description: description,
+                        storage: item.storage,
+                        promptType,
+                        typeIcon: storageToIcon(item.storage),
+                        groupKey: "context-instructions",
+                        pluginUri: item.storage === PromptsStorage.plugin ? item.pluginUri : undefined,
+                        disabled: ( disabledUris.has(item.uri))
+                    });
+                } else {
+                    items.push({
+                        id: ( item.uri.toString()),
+                        uri: item.uri,
+                        name: friendlyName,
+                        filename: basename(item.uri),
+                        displayName: friendlyName,
+                        description: description,
+                        storage: item.storage,
+                        promptType,
+                        typeIcon: storageToIcon(item.storage),
+                        groupKey: "on-demand-instructions",
+                        pluginUri: item.storage === PromptsStorage.plugin ? item.pluginUri : undefined,
+                        disabled: ( disabledUris.has(item.uri))
                     });
                 }
             }
-            const workspaceItems = allItems.filter(item => item.storage === PromptsStorage.local);
-            const userItems = allItems.filter(item => item.storage === PromptsStorage.user);
-            const extensionItems = allItems.filter(item => item.storage === PromptsStorage.extension);
-            const pluginItems = allItems.filter(item => item.storage === PromptsStorage.plugin);
-            const mapToListItem = item => {
-                const filename = basename(item.uri);
-                const friendlyName = item.name || this.getFriendlyName(filename);
-                return {
-                    id: ( item.uri.toString()),
-                    uri: item.uri,
-                    name: friendlyName,
-                    filename,
-                    description: item.description,
-                    storage: item.storage,
-                    promptType
-                };
-            };
-            items.push(...( workspaceItems.map(mapToListItem)));
-            items.push(...( userItems.map(mapToListItem)));
-            items.push(...( extensionItems.map(mapToListItem)));
-            items.push(...( pluginItems.map(mapToListItem)));
         }
+        this.applyBuiltinGroupKeys(items, extensionIdByUri);
         const filter = this.workspaceService.getStorageSourceFilter(promptType);
         const filteredItems = applyStorageSourceFilter(items, filter);
         items.length = 0;
         items.push(...filteredItems);
-        items.sort((a, b) => a.name.localeCompare(b.name));
-        if (this.currentSection !== section) {
-            return;
+        const descriptor = this.harnessService.getActiveDescriptor();
+        const subpaths = descriptor.workspaceSubpaths;
+        const instrFilter = descriptor.instructionFileFilter;
+        if (subpaths) {
+            const projectRoot = this.workspaceService.getActiveProjectRoot();
+            for (let i = items.length - 1; i >= 0; i--) {
+                const item = items[i];
+                if (item.storage === PromptsStorage.local && projectRoot && isEqualOrParent(item.uri, projectRoot)) {
+                    if (!matchesWorkspaceSubpath(item.uri.path, subpaths)) {
+                        if (instrFilter && promptType === PromptsType.instructions && matchesInstructionFileFilter(item.uri.path, instrFilter)) {
+                            continue;
+                        }
+                        items.splice(i, 1);
+                    }
+                }
+            }
         }
-        this.allItems = items;
-        this.filterItems();
-        this._onDidChangeItemCount.fire(items.length);
+        if (instrFilter && promptType === PromptsType.instructions) {
+            for (let i = items.length - 1; i >= 0; i--) {
+                if (!matchesInstructionFileFilter(items[i].uri.path, instrFilter)) {
+                    items.splice(i, 1);
+                }
+            }
+        }
+        items.sort((a, b) => a.name.localeCompare(b.name));
+        return items;
     }
     getFriendlyName(filename) {
         let name = filename.replace(/\.instructions\.md$/i, "").replace(/\.prompt\.md$/i, "").replace(/\.agent\.md$/i, "").replace(/\.md$/i, "");
@@ -770,10 +1183,12 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             const query = this.searchQuery.toLowerCase();
             matchedItems = [];
             for (const item of this.allItems) {
-                const nameMatches = matchesContiguousSubString(query, item.name);
+                const displayName = item.displayName ?? formatDisplayName(item.name);
+                const nameMatches = matchesContiguousSubString(query, displayName);
                 const descriptionMatches = item.description ? matchesContiguousSubString(query, item.description) : null;
                 const filenameMatches = matchesContiguousSubString(query, item.filename);
-                if (nameMatches || descriptionMatches || filenameMatches) {
+                const badgeMatches = item.badge ? matchesContiguousSubString(query, item.badge) : null;
+                if (nameMatches || descriptionMatches || filenameMatches || badgeMatches) {
                     matchedItems.push({
                         ...item,
                         nameMatches: nameMatches || undefined,
@@ -784,41 +1199,71 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         }
         const promptType = sectionToPromptType(this.currentSection);
         const visibleSources = ( new Set(this.workspaceService.getStorageSourceFilter(promptType).sources));
-        const groups = [{
+        const groups = this.currentSection === AICustomizationManagementSection.Instructions ? [{
+            groupKey: "agent-instructions",
+            label: ( localize(5304, "Agent Instructions")),
+            icon: instructionsIcon,
+            description: ( localize(
+                5305,
+                "Instruction files automatically loaded for all agent interactions (e.g. AGENTS.md, CLAUDE.md, copilot-instructions.md)."
+            )),
+            items: []
+        }, {
+            groupKey: "context-instructions",
+            label: ( localize(5306, "Included Based on Context")),
+            icon: instructionsIcon,
+            description: ( localize(
+                5307,
+                "Instructions automatically loaded when matching files are part of the context."
+            )),
+            items: []
+        }, {
+            groupKey: "on-demand-instructions",
+            label: ( localize(5308, "Loaded on Demand")),
+            icon: instructionsIcon,
+            description: ( localize(5309, "Instructions loaded only when explicitly referenced.")),
+            items: []
+        }] : [{
             groupKey: PromptsStorage.local,
-            label: ( localize(5256, "Workspace")),
+            label: ( localize(5310, "Workspace")),
             icon: workspaceIcon,
             description: ( localize(
-                5257,
+                5311,
                 "Customizations stored as files in your project folder and shared with your team via version control."
             )),
             items: []
         }, {
             groupKey: PromptsStorage.user,
-            label: ( localize(5258, "User")),
+            label: ( localize(5312, "User")),
             icon: userIcon,
             description: ( localize(
-                5259,
+                5313,
                 "Customizations stored locally on your machine in a central location. Private to you and available across all projects."
             )),
             items: []
+        }, {
+            groupKey: PromptsStorage.plugin,
+            label: ( localize(5314, "Plugins")),
+            icon: pluginIcon,
+            description: ( localize(5315, "Read-only customizations provided by installed plugins.")),
+            items: []
         }, {
             groupKey: PromptsStorage.extension,
-            label: ( localize(5260, "Extensions")),
+            label: ( localize(5316, "Extensions")),
             icon: extensionIcon,
-            description: ( localize(5261, "Read-only customizations provided by installed extensions.")),
+            description: ( localize(5317, "Read-only customizations provided by installed extensions.")),
             items: []
         }, {
-            groupKey: PromptsStorage.plugin,
-            label: ( localize(5262, "Plugins")),
-            icon: pluginIcon,
-            description: ( localize(5263, "Read-only customizations provided by installed plugins.")),
+            groupKey: BUILTIN_STORAGE,
+            label: ( localize(5318, "Built-in")),
+            icon: builtinIcon,
+            description: ( localize(5319, "Built-in customizations shipped with the application.")),
             items: []
         }, {
             groupKey: "agents",
-            label: ( localize(5264, "Agents")),
+            label: ( localize(5320, "Agents")),
             icon: agentIcon,
-            description: ( localize(5265, "Hooks defined in agent files.")),
+            description: ( localize(5321, "Hooks defined in agent files.")),
             items: []
         }].filter(g => ( visibleSources.has(g.groupKey)) || g.groupKey === "agents");
         for (const item of matchedItems) {
@@ -861,6 +1306,7 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         }
         this.list.splice(0, this.list.length, this.displayEntries);
         this.updateEmptyState();
+        return matchedItems.length;
     }
     toggleGroup(entry) {
         if (( this.collapsedGroups.has(entry.groupKey))) {
@@ -879,8 +1325,8 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             const sectionIcon = this.getSectionIcon();
             this.emptyStateIcon.classList.add(...ThemeIcon.asClassNameArray(sectionIcon));
             if (this.searchQuery.trim()) {
-                this.emptyStateText.textContent = ( localize(5266, "No items match '{0}'", this.searchQuery));
-                this.emptyStateSubtext.textContent = ( localize(5267, "Try a different search term"));
+                this.emptyStateText.textContent = ( localize(5322, "No items match '{0}'", this.searchQuery));
+                this.emptyStateSubtext.textContent = ( localize(5323, "Try a different search term"));
             } else {
                 const emptyInfo = this.getEmptyStateInfo();
                 this.emptyStateText.textContent = emptyInfo.title;
@@ -906,33 +1352,41 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             return promptIcon;
         }
     }
+    findPluginUri(itemUri) {
+        for (const plugin of this.agentPluginService.plugins.get()) {
+            if (isEqualOrParent(itemUri, plugin.uri)) {
+                return plugin.uri;
+            }
+        }
+        return undefined;
+    }
     getEmptyStateInfo() {
         switch (this.currentSection) {
         case AICustomizationManagementSection.Agents:
             return {
-                title: ( localize(5268, "No agents yet")),
-                description: ( localize(5269, "Create your first custom agent to get started"))
+                title: ( localize(5324, "No agents yet")),
+                description: ( localize(5325, "Create your first custom agent to get started"))
             };
         case AICustomizationManagementSection.Skills:
             return {
-                title: ( localize(5270, "No skills yet")),
-                description: ( localize(5271, "Create your first skill to extend agent capabilities"))
+                title: ( localize(5326, "No skills yet")),
+                description: ( localize(5327, "Create your first skill to extend agent capabilities"))
             };
         case AICustomizationManagementSection.Instructions:
             return {
-                title: ( localize(5272, "No instructions yet")),
-                description: ( localize(5273, "Add instructions to teach Copilot about your codebase"))
+                title: ( localize(5328, "No instructions yet")),
+                description: ( localize(5329, "Add instructions to teach Copilot about your codebase"))
             };
         case AICustomizationManagementSection.Hooks:
             return {
-                title: ( localize(5274, "No hooks yet")),
-                description: ( localize(5275, "Create hooks to execute commands at agent lifecycle events"))
+                title: ( localize(5330, "No hooks yet")),
+                description: ( localize(5331, "Create hooks to execute commands at agent lifecycle events"))
             };
         case AICustomizationManagementSection.Prompts:
         default:
             return {
-                title: ( localize(5276, "No prompts yet")),
-                description: ( localize(5277, "Create reusable prompts for common tasks"))
+                title: ( localize(5332, "No prompts yet")),
+                description: ( localize(5333, "Create reusable prompts for common tasks"))
             };
         }
     }
@@ -982,6 +1436,6 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         });
     }
 };
-AICustomizationListWidget = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IPromptsService)), ( __param(2, IContextViewService)), ( __param(3, IOpenerService)), ( __param(4, IContextMenuService)), ( __param(5, IMenuService)), ( __param(6, IContextKeyService)), ( __param(7, IWorkspaceContextService)), ( __param(8, ILabelService)), ( __param(9, IAICustomizationWorkspaceService)), ( __param(10, IClipboardService)), ( __param(11, IHoverService)), ( __param(12, IFileService)), ( __param(13, IPathService))], AICustomizationListWidget));
+AICustomizationListWidget = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IPromptsService)), ( __param(2, IContextViewService)), ( __param(3, IOpenerService)), ( __param(4, IContextMenuService)), ( __param(5, IMenuService)), ( __param(6, IContextKeyService)), ( __param(7, IWorkspaceContextService)), ( __param(8, ILabelService)), ( __param(9, IAICustomizationWorkspaceService)), ( __param(10, IClipboardService)), ( __param(11, IHoverService)), ( __param(12, IFileService)), ( __param(13, IPathService)), ( __param(14, ITelemetryService)), ( __param(15, ICustomizationHarnessService)), ( __param(16, IAgentPluginService)), ( __param(17, ICommandService)), ( __param(18, IProductService))], AICustomizationListWidget));
 
-export { AICustomizationListWidget, sectionToPromptType };
+export { AICustomizationListWidget, formatDisplayName, sectionToPromptType };