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

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js

@@ -7,7 +7,7 @@ import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { isEqual, dirname, joinPath, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isEqual, dirname, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { OffsetRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/offsetRange';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
@@ -25,7 +25,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_CONFIG_FOLDER, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, PromptFileSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_CONFIG_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, GITHUB_CONFIG_FOLDER, getSkillFolderName, PromptFileSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptsType, PROMPT_LANGUAGE_ID, Target, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
@@ -43,7 +43,9 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { getCanonicalPluginCommandId } from '../../plugins/agentPluginService.js';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
+import { isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { ChatInternalCustomizations } from '../internalCustomizations/internalCustomizations.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 class SkillMissingNameError extends Error {
@@ -126,6 +128,7 @@ let PromptsService = class PromptsService extends Disposable {
         this.promptFileProviders = [];
         this.disabledPromptsStorageKeyPrefix = "chat.disabledPromptFiles.";
         this.fileLocator = this.createPromptFilesLocator();
+        this.internalCustomizations = this._register(( new ChatInternalCustomizations(this.fileService)));
         this._register(this.modelService.onModelRemoved(model => {
             this.cachedParsedPromptFromModels.delete(model.uri);
         }));
@@ -145,7 +148,8 @@ let PromptsService = class PromptsService extends Disposable {
             Event.filter(
                 this.configurationService.onDidChangeConfiguration,
                 e => e.affectsConfiguration(PromptsConfig.USE_CUSTOM_AGENT_HOOKS)
-            )
+            ),
+            this._onDidPluginPromptFilesChange.event
         ))));
         this.cachedSlashCommands = this._register(( new CachedPromise(token => this.computePromptSlashCommands(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.prompt),
@@ -179,11 +183,28 @@ let PromptsService = class PromptsService extends Disposable {
         this._register(
             this.watchPluginPromptFilesForType(PromptsType.agent, (plugin, reader) => plugin.agents.read(reader))
         );
+        this._register(this.watchPluginPromptFilesForType(
+            PromptsType.instructions,
+            (plugin, reader) => plugin.instructions.read(reader)
+        ));
         this._register(autorun(reader => {
             const plugins = this.agentPluginService.plugins.read(reader);
+            const hookFiles = [];
             for (const plugin of plugins) {
-                plugin.hooks.read(reader);
+                if (isContributionEnabled(plugin.enablement.read(reader))) {
+                    for (const hook of plugin.hooks.read(reader)) {
+                        hookFiles.push({
+                            uri: hook.uri,
+                            storage: PromptsStorage.plugin,
+                            type: PromptsType.hook,
+                            name: getCanonicalPluginCommandId(plugin, hook.originalId),
+                            pluginUri: plugin.uri
+                        });
+                    }
+                }
             }
+            this._pluginPromptFilesByType.set(PromptsType.hook, hookFiles);
+            this.cachedFileLocations[PromptsType.hook] = undefined;
             this._onDidPluginHooksChange.fire();
         }));
     }
@@ -192,6 +213,9 @@ let PromptsService = class PromptsService extends Disposable {
             const plugins = this.agentPluginService.plugins.read(reader);
             const nextFiles = [];
             for (const plugin of plugins) {
+                if (!isContributionEnabled(plugin.enablement.read(reader))) {
+                    continue;
+                }
                 for (const item of getItems(plugin, reader)) {
                     nextFiles.push({
                         uri: item.uri,
@@ -259,37 +283,14 @@ let PromptsService = class PromptsService extends Disposable {
             this.getExtensionPromptFiles(type, token),
             this._pluginPromptFilesByType.get(type) ?? []
         ]);
-        return [...prompts.flat()];
+        return [...prompts.flat(), ...this.internalCustomizations.getPromptPaths(type)];
     }
-    async _collectSourceFolderDiagnostics(type, foundFiles) {
+    async _collectSourceFolderDiagnostics(type) {
         const resolvedFolders = await this.fileLocator.getSourceFoldersInDiscoveryOrder(type);
-        const results = [];
-        for (const folder of resolvedFolders) {
-            const fileCount = foundFiles.filter(f => f.uri.path.startsWith(folder.uri.path + "/")).length;
-            let exists = fileCount > 0;
-            let errorMessage;
-            if (!exists) {
-                try {
-                    const stat = await this.fileService.stat(folder.uri);
-                    exists = stat.isDirectory;
-                } catch (e) {
-                    if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
-                        exists = false;
-                    } else {
-                        exists = false;
-                        errorMessage = e instanceof Error ? e.message : String(e);
-                    }
-                }
-            }
-            results.push({
-                uri: folder.uri,
-                storage: folder.storage,
-                exists,
-                fileCount,
-                errorMessage
-            });
-        }
-        return results;
+        return ( resolvedFolders.map(folder => ({
+            uri: folder.uri,
+            storage: folder.storage
+        })));
     }
     registerPromptFileProvider(extension, type, provider) {
         const providerEntry = {
@@ -389,6 +390,8 @@ let PromptsService = class PromptsService extends Disposable {
             }))));
         case PromptsStorage.plugin:
             return this._pluginPromptFilesByType.get(type) ?? [];
+        case PromptsStorage.internal:
+            return this.internalCustomizations.getPromptPaths(type);
         default:
             throw ( new Error(`[listPromptFilesForStorage] Unsupported prompt storage type: ${storage}`));
         }
@@ -467,13 +470,39 @@ let PromptsService = class PromptsService extends Disposable {
         return this.cachedSlashCommands.onDidChange;
     }
     async getPromptSlashCommands(token, sessionResource) {
-        return await this.cachedSlashCommands.get(token);
+        const sw = StopWatch.create();
+        const result = await this.cachedSlashCommands.get(token);
+        if (sessionResource) {
+            const elapsed = sw.elapsed();
+            void this.getPromptSlashCommandDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
+                const details = result.length === 1 ? ( localize(
+                    7555,
+                    "Resolved {0} slash command in {1}ms",
+                    result.length,
+                    elapsed.toFixed(1)
+                )) : ( localize(
+                    7556,
+                    "Resolved {0} slash commands in {1}ms",
+                    result.length,
+                    elapsed.toFixed(1)
+                ));
+                this._onDidLogDiscovery.fire({
+                    sessionResource,
+                    name: ( localize(7557, "Load Slash Commands")),
+                    details,
+                    discoveryInfo,
+                    category: "discovery"
+                });
+            });
+        }
+        return result;
     }
     async computePromptSlashCommands(token) {
         const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
         const skills = useAgentSkills ? await this.listPromptFiles(PromptsType.skill, token) : [];
-        const slashCommandFiles = [...promptFiles, ...skills];
+        const disabledSkills = this.getDisabledPromptFiles(PromptsType.skill);
+        const slashCommandFiles = [...promptFiles, ...skills.filter(s => !( disabledSkills.has(s.uri)))];
         const details = await Promise.all(( slashCommandFiles.map(async promptPath => {
             try {
                 const parsedPromptFile = await this.parseNew(promptPath.uri, token);
@@ -516,12 +545,14 @@ let PromptsService = class PromptsService extends Disposable {
     asChatPromptSlashCommand(parsedPromptFile, promptPath) {
         let name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
         name = name.replace(/[^\p{L}\d_\-\.:]+/gu, "-");
+        const internalSkill = this.internalCustomizations.getInternalSkillByUri(promptPath.uri);
         return {
             name: name,
             description: parsedPromptFile?.header?.description ?? promptPath.description,
             argumentHint: parsedPromptFile?.header?.argumentHint,
             parsedPromptFile,
-            promptPath
+            promptPath,
+            when: internalSkill?.when
         };
     }
     async getPromptSlashCommandName(uri, token) {
@@ -539,7 +570,8 @@ let PromptsService = class PromptsService extends Disposable {
         return Event.any(
             this.getFileLocatorEvent(PromptsType.instructions),
             this._onDidContributedWhenChange.event,
-            this._onDidChangeInstructions.event
+            this._onDidChangeInstructions.event,
+            this._onDidPluginPromptFilesChange.event
         );
     }
     async getCustomAgents(token, sessionResource) {
@@ -547,14 +579,15 @@ let PromptsService = class PromptsService extends Disposable {
         const result = await this.cachedCustomAgents.get(token);
         if (sessionResource) {
             const elapsed = sw.elapsed();
-            const discoveryInfo = await this.getAgentDiscoveryInfo(token);
-            const details = result.length === 1 ? ( localize(7327, "Resolved {0} agent in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7328, "Resolved {0} agents in {1}ms", result.length, elapsed.toFixed(1)));
-            this._onDidLogDiscovery.fire({
-                sessionResource,
-                name: ( localize(7329, "Load Agents")),
-                details,
-                discoveryInfo,
-                category: "discovery"
+            void this.getAgentDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
+                const details = result.length === 1 ? ( localize(7558, "Resolved {0} agent in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7559, "Resolved {0} agents in {1}ms", result.length, elapsed.toFixed(1)));
+                this._onDidLogDiscovery.fire({
+                    sessionResource,
+                    name: ( localize(7560, "Load Agents")),
+                    details,
+                    discoveryInfo,
+                    category: "discovery"
+                });
             });
         }
         return result;
@@ -776,17 +809,19 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(7330, "User Data");
+            return localize(7561, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    7331,
+                    7562,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
         case PromptsStorage.plugin:
-            return localize(7332, "Plugin");
+            return localize(7563, "Plugin");
+        case PromptsStorage.internal:
+            return localize(7564, "Built-in");
         default:
             assertNever(promptPath, "Unknown prompt storage type");
         }
@@ -802,62 +837,69 @@ let PromptsService = class PromptsService extends Disposable {
         }
         return [];
     }
-    async listAgentMDs(token, logger) {
+    async listAgentInstructions(token, logger) {
+        const resolvedAgentFiles = [];
+        const promises = [];
+        const includeParents = this.configurationService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true;
+        const rootFolders = await this.fileLocator.getWorkspaceFolderRoots(includeParents, logger);
+        const rootFiles = [];
         const useAgentMD = this.configurationService.getValue(PromptsConfig.USE_AGENT_MD);
         if (!useAgentMD) {
             logger?.logInfo("Agent MD files are disabled via configuration.");
-            return [];
+        } else {
+            rootFiles.push({
+                fileName: AGENT_MD_FILENAME,
+                type: AgentFileType.agentsMd
+            });
         }
-        return await this.fileLocator.findFilesInWorkspaceRoots(AGENT_MD_FILENAME, undefined, AgentFileType.agentsMd, token);
-    }
-    async listClaudeMDs(token, logger) {
         const useClaudeMD = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_MD);
         if (!useClaudeMD) {
             logger?.logInfo("Claude MD files are disabled via configuration.");
-            return [];
+        } else {
+            const claudeMdFile = {
+                fileName: CLAUDE_MD_FILENAME,
+                type: AgentFileType.claudeMd
+            };
+            rootFiles.push(claudeMdFile);
+            rootFiles.push({
+                fileName: CLAUDE_LOCAL_MD_FILENAME,
+                type: AgentFileType.claudeMd
+            });
+            promises.push(this.fileLocator.findFilesInRoots(
+                rootFolders,
+                CLAUDE_CONFIG_FOLDER,
+                [claudeMdFile],
+                token,
+                resolvedAgentFiles
+            ));
+            promises.push(this.fileLocator.findFilesInRoots(
+                [await this.pathService.userHome()],
+                CLAUDE_CONFIG_FOLDER,
+                [claudeMdFile],
+                token,
+                resolvedAgentFiles
+            ));
         }
-        const results = [];
-        const userHome = await this.pathService.userHome();
-        const userClaudeFolder = joinPath(userHome, CLAUDE_CONFIG_FOLDER);
-        await Promise.all([
-        this.fileLocator.findFilesInWorkspaceRoots(CLAUDE_MD_FILENAME, undefined, AgentFileType.claudeMd, token, results),
-        this.fileLocator.findFilesInWorkspaceRoots(
-            CLAUDE_LOCAL_MD_FILENAME,
-            undefined,
-            AgentFileType.claudeMd,
-            token,
-            results
-        ),
-        this.fileLocator.findFilesInWorkspaceRoots(
-            CLAUDE_MD_FILENAME,
-            CLAUDE_CONFIG_FOLDER,
-            AgentFileType.claudeMd,
-            token,
-            results
-        ),
-        this.fileLocator.findFilesInRoots(
-            [userClaudeFolder],
-            CLAUDE_MD_FILENAME,
-            AgentFileType.claudeMd,
-            token,
-            results
-        )]);
-        return results.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
-    }
-    async listCopilotInstructionsMDs(token, logger) {
         const useCopilotInstructionsFiles = this.configurationService.getValue(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES);
         if (!useCopilotInstructionsFiles) {
             logger?.logInfo("Copilot instructions files are disabled via configuration.");
-            return [];
+        } else {
+            const githubConfigFiles = [{
+                fileName: COPILOT_CUSTOM_INSTRUCTIONS_FILENAME,
+                type: AgentFileType.copilotInstructionsMd
+            }];
+            promises.push(this.fileLocator.findFilesInRoots(
+                rootFolders,
+                GITHUB_CONFIG_FOLDER,
+                githubConfigFiles,
+                token,
+                resolvedAgentFiles
+            ));
         }
-        return await this.fileLocator.findCopilotInstructionsMDsInWorkspace(token);
-    }
-    async listAgentInstructions(token, logger) {
-        const [agentMDs, claudeMDs, copilotInstructionsMDs] = await Promise.all([
-            this.listAgentMDs(token, logger),
-            this.listClaudeMDs(token, logger),
-            this.listCopilotInstructionsMDs(token, logger)
-        ]);
+        promises.push(
+            this.fileLocator.findFilesInRoots(rootFolders, undefined, rootFiles, token, resolvedAgentFiles)
+        );
+        await Promise.all(promises);
         if (token.isCancellationRequested) {
             return [];
         }
@@ -873,9 +915,7 @@ let PromptsService = class PromptsService extends Disposable {
             }
             return true;
         };
-        agentMDs.forEach(add);
-        claudeMDs.forEach(add);
-        copilotInstructionsMDs.forEach(add);
+        resolvedAgentFiles.forEach(add);
         for (const symlink of symlinks) {
             if (( seenFileURI.has(symlink.realPath))) {
                 logger?.logInfo(
@@ -886,7 +926,7 @@ let PromptsService = class PromptsService extends Disposable {
                 seenFileURI.add(symlink.realPath);
             }
         }
-        return result;
+        return result.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
     }
     getAgentFileURIFromModeFile(oldURI) {
         return this.fileLocator.getAgentFileURIFromModeFile(oldURI);
@@ -917,6 +957,9 @@ let PromptsService = class PromptsService extends Disposable {
         );
         if (type === PromptsType.agent) {
             this.cachedCustomAgents.refresh();
+        } else if (type === PromptsType.skill) {
+            this.cachedSkills.refresh();
+            this.cachedSlashCommands.refresh();
         }
     }
     sanitizeAgentSkillText(text) {
@@ -939,8 +982,7 @@ let PromptsService = class PromptsService extends Disposable {
             throw ( new SkillMissingDescriptionError(uri));
         }
         const sanitizedName = this.truncateAgentSkillName(name, uri);
-        const skillFolderUri = dirname(uri);
-        const folderName = basename(skillFolderUri);
+        const folderName = getSkillFolderName(uri);
         if (sanitizedName !== folderName) {
             this.logger.error(
                 `[validateAndSanitizeSkillFile] Agent skill name "${sanitizedName}" does not match folder name "${folderName}": ${uri}`
@@ -957,10 +999,10 @@ let PromptsService = class PromptsService extends Disposable {
         const MAX_NAME_LENGTH = 64;
         const sanitized = this.sanitizeAgentSkillText(name);
         if (sanitized !== name) {
-            this.logger.warn(`[findAgentSkills] Agent skill name contains XML tags, removed: ${uri}`);
+            this.logger.debug(`[findAgentSkills] Agent skill name contains XML tags, removed: ${uri}`);
         }
         if (sanitized.length > MAX_NAME_LENGTH) {
-            this.logger.warn(
+            this.logger.debug(
                 `[findAgentSkills] Agent skill name exceeds ${MAX_NAME_LENGTH} characters, truncated: ${uri}`
             );
             return sanitized.substring(0, MAX_NAME_LENGTH);
@@ -974,12 +1016,12 @@ let PromptsService = class PromptsService extends Disposable {
         const MAX_DESCRIPTION_LENGTH = 1024;
         const sanitized = this.sanitizeAgentSkillText(description);
         if (sanitized !== description) {
-            this.logger.warn(
+            this.logger.debug(
                 `[findAgentSkills] Agent skill description contains XML tags, removed: ${uri}`
             );
         }
         if (sanitized.length > MAX_DESCRIPTION_LENGTH) {
-            this.logger.warn(
+            this.logger.debug(
                 `[findAgentSkills] Agent skill description exceeds ${MAX_DESCRIPTION_LENGTH} characters, truncated: ${uri}`
             );
             return sanitized.substring(0, MAX_DESCRIPTION_LENGTH);
@@ -998,14 +1040,15 @@ let PromptsService = class PromptsService extends Disposable {
         const result = await this.cachedSkills.get(token);
         if (sessionResource) {
             const elapsed = sw.elapsed();
-            const discoveryInfo = await this.getSkillDiscoveryInfo(token);
-            const details = result.length === 1 ? ( localize(7333, "Resolved {0} skill in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7334, "Resolved {0} skills in {1}ms", result.length, elapsed.toFixed(1)));
-            this._onDidLogDiscovery.fire({
-                sessionResource,
-                name: ( localize(7335, "Load Skills")),
-                details,
-                discoveryInfo,
-                category: "discovery"
+            void this.getSkillDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
+                const details = result.length === 1 ? ( localize(7565, "Resolved {0} skill in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7566, "Resolved {0} skills in {1}ms", result.length, elapsed.toFixed(1)));
+                this._onDidLogDiscovery.fire({
+                    sessionResource,
+                    name: ( localize(7567, "Load Skills")),
+                    details,
+                    discoveryInfo,
+                    category: "discovery"
+                });
             });
         }
         return result;
@@ -1019,13 +1062,15 @@ let PromptsService = class PromptsService extends Disposable {
         for (const file of files) {
             if (file.status === "loaded" && file.name) {
                 const sanitizedDescription = this.truncateAgentSkillDescription(file.description, file.uri);
+                const internalSkill = this.internalCustomizations.getInternalSkillByUri(file.uri);
                 result.push({
                     uri: file.uri,
                     storage: file.storage,
                     name: file.name,
                     description: sanitizedDescription,
                     disableModelInvocation: file.disableModelInvocation ?? false,
-                    userInvocable: file.userInvocable ?? true
+                    userInvocable: file.userInvocable ?? true,
+                    when: internalSkill?.when
                 });
             }
         }
@@ -1081,15 +1126,16 @@ let PromptsService = class PromptsService extends Disposable {
         const result = await this.cachedHooks.get(token);
         if (sessionResource) {
             const elapsed = sw.elapsed();
-            const hookCount = result ? ( Object.values(result.hooks)).reduce((sum, arr) => sum + arr.length, 0) : 0;
-            const discoveryInfo = await this.getHookDiscoveryInfo(token);
-            const details = hookCount === 1 ? ( localize(7336, "Resolved {0} hook in {1}ms", hookCount, elapsed.toFixed(1))) : ( localize(7337, "Resolved {0} hooks in {1}ms", hookCount, elapsed.toFixed(1)));
-            this._onDidLogDiscovery.fire({
-                sessionResource,
-                name: ( localize(7338, "Load Hooks")),
-                details,
-                discoveryInfo,
-                category: "discovery"
+            void this.getHookDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
+                const hookCount = result ? ( Object.values(result.hooks)).reduce((sum, arr) => sum + arr.length, 0) : 0;
+                const details = hookCount === 1 ? ( localize(7568, "Resolved {0} hook in {1}ms", hookCount, elapsed.toFixed(1))) : ( localize(7569, "Resolved {0} hooks in {1}ms", hookCount, elapsed.toFixed(1)));
+                this._onDidLogDiscovery.fire({
+                    sessionResource,
+                    name: ( localize(7570, "Load Hooks")),
+                    details,
+                    discoveryInfo,
+                    category: "discovery"
+                });
             });
         }
         return result;
@@ -1099,24 +1145,25 @@ let PromptsService = class PromptsService extends Disposable {
         const result = await this.listPromptFiles(PromptsType.instructions, token);
         if (sessionResource) {
             const elapsed = sw.elapsed();
-            const discoveryInfo = await this.getInstructionsDiscoveryInfo(token);
-            const details = result.length === 1 ? ( localize(
-                7339,
-                "Resolved {0} instruction in {1}ms",
-                result.length,
-                elapsed.toFixed(1)
-            )) : ( localize(
-                7340,
-                "Resolved {0} instructions in {1}ms",
-                result.length,
-                elapsed.toFixed(1)
-            ));
-            this._onDidLogDiscovery.fire({
-                sessionResource,
-                name: ( localize(7341, "Load Instructions")),
-                details,
-                discoveryInfo,
-                category: "discovery"
+            void this.getInstructionsDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
+                const details = result.length === 1 ? ( localize(
+                    7571,
+                    "Resolved {0} instruction in {1}ms",
+                    result.length,
+                    elapsed.toFixed(1)
+                )) : ( localize(
+                    7572,
+                    "Resolved {0} instructions in {1}ms",
+                    result.length,
+                    elapsed.toFixed(1)
+                ));
+                this._onDidLogDiscovery.fire({
+                    sessionResource,
+                    name: ( localize(7573, "Load Instructions")),
+                    details,
+                    discoveryInfo,
+                    category: "discovery"
+                });
             });
         }
         return result;
@@ -1189,6 +1236,9 @@ let PromptsService = class PromptsService extends Disposable {
         }
         const plugins = this.agentPluginService.plugins.get();
         for (const plugin of plugins) {
+            if (!isContributionEnabled(plugin.enablement.get())) {
+                continue;
+            }
             for (const hook of plugin.hooks.get()) {
                 let bucket = collectedHooks.get(hook.type);
                 if (!bucket) {
@@ -1209,53 +1259,6 @@ let PromptsService = class PromptsService extends Disposable {
             hasDisabledClaudeHooks
         };
     }
-    async getPromptDiscoveryInfo(type, token, sessionResource) {
-        if (sessionResource) {
-            this._onDidLogDiscovery.fire({
-                sessionResource,
-                name: ( localize(7342, "Discovery {0} (Start)", type)),
-                category: "discovery"
-            });
-        }
-        const files = [];
-        let result;
-        if (type === PromptsType.skill) {
-            result = await this.getSkillDiscoveryInfo(token);
-        } else if (type === PromptsType.agent) {
-            result = await this.getAgentDiscoveryInfo(token);
-        } else if (type === PromptsType.prompt) {
-            result = await this.getPromptSlashCommandDiscoveryInfo(token);
-        } else if (type === PromptsType.instructions) {
-            result = await this.getInstructionsDiscoveryInfo(token);
-        } else if (type === PromptsType.hook) {
-            result = await this.getHookDiscoveryInfo(token);
-        } else {
-            result = {
-                type,
-                files
-            };
-        }
-        const loadedCount = result.files.filter(f => f.status === "loaded").length;
-        const skippedCount = result.files.filter(f => f.status === "skipped").length;
-        if (!result.sourceFolders) {
-            const sourceFolders = await this._collectSourceFolderDiagnostics(type, result.files.filter(f => f.status === "loaded"));
-            result = {
-                ...result,
-                sourceFolders
-            };
-        }
-        if (sessionResource) {
-            const details = ( localize(7343, "{0} loaded, {1} skipped", loadedCount, skippedCount));
-            this._onDidLogDiscovery.fire({
-                sessionResource,
-                name: ( localize(7344, "Discovery {0} (End)", type)),
-                details,
-                discoveryInfo: result,
-                category: "discovery"
-            });
-        }
-        return result;
-    }
     async getSkillDiscoveryInfo(token) {
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
         if (!useAgentSkills) {
@@ -1267,7 +1270,7 @@ let PromptsService = class PromptsService extends Disposable {
                 skipReason: "disabled",
                 extensionId: promptPath.extension?.identifier?.value
             })));
-            const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill, []);
+            const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
             return {
                 type: PromptsType.skill,
                 files,
@@ -1277,7 +1280,7 @@ let PromptsService = class PromptsService extends Disposable {
         const {
             files
         } = await this.computeSkillDiscoveryInfo(token);
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill, files.filter(f => f.status === "loaded"));
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
         return {
             type: PromptsType.skill,
             files,
@@ -1301,6 +1304,10 @@ let PromptsService = class PromptsService extends Disposable {
             fileUri: p.uri,
             storage: p.storage,
             source: PromptFileSource.Plugin
+        }))), ...( this.internalCustomizations.getSkills().map(s => ({
+            fileUri: s.uri,
+            storage: s.storage,
+            source: PromptFileSource.Internal
         }))));
         const getPriority = skill => {
             if (skill.storage === PromptsStorage.local) {
@@ -1332,41 +1339,22 @@ let PromptsService = class PromptsService extends Disposable {
             const extensionId = extensionIdByUri.get(( uri.toString()));
             try {
                 const parsedFile = await this.parseNew(uri, token);
-                const name = parsedFile.header?.name;
+                const folderName = getSkillFolderName(uri);
+                let name = parsedFile.header?.name;
                 if (!name) {
-                    this.logger.error(
-                        `[computeSkillDiscoveryInfo] Agent skill file missing name attribute: ${uri}`
+                    this.logger.debug(
+                        `[computeSkillDiscoveryInfo] Agent skill file missing name attribute, using folder name "${folderName}": ${uri}`
                     );
-                    files.push({
-                        uri,
-                        storage,
-                        status: "skipped",
-                        skipReason: "missing-name",
-                        extensionId,
-                        source
-                    });
-                    continue;
+                    name = folderName;
                 }
                 const sanitizedName = this.truncateAgentSkillName(name, uri);
-                const skillFolderUri = dirname(uri);
-                const folderName = basename(skillFolderUri);
                 if (sanitizedName !== folderName) {
-                    this.logger.error(
-                        `[computeSkillDiscoveryInfo] Agent skill name "${sanitizedName}" does not match folder name "${folderName}": ${uri}`
+                    this.logger.debug(
+                        `[computeSkillDiscoveryInfo] Agent skill name "${sanitizedName}" does not match folder name "${folderName}", using folder name: ${uri}`
                     );
-                    files.push({
-                        uri,
-                        storage,
-                        status: "skipped",
-                        skipReason: "name-mismatch",
-                        name: sanitizedName,
-                        extensionId,
-                        source
-                    });
-                    continue;
                 }
                 if (( seenNames.has(sanitizedName))) {
-                    this.logger.warn(
+                    this.logger.debug(
                         `[computeSkillDiscoveryInfo] Skipping duplicate agent skill name: ${sanitizedName} at ${uri}`
                     );
                     files.push({
@@ -1382,21 +1370,6 @@ let PromptsService = class PromptsService extends Disposable {
                     continue;
                 }
                 const description = parsedFile.header?.description;
-                if (!description) {
-                    this.logger.error(
-                        `[computeSkillDiscoveryInfo] Agent skill file missing description attribute: ${uri}`
-                    );
-                    files.push({
-                        uri,
-                        storage,
-                        status: "skipped",
-                        skipReason: "missing-description",
-                        name: sanitizedName,
-                        extensionId,
-                        source
-                    });
-                    continue;
-                }
                 seenNames.add(sanitizedName);
                 nameToUri.set(sanitizedName, uri);
                 const disableModelInvocation = parsedFile.header?.disableModelInvocation === true;
@@ -1474,7 +1447,7 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.agent, files.filter(f => f.status === "loaded"));
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.agent);
         return {
             type: PromptsType.agent,
             files,
@@ -1509,7 +1482,7 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.prompt, files.filter(f => f.status === "loaded"));
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.prompt);
         return {
             type: PromptsType.prompt,
             files,
@@ -1544,7 +1517,7 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.instructions, files.filter(f => f.status === "loaded"));
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.instructions);
         return {
             type: PromptsType.instructions,
             files,
@@ -1634,7 +1607,7 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.hook, files.filter(f => f.status === "loaded"));
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.hook);
         return {
             type: PromptsType.hook,
             files,
@@ -1740,6 +1713,10 @@ var IAgentSource;
                 storage: PromptsStorage.plugin,
                 pluginUri: promptPath.pluginUri
             };
+        } else if (promptPath.storage === PromptsStorage.internal) {
+            return {
+                storage: PromptsStorage.internal
+            };
         } else {
             return {
                 storage: promptPath.storage