@codingame/monaco-vscode-chat-service-override 29.1.0 → 30.0.0

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

@@ -4,11 +4,11 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 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 { DisposableStore, Disposable, MutableDisposable } 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 { isEqual, basename, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { basename, isEqual, 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';
@@ -20,7 +20,7 @@ import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 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 { 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 { AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_ITEM_DISABLED_KEY, AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, AICustomizationManagementItemMenuId, AICustomizationManagementCreateMenuId } 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';
@@ -30,6 +30,7 @@ import { HighlightedLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/br
 import { matchesContiguousSubString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { Button, ButtonWithDropdown } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 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 { createActionViewItem, getContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
@@ -55,11 +56,12 @@ 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 { AGENT_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, getCleanPromptName, isInClaudeRulesFolder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(aiCustomizationManagement);
@@ -161,7 +163,16 @@ function storageToIcon(storage) {
     }
 }
 function formatDisplayName(name) {
-    return name.replace(/\.md$/i, "").replace(/[-_]/g, " ").replace(/\b\w/g, c => c.toUpperCase());
+    return name.replace(/\.md$/i, "");
+}
+const AGENT_INSTRUCTION_FILENAMES = ( new Set([
+    AGENT_MD_FILENAME.toLowerCase(),
+    CLAUDE_MD_FILENAME.toLowerCase(),
+    CLAUDE_LOCAL_MD_FILENAME.toLowerCase(),
+    COPILOT_CUSTOM_INSTRUCTIONS_FILENAME.toLowerCase()
+]));
+function isAgentInstructionFile(uri) {
+    return ( AGENT_INSTRUCTION_FILENAMES.has(basename(uri).toLowerCase()));
 }
 let AICustomizationItemRenderer = class AICustomizationItemRenderer {
     constructor(
@@ -215,16 +226,24 @@ let AICustomizationItemRenderer = class AICustomizationItemRenderer {
             ...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}`;
+            let content;
+            if (element.isBuiltin) {
+                content = `${element.name}\n${( localize(5301, "Built-in"))}`;
+            } else if (element.extensionLabel) {
+                content = `${element.name}\n${( localize(5302, "Extension: {0}", element.extensionLabel))}`;
+            } else {
+                const isWorkspaceItem = element.storage === PromptsStorage.local;
+                const uriLabel = this.labelService.getUriLabel(element.uri, {
+                    relative: isWorkspaceItem
+                });
+                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))}`;
+                content += `\n${( localize(5303, "Plugin: {0}", plugin.label))}`;
             }
             return {
                 content,
@@ -287,10 +306,12 @@ let AICustomizationItemRenderer = class AICustomizationItemRenderer {
         };
         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.storage) {
+            overlayPairs.push([AI_CUSTOMIZATION_ITEM_STORAGE_KEY, element.storage]);
+        }
         if (element.pluginUri) {
             overlayPairs.push([AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, ( element.pluginUri.toString())]);
         }
@@ -355,7 +376,8 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         harnessService,
         agentPluginService,
         commandService,
-        productService
+        productService,
+        userDataProfileService
     ) {
         super();
         this.instantiationService = instantiationService;
@@ -377,6 +399,7 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         this.agentPluginService = agentPluginService;
         this.commandService = commandService;
         this.productService = productService;
+        this.userDataProfileService = userDataProfileService;
         this.currentSection = AICustomizationManagementSection.Agents;
         this.allItems = [];
         this.displayEntries = [];
@@ -407,12 +430,26 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             this.updateAddButton();
             this.refresh();
         }));
+        this._register(autorun(reader => {
+            this.harnessService.availableHarnesses.read(reader);
+            this.refresh();
+        }));
+        const providerChangeDisposable = this._register(( new MutableDisposable()));
+        this._register(autorun(reader => {
+            this.harnessService.activeHarness.read(reader);
+            const activeDescriptor = this.harnessService.getActiveDescriptor();
+            if (activeDescriptor.itemProvider) {
+                providerChangeDisposable.value = activeDescriptor.itemProvider.onDidChange(() => this.refresh());
+            } else {
+                providerChangeDisposable.clear();
+            }
+        }));
     }
     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(5275, "Type to search...")),
+            placeholder: ( localize(5304, "Type to search...")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this._register(this.searchInput.onDidChange(() => {
@@ -467,17 +504,17 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     getAriaLabel: entry => {
                         if (entry.type === "group-header") {
                             return localize(
-                                5276,
+                                5305,
                                 "{0}, {1} items, {2}",
                                 entry.label,
                                 entry.count,
-                                entry.collapsed ? ( localize(5277, "collapsed")) : ( localize(5278, "expanded"))
+                                entry.collapsed ? ( localize(5306, "collapsed")) : ( localize(5307, "expanded"))
                             );
                         }
-                        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;
+                        const nameAndDesc = entry.item.description ? ( localize(5308, "{0}, {1}", entry.item.name, entry.item.description)) : entry.item.name;
+                        return entry.item.disabled ? ( localize(5309, "{0}, disabled", nameAndDesc)) : nameAndDesc;
                     },
-                    getWidgetAriaLabel: () => ( localize(5281, "Chat Customizations"))
+                    getWidgetAriaLabel: () => ( localize(5310, "Chat Customizations"))
                 },
                 keyboardNavigationLabelProvider: {
                     getKeyboardNavigationLabel: entry => entry.type === "group-header" ? entry.label : entry.item.name
@@ -530,10 +567,12 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         };
         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.storage) {
+            overlayPairs.push([AI_CUSTOMIZATION_ITEM_STORAGE_KEY, item.storage]);
+        }
         if (item.pluginUri) {
             overlayPairs.push([AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, ( item.pluginUri.toString())]);
         }
@@ -545,9 +584,9 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         const {
             secondary
         } = getContextMenuActions(actions, "inline");
-        const copyActions = [( new Separator()), ( new Action("copyFullPath", ( localize(5282, "Copy Full Path")), undefined, true, async () => {
+        const copyActions = item.isBuiltin ? [] : [( new Separator()), ( new Action("copyFullPath", ( localize(5311, "Copy Full Path")), undefined, true, async () => {
             await this.clipboardService.writeText(item.uri.fsPath);
-        })), ( new Action("copyRelativePath", ( localize(5283, "Copy Relative Path")), undefined, true, async () => {
+        })), ( new Action("copyRelativePath", ( localize(5312, "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);
@@ -567,8 +606,8 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
     async setSection(section) {
         this.currentSection = section;
         this.updateSectionHeader();
-        this.updateAddButton();
         await this.loadItems();
+        this.updateAddButton();
     }
     updateSectionHeader() {
         let description;
@@ -577,41 +616,41 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         switch (this.currentSection) {
         case AICustomizationManagementSection.Agents:
             description = ( localize(
-                5284,
+                5313,
                 "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(5285, "Learn more about custom agents"));
+            learnMoreLabel = ( localize(5314, "Learn more about custom agents"));
             break;
         case AICustomizationManagementSection.Skills:
             description = ( localize(
-                5286,
+                5315,
                 "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(5287, "Learn more about agent skills"));
+            learnMoreLabel = ( localize(5316, "Learn more about agent skills"));
             break;
         case AICustomizationManagementSection.Instructions:
             description = ( localize(
-                5288,
+                5317,
                 "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(5289, "Learn more about custom instructions"));
+            learnMoreLabel = ( localize(5318, "Learn more about custom instructions"));
             break;
         case AICustomizationManagementSection.Hooks:
-            description = ( localize(5290, "Prompts executed at specific points during an agentic lifecycle."));
+            description = ( localize(5319, "Prompts executed at specific points during an agentic lifecycle."));
             docsUrl = "https://code.visualstudio.com/docs/copilot/customization/hooks";
-            learnMoreLabel = ( localize(5291, "Learn more about hooks"));
+            learnMoreLabel = ( localize(5320, "Learn more about hooks"));
             break;
         case AICustomizationManagementSection.Prompts:
         default:
             description = ( localize(
-                5292,
+                5321,
                 "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(5293, "Learn more about prompt files"));
+            learnMoreLabel = ( localize(5322, "Learn more about prompt files"));
             break;
         }
         this.sectionDescription.textContent = description;
@@ -696,7 +735,7 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                 actions.push({
                     label: `$(${Codicon.add.id}) New ${typeLabel} (Workspace)`,
                     enabled: hasWorkspace,
-                    tooltip: hasWorkspace ? undefined : ( localize(5294, "Open a workspace folder to create customizations.")),
+                    tooltip: hasWorkspace ? undefined : ( localize(5323, "Open a workspace folder to create customizations.")),
                     run: () => {
                         this._onDidRequestCreateManual.fire({
                             type: promptType,
@@ -781,6 +820,27 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                 });
             }
         }
+        const menuActions = this.menuService.getMenuActions(AICustomizationManagementCreateMenuId, this.contextKeyService, {
+            shouldForwardArgs: true
+        });
+        const extensionCreateActions = [];
+        for (const [, group] of menuActions) {
+            for (const menuItem of group) {
+                if (menuItem instanceof MenuItemAction) {
+                    const icon = ThemeIcon.isThemeIcon(menuItem.item.icon) ? menuItem.item.icon.id : Codicon.add.id;
+                    extensionCreateActions.push({
+                        label: `$(${icon}) ${typeof menuItem.item.title === "string" ? menuItem.item.title : menuItem.item.title.value}`,
+                        enabled: menuItem.enabled,
+                        run: () => {
+                            menuItem.run();
+                        }
+                    });
+                }
+            }
+        }
+        if (extensionCreateActions.length > 0) {
+            return extensionCreateActions;
+        }
         return actions;
     }
     getDropdownActions() {
@@ -800,21 +860,21 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
     getTypeLabel() {
         switch (this.currentSection) {
         case AICustomizationManagementSection.Agents:
-            return localize(5295, "Agent");
+            return localize(5324, "Agent");
         case AICustomizationManagementSection.Skills:
-            return localize(5296, "Skill");
+            return localize(5325, "Skill");
         case AICustomizationManagementSection.Instructions:
-            return localize(5297, "Instructions");
+            return localize(5326, "Instructions");
         case AICustomizationManagementSection.Hooks:
-            return localize(5298, "Hook");
+            return localize(5327, "Hook");
         case AICustomizationManagementSection.Prompts:
         default:
-            return localize(5299, "Prompt");
+            return localize(5328, "Prompt");
         }
     }
     async refresh() {
-        this.updateAddButton();
         await this.loadItems();
+        this.updateAddButton();
     }
     async loadItems() {
         const section = this.currentSection;
@@ -834,34 +894,53 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         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;
-            }
+    applyBuiltinGroupKeys(items, extensionInfoByUri) {
+        return ( items.map(item => {
             if (item.storage !== PromptsStorage.extension) {
-                continue;
+                return item;
             }
-            const extId = extensionIdByUri.get(( item.uri.toString()));
-            const override = this.resolveExtensionGroupKey(extId);
-            if (override) {
-                item.groupKey = override;
+            const extInfo = extensionInfoByUri.get(( item.uri.toString()));
+            if (!extInfo) {
+                return item;
             }
-        }
+            const isBuiltin = this.isChatExtensionItem(extInfo.id);
+            if (isBuiltin) {
+                return {
+                    ...item,
+                    isBuiltin: true,
+                    groupKey: item.groupKey ?? BUILTIN_STORAGE
+                };
+            }
+            return {
+                ...item,
+                extensionLabel: extInfo.displayName || extInfo.id.value
+            };
+        }));
     }
     async fetchItemsForSection(section) {
         const promptType = sectionToPromptType(section);
+        const activeDescriptor = this.harnessService.getActiveDescriptor();
+        if (activeDescriptor.itemProvider && promptType) {
+            const items = await this.fetchItemsFromProvider(activeDescriptor.itemProvider, promptType);
+            if (promptType === PromptsType.instructions) {
+                return this.enrichProviderInstructionItems(items);
+            }
+            return items;
+        }
         const items = [];
         const disabledUris = this.promptsService.getDisabledPromptFiles(promptType);
-        const extensionIdByUri = ( new Map());
+        const extensionInfoByUri = ( new Map());
         if (promptType === PromptsType.agent) {
             const agents = await this.promptsService.getCustomAgents(CancellationToken.None);
+            const allAgentFiles = await this.promptsService.listPromptFiles(PromptsType.agent, CancellationToken.None);
+            for (const file of allAgentFiles) {
+                if (file.extension) {
+                    extensionInfoByUri.set(( file.uri.toString()), {
+                        id: file.extension.identifier,
+                        displayName: file.extension.displayName
+                    });
+                }
+            }
             for (const agent of agents) {
                 const filename = basename(agent.uri);
                 items.push({
@@ -875,8 +954,10 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     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);
+                if (agent.source.storage === PromptsStorage.extension && !( extensionInfoByUri.has(( agent.uri.toString())))) {
+                    extensionInfoByUri.set(( agent.uri.toString()), {
+                        id: agent.source.extensionId
+                    });
                 }
             }
         } else if (promptType === PromptsType.skill) {
@@ -884,14 +965,20 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             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);
+                    extensionInfoByUri.set(( file.uri.toString()), {
+                        id: file.extension.identifier,
+                        displayName: file.extension.displayName
+                    });
                 }
             }
+            const uiIntegrations = this.workspaceService.getSkillUIIntegrations();
             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);
+                const skillFolderName = basename(dirname(skill.uri));
+                const uiTooltip = uiIntegrations.get(skillFolderName);
                 items.push({
                     id: ( skill.uri.toString()),
                     uri: skill.uri,
@@ -901,22 +988,29 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     storage: skill.storage,
                     promptType,
                     pluginUri: skill.storage === PromptsStorage.plugin ? this.findPluginUri(skill.uri) : undefined,
-                    disabled: false
+                    disabled: false,
+                    badge: uiTooltip ? ( localize(5329, "UI Integration")) : undefined,
+                    badgeTooltip: uiTooltip
                 });
             }
             if (disabledUris.size > 0) {
                 for (const file of allSkillFiles) {
                     if (!( seenUris.has(file.uri)) && ( disabledUris.has(file.uri))) {
                         const filename = basename(file.uri);
+                        const disabledName = file.name || basename(dirname(file.uri)) || filename;
+                        const disabledFolderName = basename(dirname(file.uri));
+                        const uiTooltip = uiIntegrations.get(disabledFolderName);
                         items.push({
                             id: ( file.uri.toString()),
                             uri: file.uri,
-                            name: file.name || basename(dirname(file.uri)) || filename,
+                            name: disabledName,
                             filename,
                             description: file.description,
                             storage: file.storage,
                             promptType,
-                            disabled: true
+                            disabled: true,
+                            badge: uiTooltip ? ( localize(5329, "UI Integration")) : undefined,
+                            badgeTooltip: uiTooltip
                         });
                     }
                 }
@@ -940,7 +1034,10 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                     disabled: ( disabledUris.has(command.promptPath.uri))
                 });
                 if (command.promptPath.extension) {
-                    extensionIdByUri.set(( command.promptPath.uri.toString()), command.promptPath.extension.identifier);
+                    extensionInfoByUri.set(( command.promptPath.uri.toString()), {
+                        id: command.promptPath.extension.identifier,
+                        displayName: command.promptPath.extension.displayName
+                    });
                 }
             }
         } else if (promptType === PromptsType.hook) {
@@ -983,7 +1080,7 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                                     uri: hookFile.uri,
                                     name: hookMeta?.label ?? entry.originalId,
                                     filename: basename(hookFile.uri),
-                                    description: truncatedCmd || ( localize(5300, "(unset)")),
+                                    description: truncatedCmd || ( localize(5330, "(unset)")),
                                     storage: hookFile.storage,
                                     promptType,
                                     disabled: ( disabledUris.has(hookFile.uri))
@@ -1025,7 +1122,7 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                             uri: agent.uri,
                             name: hookMeta?.label ?? hookType,
                             filename: basename(agent.uri),
-                            description: `${agent.name}: ${truncatedCmd || ( localize(5300, "(unset)"))}`,
+                            description: `${agent.name}: ${truncatedCmd || ( localize(5330, "(unset)"))}`,
                             storage: agent.source.storage,
                             groupKey: "agents",
                             promptType,
@@ -1039,7 +1136,10 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             const promptFiles = await this.promptsService.listPromptFiles(promptType, CancellationToken.None);
             for (const file of promptFiles) {
                 if (file.extension) {
-                    extensionIdByUri.set(( file.uri.toString()), file.extension.identifier);
+                    extensionInfoByUri.set(( file.uri.toString()), {
+                        id: file.extension.identifier,
+                        displayName: file.extension.displayName
+                    });
                 }
             }
             const agentInstructionFiles = await this.promptsService.listAgentInstructions(CancellationToken.None, undefined);
@@ -1086,57 +1186,22 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                 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))
-                    });
-                }
+                items.push(this.buildInstructionListItem(
+                    item.uri,
+                    item.name || getCleanPromptName(item.uri),
+                    item.description,
+                    item.storage,
+                    parsed?.header,
+                    ( disabledUris.has(item.uri)),
+                    item.storage === PromptsStorage.plugin ? item.pluginUri : undefined
+                ));
             }
         }
-        this.applyBuiltinGroupKeys(items, extensionIdByUri);
+        const groupedItems = this.applyBuiltinGroupKeys(items, extensionInfoByUri);
         const filter = this.workspaceService.getStorageSourceFilter(promptType);
-        const filteredItems = applyStorageSourceFilter(items, filter);
+        const withStorage = groupedItems.filter(item => item.storage !== undefined);
+        const withoutStorage = groupedItems.filter(item => item.storage === undefined);
+        const filteredItems = [...applyStorageSourceFilter(withStorage, filter), ...withoutStorage];
         items.length = 0;
         items.push(...filteredItems);
         const descriptor = this.harnessService.getActiveDescriptor();
@@ -1166,6 +1231,145 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         items.sort((a, b) => a.name.localeCompare(b.name));
         return items;
     }
+    async fetchItemsFromProvider(provider, promptType) {
+        const allItems = await provider.provideChatSessionCustomizations(CancellationToken.None);
+        if (!allItems) {
+            return [];
+        }
+        return ( allItems.filter(item => item.type === promptType).map(item => {
+            const pluginUri = this.findPluginUri(item.uri);
+            const storage = pluginUri ? PromptsStorage.plugin : this.inferStorageFromUri(item.uri);
+            return {
+                id: ( item.uri.toString()),
+                uri: item.uri,
+                name: item.name,
+                filename: basename(item.uri),
+                description: item.description,
+                promptType,
+                disabled: false,
+                groupKey: item.groupKey,
+                badge: item.badge,
+                badgeTooltip: item.badgeTooltip,
+                storage,
+                pluginUri
+            };
+        })).sort((a, b) => a.name.localeCompare(b.name));
+    }
+    async enrichProviderInstructionItems(items) {
+        const result = [];
+        const toParse = items.filter(item => !item.groupKey);
+        const passThrough = items.filter(item => !!item.groupKey);
+        const parseResults = await Promise.all(( toParse.map(async item => {
+            try {
+                const parsed = await this.promptsService.parseNew(item.uri, CancellationToken.None);
+                return {
+                    item,
+                    parsed
+                };
+            } catch {
+                return {
+                    item,
+                    parsed: undefined
+                };
+            }
+        })));
+        for (const {
+            item,
+            parsed
+        } of parseResults) {
+            result.push(this.buildInstructionListItem(
+                item.uri,
+                item.name,
+                item.description,
+                item.storage ?? PromptsStorage.local,
+                parsed?.header,
+                item.disabled,
+                item.pluginUri
+            ));
+        }
+        result.push(...passThrough);
+        result.sort((a, b) => a.name.localeCompare(b.name));
+        return result;
+    }
+    buildInstructionListItem(uri, rawName, rawDescription, storage, header, disabled, pluginUri) {
+        const name = header?.name;
+        const description = header?.description ?? rawDescription;
+        const friendlyName = this.getFriendlyName(name || rawName || getCleanPromptName(uri));
+        const filename = basename(uri);
+        if (isAgentInstructionFile(uri)) {
+            return {
+                id: ( uri.toString()),
+                uri,
+                name: friendlyName,
+                filename: this.labelService.getUriLabel(uri, {
+                    relative: true
+                }),
+                displayName: friendlyName,
+                description,
+                storage,
+                promptType: PromptsType.instructions,
+                typeIcon: storageToIcon(storage),
+                groupKey: "agent-instructions",
+                pluginUri,
+                disabled
+            };
+        }
+        const applyTo = evaluateApplyToPattern(header, isInClaudeRulesFolder(uri));
+        if (applyTo !== undefined) {
+            const badge = applyTo === "**" ? ( localize(5331, "always added")) : applyTo;
+            const badgeTooltip = applyTo === "**" ? ( localize(5332, "This instruction is automatically included in every interaction.")) : ( localize(
+                5333,
+                "This instruction is automatically included when files matching '{0}' are in context.",
+                applyTo
+            ));
+            return {
+                id: ( uri.toString()),
+                uri,
+                name: friendlyName,
+                filename: this.labelService.getUriLabel(uri, {
+                    relative: true
+                }),
+                displayName: friendlyName,
+                badge,
+                badgeTooltip,
+                description,
+                storage,
+                promptType: PromptsType.instructions,
+                typeIcon: storageToIcon(storage),
+                groupKey: "context-instructions",
+                pluginUri,
+                disabled
+            };
+        }
+        return {
+            id: ( uri.toString()),
+            uri,
+            name: friendlyName,
+            filename,
+            displayName: friendlyName,
+            description,
+            storage,
+            promptType: PromptsType.instructions,
+            typeIcon: storageToIcon(storage),
+            groupKey: "on-demand-instructions",
+            pluginUri,
+            disabled
+        };
+    }
+    inferStorageFromUri(uri) {
+        if (this.workspaceContextService.getWorkspaceFolder(uri)) {
+            return PromptsStorage.local;
+        }
+        const activeProjectRoot = this.workspaceService.getActiveProjectRoot();
+        if (activeProjectRoot && isEqualOrParent(uri, activeProjectRoot)) {
+            return PromptsStorage.local;
+        }
+        const promptsHome = this.userDataProfileService.currentProfile.promptsHome;
+        if (isEqualOrParent(uri, promptsHome)) {
+            return PromptsStorage.user;
+        }
+        return PromptsStorage.user;
+    }
     getFriendlyName(filename) {
         let name = filename.replace(/\.instructions\.md$/i, "").replace(/\.prompt\.md$/i, "").replace(/\.agent\.md$/i, "").replace(/\.md$/i, "");
         name = name.replace(/[-_]/g, " ").replace(/\b\w/g, c => c.toUpperCase());
@@ -1197,77 +1401,135 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
                 }
             }
         }
+        const activeDescriptor = this.harnessService.getActiveDescriptor();
+        if (activeDescriptor.itemProvider) {
+            const hasExplicitGroups = ( matchedItems.some(item => item.groupKey !== undefined));
+            if (hasExplicitGroups) {
+                const ungroupedKey = "__ungrouped__";
+                const groupsMap = ( new Map());
+                for (const item of matchedItems) {
+                    const key = item.groupKey ?? ungroupedKey;
+                    let group = groupsMap.get(key);
+                    if (!group) {
+                        group = {
+                            groupKey: key,
+                            label: key === ungroupedKey ? ( localize(5334, "Other")) : key,
+                            icon: this.getSectionIcon(),
+                            description: "",
+                            items: []
+                        };
+                        groupsMap.set(key, group);
+                    }
+                    group.items.push(item);
+                }
+                const groups = Array.from(( groupsMap.values()));
+                for (const group of groups) {
+                    group.items.sort((a, b) => a.name.localeCompare(b.name));
+                }
+                this.displayEntries = [];
+                let isFirstGroup = true;
+                for (const group of groups) {
+                    if (group.items.length === 0) {
+                        continue;
+                    }
+                    const collapsed = ( this.collapsedGroups.has(group.groupKey));
+                    this.displayEntries.push({
+                        type: "group-header",
+                        id: `group-${group.groupKey}`,
+                        groupKey: group.groupKey,
+                        label: group.label,
+                        icon: group.icon,
+                        count: group.items.length,
+                        isFirst: isFirstGroup,
+                        description: group.description,
+                        collapsed
+                    });
+                    isFirstGroup = false;
+                    if (!collapsed) {
+                        for (const item of group.items) {
+                            this.displayEntries.push({
+                                type: "file-item",
+                                item
+                            });
+                        }
+                    }
+                }
+                this.list.splice(0, this.list.length, this.displayEntries);
+                this.updateEmptyState();
+                return matchedItems.length;
+            }
+        }
         const promptType = sectionToPromptType(this.currentSection);
         const visibleSources = ( new Set(this.workspaceService.getStorageSourceFilter(promptType).sources));
         const groups = this.currentSection === AICustomizationManagementSection.Instructions ? [{
             groupKey: "agent-instructions",
-            label: ( localize(5304, "Agent Instructions")),
+            label: ( localize(5335, "Agent Instructions")),
             icon: instructionsIcon,
             description: ( localize(
-                5305,
+                5336,
                 "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")),
+            label: ( localize(5337, "Included Based on Context")),
             icon: instructionsIcon,
             description: ( localize(
-                5307,
+                5338,
                 "Instructions automatically loaded when matching files are part of the context."
             )),
             items: []
         }, {
             groupKey: "on-demand-instructions",
-            label: ( localize(5308, "Loaded on Demand")),
+            label: ( localize(5339, "Loaded on Demand")),
             icon: instructionsIcon,
-            description: ( localize(5309, "Instructions loaded only when explicitly referenced.")),
+            description: ( localize(5340, "Instructions loaded only when explicitly referenced.")),
             items: []
         }] : [{
             groupKey: PromptsStorage.local,
-            label: ( localize(5310, "Workspace")),
+            label: ( localize(5341, "Workspace")),
             icon: workspaceIcon,
             description: ( localize(
-                5311,
+                5342,
                 "Customizations stored as files in your project folder and shared with your team via version control."
             )),
             items: []
         }, {
             groupKey: PromptsStorage.user,
-            label: ( localize(5312, "User")),
+            label: ( localize(5343, "User")),
             icon: userIcon,
             description: ( localize(
-                5313,
+                5344,
                 "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")),
+            label: ( localize(5345, "Plugins")),
             icon: pluginIcon,
-            description: ( localize(5315, "Read-only customizations provided by installed plugins.")),
+            description: ( localize(5346, "Read-only customizations provided by installed plugins.")),
             items: []
         }, {
             groupKey: PromptsStorage.extension,
-            label: ( localize(5316, "Extensions")),
+            label: ( localize(5347, "Extensions")),
             icon: extensionIcon,
-            description: ( localize(5317, "Read-only customizations provided by installed extensions.")),
+            description: ( localize(5348, "Read-only customizations provided by installed extensions.")),
             items: []
         }, {
             groupKey: BUILTIN_STORAGE,
-            label: ( localize(5318, "Built-in")),
+            label: ( localize(5349, "Built-in")),
             icon: builtinIcon,
-            description: ( localize(5319, "Built-in customizations shipped with the application.")),
+            description: ( localize(5350, "Built-in customizations shipped with the application.")),
             items: []
         }, {
             groupKey: "agents",
-            label: ( localize(5320, "Agents")),
+            label: ( localize(5351, "Agents")),
             icon: agentIcon,
-            description: ( localize(5321, "Hooks defined in agent files.")),
+            description: ( localize(5352, "Hooks defined in agent files.")),
             items: []
         }].filter(g => ( visibleSources.has(g.groupKey)) || g.groupKey === "agents");
         for (const item of matchedItems) {
-            const key = item.groupKey ?? item.storage;
+            const key = item.groupKey ?? item.storage ?? PromptsStorage.local;
             const group = groups.find(g => g.groupKey === key);
             if (group) {
                 group.items.push(item);
@@ -1325,8 +1587,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(5322, "No items match '{0}'", this.searchQuery));
-                this.emptyStateSubtext.textContent = ( localize(5323, "Try a different search term"));
+                this.emptyStateText.textContent = ( localize(5353, "No items match '{0}'", this.searchQuery));
+                this.emptyStateSubtext.textContent = ( localize(5354, "Try a different search term"));
             } else {
                 const emptyInfo = this.getEmptyStateInfo();
                 this.emptyStateText.textContent = emptyInfo.title;
@@ -1364,29 +1626,29 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
         switch (this.currentSection) {
         case AICustomizationManagementSection.Agents:
             return {
-                title: ( localize(5324, "No agents yet")),
-                description: ( localize(5325, "Create your first custom agent to get started"))
+                title: ( localize(5355, "No agents yet")),
+                description: ( localize(5356, "Create your first custom agent to get started"))
             };
         case AICustomizationManagementSection.Skills:
             return {
-                title: ( localize(5326, "No skills yet")),
-                description: ( localize(5327, "Create your first skill to extend agent capabilities"))
+                title: ( localize(5357, "No skills yet")),
+                description: ( localize(5358, "Create your first skill to extend agent capabilities"))
             };
         case AICustomizationManagementSection.Instructions:
             return {
-                title: ( localize(5328, "No instructions yet")),
-                description: ( localize(5329, "Add instructions to teach Copilot about your codebase"))
+                title: ( localize(5359, "No instructions yet")),
+                description: ( localize(5360, "Add instructions to teach Copilot about your codebase"))
             };
         case AICustomizationManagementSection.Hooks:
             return {
-                title: ( localize(5330, "No hooks yet")),
-                description: ( localize(5331, "Create hooks to execute commands at agent lifecycle events"))
+                title: ( localize(5361, "No hooks yet")),
+                description: ( localize(5362, "Create hooks to execute commands at agent lifecycle events"))
             };
         case AICustomizationManagementSection.Prompts:
         default:
             return {
-                title: ( localize(5332, "No prompts yet")),
-                description: ( localize(5333, "Create reusable prompts for common tasks"))
+                title: ( localize(5363, "No prompts yet")),
+                description: ( localize(5364, "Create reusable prompts for common tasks"))
             };
         }
     }
@@ -1405,37 +1667,35 @@ let AICustomizationListWidget = class AICustomizationListWidget extends Disposab
             this.list.setFocus([0]);
         }
     }
+    revealLastItem() {
+        if (this.displayEntries.length > 0) {
+            this.list.reveal(this.displayEntries.length - 1);
+        }
+    }
     layout(height, width) {
-        const sectionFooterHeight = this.sectionHeader.offsetHeight || 0;
-        const searchBarHeight = this.searchAndButtonContainer.offsetHeight || 52;
-        const listHeight = height - sectionFooterHeight - searchBarHeight;
+        this.element.style.height = `${height}px`;
         this.searchInput.layout();
-        this.listContainer.style.height = `${Math.max(0, listHeight)}px`;
-        this.list.layout(Math.max(0, listHeight), width);
-        if (sectionFooterHeight === 0) {
-            getWindow(this.listContainer).requestAnimationFrame(() => {
-                if (this._store.isDisposed) {
-                    return;
-                }
-                const actualFooterHeight = this.sectionHeader.offsetHeight;
-                if (actualFooterHeight > 0) {
-                    const correctedHeight = height - actualFooterHeight - searchBarHeight;
-                    this.listContainer.style.height = `${Math.max(0, correctedHeight)}px`;
-                    this.list.layout(Math.max(0, correctedHeight), width);
-                }
-            });
+        const searchBarHeight = this.searchAndButtonContainer.offsetHeight;
+        if (searchBarHeight === 0) {
+            getWindow(this.element).requestAnimationFrame(() => this.layout(height, width));
+            return;
         }
+        const footerHeight = this.sectionHeader.offsetHeight;
+        const listHeight = Math.max(0, height - searchBarHeight - footerHeight);
+        this.listContainer.style.height = `${listHeight}px`;
+        this.list.layout(listHeight, width);
     }
     get itemCount() {
         return this.allItems.length;
     }
     async generateDebugReport() {
+        const activeDescriptor = this.harnessService.getActiveDescriptor();
         return generateCustomizationDebugReport(this.currentSection, this.promptsService, this.workspaceService, {
             allItems: this.allItems,
             displayEntries: this.displayEntries
-        });
+        }, activeDescriptor.itemProvider);
     }
 };
-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));
+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)), ( __param(19, IUserDataProfileService))], AICustomizationListWidget));
 
 export { AICustomizationListWidget, formatDisplayName, sectionToPromptType };