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

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

@@ -25,11 +25,11 @@ 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_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 { getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_CONFIG_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, GITHUB_CONFIG_FOLDER, getSkillFolderName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType, PromptFileSource, 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';
-import { PromptsStorage, ExtensionAgentSourceType, SKILL_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { PromptsStorage, SKILL_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { parseSubagentHooksFromYaml } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
@@ -45,7 +45,6 @@ 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 {
@@ -128,7 +127,6 @@ 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);
         }));
@@ -172,8 +170,12 @@ let PromptsService = class PromptsService extends Disposable {
                 e => e.affectsConfiguration(PromptsConfig.USE_CHAT_HOOKS) || e.affectsConfiguration(PromptsConfig.USE_CLAUDE_HOOKS)
             ), this._onDidPluginHooksChange.event, this.workspaceTrustService.onDidChangeTrust)
         )));
-        this._register(this.cachedSkills.onDidChange(() => {}));
-        this._register(this.cachedHooks.onDidChange(() => {}));
+        this.cachedInstructions = this._register(( new CachedPromise(token => this.computeInstructionFiles(token), () => Event.any(
+            this.getFileLocatorEvent(PromptsType.instructions),
+            this._onDidContributedWhenChange.event,
+            this._onDidChangeInstructions.event,
+            this._onDidPluginPromptFilesChange.event
+        ))));
         this._register(
             this.watchPluginPromptFilesForType(PromptsType.prompt, (plugin, reader) => plugin.commands.read(reader))
         );
@@ -198,7 +200,8 @@ let PromptsService = class PromptsService extends Disposable {
                             storage: PromptsStorage.plugin,
                             type: PromptsType.hook,
                             name: getCanonicalPluginCommandId(plugin, hook.originalId),
-                            pluginUri: plugin.uri
+                            pluginUri: plugin.uri,
+                            source: PromptFileSource.Plugin
                         });
                     }
                 }
@@ -222,7 +225,8 @@ let PromptsService = class PromptsService extends Disposable {
                         storage: PromptsStorage.plugin,
                         type,
                         name: getCanonicalPluginCommandId(plugin, item.name),
-                        pluginUri: plugin.uri
+                        pluginUri: plugin.uri,
+                        source: PromptFileSource.Plugin
                     });
                 }
             }
@@ -283,7 +287,7 @@ let PromptsService = class PromptsService extends Disposable {
             this.getExtensionPromptFiles(type, token),
             this._pluginPromptFilesByType.get(type) ?? []
         ]);
-        return [...prompts.flat(), ...this.internalCustomizations.getPromptPaths(type)];
+        return prompts.flat();
     }
     async _collectSourceFolderDiagnostics(type) {
         const resolvedFolders = await this.fileLocator.getSourceFoldersInDiscoveryOrder(type);
@@ -358,7 +362,7 @@ let PromptsService = class PromptsService extends Disposable {
                         storage: PromptsStorage.extension,
                         type,
                         extension: providerEntry.extension,
-                        source: ExtensionAgentSourceType.provider,
+                        source: PromptFileSource.ExtensionAPI,
                         name: file.name,
                         description: file.description
                     });
@@ -390,8 +394,6 @@ 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,7 +469,7 @@ let PromptsService = class PromptsService extends Disposable {
         return this.fileLocator.getResolvedSourceFolders(type);
     }
     get onDidChangeSlashCommands() {
-        return this.cachedSlashCommands.onDidChange;
+        return this.cachedSlashCommands.onDidChangePromise;
     }
     async getPromptSlashCommands(token, sessionResource) {
         const sw = StopWatch.create();
@@ -476,19 +478,19 @@ let PromptsService = class PromptsService extends Disposable {
             const elapsed = sw.elapsed();
             void this.getPromptSlashCommandDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
                 const details = result.length === 1 ? ( localize(
-                    7555,
+                    7621,
                     "Resolved {0} slash command in {1}ms",
                     result.length,
                     elapsed.toFixed(1)
                 )) : ( localize(
-                    7556,
+                    7622,
                     "Resolved {0} slash commands in {1}ms",
                     result.length,
                     elapsed.toFixed(1)
                 ));
                 this._onDidLogDiscovery.fire({
                     sessionResource,
-                    name: ( localize(7557, "Load Slash Commands")),
+                    name: ( localize(7623, "Load Slash Commands")),
                     details,
                     discoveryInfo,
                     category: "discovery"
@@ -545,14 +547,13 @@ 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,
-            when: internalSkill?.when
+            when: undefined
         };
     }
     async getPromptSlashCommandName(uri, token) {
@@ -564,15 +565,10 @@ let PromptsService = class PromptsService extends Disposable {
         return slashCommand.name;
     }
     get onDidChangeCustomAgents() {
-        return this.cachedCustomAgents.onDidChange;
+        return this.cachedCustomAgents.onDidChangePromise;
     }
     get onDidChangeInstructions() {
-        return Event.any(
-            this.getFileLocatorEvent(PromptsType.instructions),
-            this._onDidContributedWhenChange.event,
-            this._onDidChangeInstructions.event,
-            this._onDidPluginPromptFilesChange.event
-        );
+        return this.cachedInstructions.onDidChangePromise;
     }
     async getCustomAgents(token, sessionResource) {
         const sw = StopWatch.create();
@@ -580,10 +576,10 @@ let PromptsService = class PromptsService extends Disposable {
         if (sessionResource) {
             const elapsed = sw.elapsed();
             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)));
+                const details = result.length === 1 ? ( localize(7624, "Resolved {0} agent in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7625, "Resolved {0} agents in {1}ms", result.length, elapsed.toFixed(1)));
                 this._onDidLogDiscovery.fire({
                     sessionResource,
-                    name: ( localize(7560, "Load Agents")),
+                    name: ( localize(7626, "Load Agents")),
                     details,
                     discoveryInfo,
                     category: "discovery"
@@ -761,7 +757,7 @@ let PromptsService = class PromptsService extends Disposable {
                 storage: PromptsStorage.extension,
                 type,
                 extension,
-                source: ExtensionAgentSourceType.contribution
+                source: PromptFileSource.ExtensionContribution
             };
         })();
         bucket.set(uri, entryPromise);
@@ -809,19 +805,17 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(7561, "User Data");
+            return localize(7627, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    7562,
+                    7628,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
         case PromptsStorage.plugin:
-            return localize(7563, "Plugin");
-        case PromptsStorage.internal:
-            return localize(7564, "Built-in");
+            return localize(7629, "Plugin");
         default:
             assertNever(promptPath, "Unknown prompt storage type");
         }
@@ -1029,7 +1023,7 @@ let PromptsService = class PromptsService extends Disposable {
         return sanitized;
     }
     get onDidChangeSkills() {
-        return this.cachedSkills.onDidChange;
+        return this.cachedSkills.onDidChangePromise;
     }
     async findAgentSkills(token, sessionResource) {
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
@@ -1041,10 +1035,10 @@ let PromptsService = class PromptsService extends Disposable {
         if (sessionResource) {
             const elapsed = sw.elapsed();
             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)));
+                const details = result.length === 1 ? ( localize(7630, "Resolved {0} skill in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7631, "Resolved {0} skills in {1}ms", result.length, elapsed.toFixed(1)));
                 this._onDidLogDiscovery.fire({
                     sessionResource,
-                    name: ( localize(7567, "Load Skills")),
+                    name: ( localize(7632, "Load Skills")),
                     details,
                     discoveryInfo,
                     category: "discovery"
@@ -1054,24 +1048,27 @@ let PromptsService = class PromptsService extends Disposable {
         return result;
     }
     async computeAgentSkills(token) {
-        const {
-            files,
-            skillsBySource
-        } = await this.computeSkillDiscoveryInfo(token);
+        const files = await this.computeSkillDiscoveryInfo(token);
         const result = [];
+        const skillsBySource = ( new Map());
         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);
+            if (file.status === "loaded" && file.promptPath.name) {
+                const sanitizedDescription = this.truncateAgentSkillDescription(file.promptPath.description, file.promptPath.uri);
                 result.push({
-                    uri: file.uri,
-                    storage: file.storage,
-                    name: file.name,
+                    uri: file.promptPath.uri,
+                    storage: file.promptPath.storage,
+                    name: file.promptPath.name,
                     description: sanitizedDescription,
                     disableModelInvocation: file.disableModelInvocation ?? false,
                     userInvocable: file.userInvocable ?? true,
-                    when: internalSkill?.when
+                    when: undefined,
+                    pluginUri: file.promptPath.pluginUri,
+                    extension: file.promptPath.extension
                 });
+                const source = file.promptPath.source;
+                if (source) {
+                    skillsBySource.set(source, (skillsBySource.get(source) || 0) + 1);
+                }
             }
         }
         let skippedMissingName = 0;
@@ -1128,10 +1125,10 @@ let PromptsService = class PromptsService extends Disposable {
             const elapsed = sw.elapsed();
             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)));
+                const details = hookCount === 1 ? ( localize(7633, "Resolved {0} hook in {1}ms", hookCount, elapsed.toFixed(1))) : ( localize(7634, "Resolved {0} hooks in {1}ms", hookCount, elapsed.toFixed(1)));
                 this._onDidLogDiscovery.fire({
                     sessionResource,
-                    name: ( localize(7570, "Load Hooks")),
+                    name: ( localize(7635, "Load Hooks")),
                     details,
                     discoveryInfo,
                     category: "discovery"
@@ -1142,32 +1139,41 @@ let PromptsService = class PromptsService extends Disposable {
     }
     async getInstructionFiles(token, sessionResource) {
         const sw = StopWatch.create();
-        const result = await this.listPromptFiles(PromptsType.instructions, token);
+        const discoveryInfo = await this.cachedInstructions.get(token);
+        const result = ( discoveryInfo.files.filter(file => file.status === "loaded").map(file => file.promptPath));
         if (sessionResource) {
             const elapsed = sw.elapsed();
-            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"
-                });
+            const details = result.length === 1 ? ( localize(
+                7636,
+                "Resolved {0} instruction in {1}ms",
+                result.length,
+                elapsed.toFixed(1)
+            )) : ( localize(
+                7637,
+                "Resolved {0} instructions in {1}ms",
+                result.length,
+                elapsed.toFixed(1)
+            ));
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7638, "Load Instructions")),
+                details,
+                discoveryInfo,
+                category: "discovery"
             });
         }
         return result;
     }
+    withPromptPathMetadata(promptPath, name, description) {
+        return {
+            ...promptPath,
+            name,
+            description
+        };
+    }
+    async computeInstructionFiles(token) {
+        return await this.getInstructionsDiscoveryInfo(token);
+    }
     async computeHooks(token) {
         const useChatHooks = this.configurationService.getValue(PromptsConfig.USE_CHAT_HOOKS);
         if (!useChatHooks) {
@@ -1185,6 +1191,9 @@ let PromptsService = class PromptsService extends Disposable {
         const collectedHooks = ( new Map());
         const defaultFolder = this.workspaceService.getWorkspace().folders[0];
         for (const hookFile of hookFiles) {
+            if (hookFile.storage === PromptsStorage.plugin) {
+                continue;
+            }
             try {
                 const content = await this.fileService.readFile(hookFile.uri);
                 const json = parse(( content.value.toString()));
@@ -1264,11 +1273,9 @@ let PromptsService = class PromptsService extends Disposable {
         if (!useAgentSkills) {
             const allFiles = await this.listPromptFiles(PromptsType.skill, token);
             const files = ( allFiles.map(promptPath => ({
-                uri: promptPath.uri,
-                storage: promptPath.storage,
                 status: "skipped",
                 skipReason: "disabled",
-                extensionId: promptPath.extension?.identifier?.value
+                promptPath
             })));
             const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
             return {
@@ -1277,9 +1284,7 @@ let PromptsService = class PromptsService extends Disposable {
                 sourceFolders
             };
         }
-        const {
-            files
-        } = await this.computeSkillDiscoveryInfo(token);
+        const files = await this.computeSkillDiscoveryInfo(token);
         const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
         return {
             type: PromptsType.skill,
@@ -1289,26 +1294,13 @@ let PromptsService = class PromptsService extends Disposable {
     }
     async computeSkillDiscoveryInfo(token) {
         const files = [];
-        const skillsBySource = ( new Map());
         const seenNames = ( new Set());
         const nameToUri = ( new Map());
         const allSkills = [];
         const discoveredSkills = await this.fileLocator.findAgentSkills(token);
         const extensionSkills = await this.getExtensionPromptFiles(PromptsType.skill, token);
         const pluginSkills = this._pluginPromptFilesByType.get(PromptsType.skill) ?? [];
-        allSkills.push(...discoveredSkills, ...( extensionSkills.map(extPath => ({
-            fileUri: extPath.uri,
-            storage: extPath.storage,
-            source: extPath.source === ExtensionAgentSourceType.contribution ? PromptFileSource.ExtensionContribution : PromptFileSource.ExtensionAPI
-        }))), ...( pluginSkills.map(p => ({
-            fileUri: p.uri,
-            storage: p.storage,
-            source: PromptFileSource.Plugin
-        }))), ...( this.internalCustomizations.getSkills().map(s => ({
-            fileUri: s.uri,
-            storage: s.storage,
-            source: PromptFileSource.Internal
-        }))));
+        allSkills.push(...discoveredSkills, ...extensionSkills, ...pluginSkills);
         const getPriority = skill => {
             if (skill.storage === PromptsStorage.local) {
                 return 0;
@@ -1328,64 +1320,49 @@ let PromptsService = class PromptsService extends Disposable {
             return 5;
         };
         allSkills.sort((a, b) => getPriority(a) - getPriority(b));
-        const extensionIdByUri = ( new Map());
-        for (const extSkill of extensionSkills) {
-            extensionIdByUri.set(( extSkill.uri.toString()), extSkill.extension.identifier.value);
-        }
         for (const skill of allSkills) {
-            const uri = skill.fileUri;
-            const storage = skill.storage;
-            const source = skill.source;
-            const extensionId = extensionIdByUri.get(( uri.toString()));
+            const uri = skill.uri;
+            const promptPath = skill;
             try {
                 const parsedFile = await this.parseNew(uri, token);
                 const folderName = getSkillFolderName(uri);
                 let name = parsedFile.header?.name;
+                const description = parsedFile.header?.description;
                 if (!name) {
                     this.logger.debug(
                         `[computeSkillDiscoveryInfo] Agent skill file missing name attribute, using folder name "${folderName}": ${uri}`
                     );
                     name = folderName;
                 }
-                const sanitizedName = this.truncateAgentSkillName(name, uri);
+                let sanitizedName = this.truncateAgentSkillName(name, uri);
                 if (sanitizedName !== folderName) {
                     this.logger.debug(
                         `[computeSkillDiscoveryInfo] Agent skill name "${sanitizedName}" does not match folder name "${folderName}", using folder name: ${uri}`
                     );
+                    sanitizedName = folderName;
                 }
                 if (( seenNames.has(sanitizedName))) {
                     this.logger.debug(
                         `[computeSkillDiscoveryInfo] Skipping duplicate agent skill name: ${sanitizedName} at ${uri}`
                     );
                     files.push({
-                        uri,
-                        storage,
                         status: "skipped",
                         skipReason: "duplicate-name",
-                        name: sanitizedName,
                         duplicateOf: nameToUri.get(sanitizedName),
-                        extensionId,
-                        source
+                        promptPath: this.withPromptPathMetadata(promptPath, sanitizedName, description)
                     });
                     continue;
                 }
-                const description = parsedFile.header?.description;
                 seenNames.add(sanitizedName);
                 nameToUri.set(sanitizedName, uri);
                 const disableModelInvocation = parsedFile.header?.disableModelInvocation === true;
                 const userInvocable = parsedFile.header?.userInvocable !== false;
                 files.push({
-                    uri,
-                    storage,
                     status: "loaded",
-                    name: sanitizedName,
-                    description,
-                    extensionId,
-                    source,
+                    promptPath: this.withPromptPathMetadata(promptPath, sanitizedName, description),
                     disableModelInvocation,
                     userInvocable
                 });
-                skillsBySource.set(source, (skillsBySource.get(source) || 0) + 1);
             } catch (e) {
                 const msg = e instanceof Error ? e.message : String(e);
                 this.logger.error(
@@ -1393,57 +1370,45 @@ let PromptsService = class PromptsService extends Disposable {
                     msg
                 );
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "parse-error",
                     errorMessage: msg,
-                    extensionId,
-                    source
+                    promptPath
                 });
             }
         }
-        return {
-            files,
-            skillsBySource
-        };
+        return files;
     }
     async getAgentDiscoveryInfo(token) {
         const files = [];
         const disabledAgents = this.getDisabledPromptFiles(PromptsType.agent);
         const agentFiles = await this.listPromptFiles(PromptsType.agent, token);
         for (const promptPath of agentFiles) {
-            const uri = promptPath.uri;
-            const storage = promptPath.storage;
-            const extensionId = promptPath.extension?.identifier?.value;
+            const {
+                uri
+            } = promptPath;
             if (( disabledAgents.has(uri))) {
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "disabled",
-                    extensionId
+                    promptPath
                 });
                 continue;
             }
             try {
                 const ast = await this.parseNew(uri, token);
                 const name = ast.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+                const description = ast.header?.description ?? promptPath.description;
                 files.push({
-                    uri,
-                    storage,
                     status: "loaded",
-                    name,
-                    extensionId
+                    promptPath: this.withPromptPathMetadata(promptPath, name, description)
                 });
             } catch (e) {
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "parse-error",
                     errorMessage: e instanceof Error ? e.message : String(e),
-                    extensionId
+                    promptPath
                 });
             }
         }
@@ -1458,27 +1423,23 @@ let PromptsService = class PromptsService extends Disposable {
         const files = [];
         const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
         for (const promptPath of promptFiles) {
-            const uri = promptPath.uri;
-            const storage = promptPath.storage;
-            const extensionId = promptPath.extension?.identifier?.value;
+            const {
+                uri
+            } = promptPath;
             try {
                 const parsedPromptFile = await this.parseNew(uri, token);
                 const name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+                const description = parsedPromptFile?.header?.description ?? promptPath.description;
                 files.push({
-                    uri,
-                    storage,
                     status: "loaded",
-                    name,
-                    extensionId
+                    promptPath: this.withPromptPathMetadata(promptPath, name, description)
                 });
             } catch (e) {
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "parse-error",
                     errorMessage: e instanceof Error ? e.message : String(e),
-                    extensionId
+                    promptPath
                 });
             }
         }
@@ -1494,26 +1455,20 @@ let PromptsService = class PromptsService extends Disposable {
         const instructionsFiles = await this.listPromptFiles(PromptsType.instructions, token);
         for (const promptPath of instructionsFiles) {
             const uri = promptPath.uri;
-            const storage = promptPath.storage;
-            const extensionId = promptPath.extension?.identifier?.value;
             try {
                 const parsedPromptFile = await this.parseNew(uri, token);
                 const name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+                const description = parsedPromptFile?.header?.description ?? promptPath.description;
                 files.push({
-                    uri,
-                    storage,
                     status: "loaded",
-                    name,
-                    extensionId
+                    promptPath: this.withPromptPathMetadata(promptPath, name, description)
                 });
             } catch (e) {
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "parse-error",
                     errorMessage: e instanceof Error ? e.message : String(e),
-                    extensionId
+                    promptPath
                 });
             }
         }
@@ -1531,29 +1486,23 @@ let PromptsService = class PromptsService extends Disposable {
         const useClaudeHooks = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_HOOKS);
         const hookFiles = await this.listPromptFiles(PromptsType.hook, token);
         for (const promptPath of hookFiles) {
-            const uri = promptPath.uri;
-            const storage = promptPath.storage;
-            const extensionId = promptPath.extension?.identifier?.value;
+            const {
+                uri
+            } = promptPath;
             const name = basename(uri);
             if (!this.workspaceTrustService.isWorkspaceTrusted()) {
                 files.push({
-                    uri: promptPath.uri,
-                    storage: promptPath.storage,
                     status: "skipped",
                     skipReason: "workspace-untrusted",
-                    name: basename(promptPath.uri),
-                    extensionId: promptPath.extension?.identifier?.value
+                    promptPath: this.withPromptPathMetadata(promptPath, basename(promptPath.uri), promptPath.description)
                 });
                 continue;
             }
             if (getHookSourceFormat(uri) === HookSourceFormat.Claude && useClaudeHooks === false) {
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "claude-hooks-disabled",
-                    name,
-                    extensionId
+                    promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
                 });
                 continue;
             }
@@ -1562,13 +1511,10 @@ let PromptsService = class PromptsService extends Disposable {
                 const json = parse(( content.value.toString()));
                 if (!json || typeof json !== "object") {
                     files.push({
-                        uri,
-                        storage,
                         status: "skipped",
                         skipReason: "parse-error",
                         errorMessage: "Invalid hooks file: must be a JSON object",
-                        name,
-                        extensionId
+                        promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
                     });
                     continue;
                 }
@@ -1579,31 +1525,22 @@ let PromptsService = class PromptsService extends Disposable {
                 } = parseHooksFromFile(uri, json, workspaceRootUri, userHome);
                 if (disabledAllHooks) {
                     files.push({
-                        uri,
-                        storage,
                         status: "skipped",
                         skipReason: "all-hooks-disabled",
-                        name,
-                        extensionId
+                        promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
                     });
                     continue;
                 }
                 files.push({
-                    uri,
-                    storage,
                     status: "loaded",
-                    name,
-                    extensionId
+                    promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
                 });
             } catch (e) {
                 files.push({
-                    uri,
-                    storage,
                     status: "skipped",
                     skipReason: "parse-error",
                     errorMessage: e instanceof Error ? e.message : String(e),
-                    name,
-                    extensionId
+                    promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
                 });
             }
         }
@@ -1623,30 +1560,28 @@ class CachedPromise extends Disposable {
         this.getEvent = getEvent;
         this.delay = delay;
         this.cachedPromise = undefined;
-        this.onDidUpdatePromiseEmitter = undefined;
+        this.onDidUpdatePromiseEmitter = this._register(( new Emitter()));
+        const delayer = this._register(( new Delayer(this.delay)));
+        this._register(this.getEvent()(() => {
+            this.cachedPromise = undefined;
+            delayer.trigger(() => this.onDidUpdatePromiseEmitter.fire());
+        }));
     }
-    get onDidChange() {
-        if (!this.onDidUpdatePromiseEmitter) {
-            const emitter = this.onDidUpdatePromiseEmitter = this._register(( new Emitter()));
-            const delayer = this._register(( new Delayer(this.delay)));
-            this._register(this.getEvent()(() => {
-                this.cachedPromise = undefined;
-                delayer.trigger(() => emitter.fire());
-            }));
-        }
+    get onDidChangePromise() {
         return this.onDidUpdatePromiseEmitter.event;
     }
     get(token) {
         if (this.cachedPromise !== undefined) {
             return this.cachedPromise;
         }
-        const result = this.computeFn(token);
-        if (!this.onDidUpdatePromiseEmitter) {
-            return result;
-        }
-        this.cachedPromise = result;
-        this.onDidUpdatePromiseEmitter.fire();
-        return result;
+        const promise = this.computeFn(token).catch(err => {
+            if (this.cachedPromise === promise) {
+                this.cachedPromise = undefined;
+            }
+            throw err;
+        });
+        this.cachedPromise = promise;
+        return promise;
     }
     refresh() {
         this.cachedPromise = undefined;
@@ -1672,22 +1607,34 @@ class ModelChangeTracker extends Disposable {
                     }))
                 );
             }
+            return promptType;
         };
         const onRemove = (languageId, uri) => {
             const promptType = getPromptsTypeForLanguageId(languageId);
             if (promptType !== undefined) {
                 this.listeners.get(uri)?.dispose();
                 this.listeners.delete(uri);
-                this.onDidPromptModelChange.fire({
-                    uri,
-                    promptType
-                });
             }
+            return promptType;
         };
         this._register(modelService.onModelAdded(model => onAdd(model)));
         this._register(modelService.onModelLanguageChanged(e => {
-            onRemove(e.oldLanguageId, e.model.uri);
-            onAdd(e.model);
+            const removedPromptType = onRemove(e.oldLanguageId, e.model.uri);
+            const addedPromptType = onAdd(e.model);
+            if (removedPromptType !== addedPromptType) {
+                if (removedPromptType) {
+                    this.onDidPromptModelChange.fire({
+                        uri: e.model.uri,
+                        promptType: removedPromptType
+                    });
+                }
+                if (addedPromptType) {
+                    this.onDidPromptModelChange.fire({
+                        uri: e.model.uri,
+                        promptType: addedPromptType
+                    });
+                }
+            }
         }));
         this._register(
             modelService.onModelRemoved(model => onRemove(model.getLanguageId(), model.uri))
@@ -1713,10 +1660,6 @@ var IAgentSource;
                 storage: PromptsStorage.plugin,
                 pluginUri: promptPath.pluginUri
             };
-        } else if (promptPath.storage === PromptsStorage.internal) {
-            return {
-                storage: PromptsStorage.internal
-            };
         } else {
             return {
                 storage: promptPath.storage