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

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

@@ -5,6 +5,7 @@ import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 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 { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 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, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -25,20 +26,19 @@ 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 } 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, isInClaudeRulesFolder } 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, 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 { PromptFileParser, PromptHeaderAttributes, evaluateApplyToPattern } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
+import { PromptsStorage, SKILL_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, isExtensionPromptPath, AgentInstructionFileType } 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';
-import { parseHooksFromFile, HookSourceFormat, getHookSourceFormat } from '../hookCompatibility.js';
+import { parseHooksFromFile, HookSourceFormat } from '../hookCompatibility.js';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { getTarget, mapClaudeModels, mapClaudeTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptFileAttributes';
-import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { getCanonicalPluginCommandId } from '../../plugins/agentPluginService.js';
@@ -106,8 +106,6 @@ let PromptsService = class PromptsService extends Disposable {
         this.agentPluginService = agentPluginService;
         this.workspaceTrustService = workspaceTrustService;
         this.cachedParsedPromptFromModels = ( new ResourceMap());
-        this._onDidLogDiscovery = this._register(( new Emitter()));
-        this.onDidLogDiscovery = this._onDidLogDiscovery.event;
         this.cachedFileLocations = {};
         this.fileLocatorEvents = {};
         this.contributedFiles = {
@@ -119,11 +117,14 @@ let PromptsService = class PromptsService extends Disposable {
         };
         this._contributedWhenKeys = ( new Set());
         this._contributedWhenClauses = ( new Map());
+        this._providerWhenClauses = ( new Map());
         this._onDidContributedWhenChange = this._register(( new Emitter()));
         this._onDidChangeInstructions = this._register(( new Emitter()));
         this._onDidPluginPromptFilesChange = this._register(( new Emitter()));
         this._onDidPluginHooksChange = this._register(( new Emitter()));
         this._pluginPromptFilesByType = ( new Map());
+        this._pendingReadonlyUris = [];
+        this._pendingReadonlyFlush = false;
         this.promptFileProviders = [];
         this.disabledPromptsStorageKeyPrefix = "chat.disabledPromptFiles.";
         this.fileLocator = this.createPromptFilesLocator();
@@ -139,7 +140,7 @@ let PromptsService = class PromptsService extends Disposable {
             }
         }));
         const modelChangeEvent = this._register(( new ModelChangeTracker(this.modelService))).onDidPromptChange;
-        this.cachedCustomAgents = this._register(( new CachedPromise(token => this.computeCustomAgents(token), () => Event.any(
+        this.cachedCustomAgents = this._register(( new CachedPromise(token => this.computeAgentDiscoveryInfo(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.agent),
             Event.filter(modelChangeEvent, e => e.promptType === PromptsType.agent),
             this._onDidContributedWhenChange.event,
@@ -149,7 +150,7 @@ let PromptsService = class PromptsService extends Disposable {
             ),
             this._onDidPluginPromptFilesChange.event
         ))));
-        this.cachedSlashCommands = this._register(( new CachedPromise(token => this.computePromptSlashCommands(token), () => Event.any(
+        this.cachedSlashCommands = this._register(( new CachedPromise(token => this.computeSlashCommandDiscoveryInfo(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.prompt),
             this.getFileLocatorEvent(PromptsType.skill),
             Event.filter(modelChangeEvent, e => e.promptType === PromptsType.prompt),
@@ -157,7 +158,7 @@ let PromptsService = class PromptsService extends Disposable {
             this._onDidContributedWhenChange.event,
             this._onDidPluginPromptFilesChange.event
         ))));
-        this.cachedSkills = this._register(( new CachedPromise(token => this.computeAgentSkills(token), () => Event.any(
+        this.cachedSkills = this._register(( new CachedPromise(token => this.computeSkillDiscovery(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.skill),
             Event.filter(modelChangeEvent, e => e.promptType === PromptsType.skill),
             this._onDidContributedWhenChange.event,
@@ -315,6 +316,8 @@ let PromptsService = class PromptsService extends Disposable {
                 const index = this.promptFileProviders.findIndex(p => p === providerEntry);
                 if (index >= 0) {
                     this.promptFileProviders.splice(index, 1);
+                    this._providerWhenClauses.delete(providerEntry);
+                    this._updateContributedWhenKeys();
                     this.invalidatePromptFileCache(type);
                 }
             }
@@ -339,6 +342,7 @@ let PromptsService = class PromptsService extends Disposable {
     }
     async listFromProviders(type, activationEvent, token) {
         const result = [];
+        const readonlyUris = [];
         await this.extensionService.activateByEvent(activationEvent);
         const providers = this.promptFileProviders.filter(p => p.type === type);
         if (providers.length === 0) {
@@ -347,16 +351,13 @@ let PromptsService = class PromptsService extends Disposable {
         for (const providerEntry of providers) {
             try {
                 const files = await providerEntry.providePromptFiles({}, token);
+                this._providerWhenClauses.set(providerEntry, files?.flatMap(file => file.when ? [file.when] : []) ?? []);
+                this._updateContributedWhenKeys();
                 if (!files || token.isCancellationRequested) {
                     continue;
                 }
                 for (const file of files) {
-                    try {
-                        await this.filesConfigService.updateReadonly(file.uri, true);
-                    } catch (e) {
-                        const msg = e instanceof Error ? e.message : String(e);
-                        this.logger.error(`[listFromProviders] Failed to make file readonly: ${file.uri}`, msg);
-                    }
+                    readonlyUris.push(file.uri);
                     result.push({
                         uri: file.uri,
                         storage: PromptsStorage.extension,
@@ -364,7 +365,9 @@ let PromptsService = class PromptsService extends Disposable {
                         extension: providerEntry.extension,
                         source: PromptFileSource.ExtensionAPI,
                         name: file.name,
-                        description: file.description
+                        description: file.description,
+                        when: file.when,
+                        sessionTypes: file.sessionTypes
                     });
                 }
             } catch (e) {
@@ -374,52 +377,56 @@ let PromptsService = class PromptsService extends Disposable {
                 );
             }
         }
+        void this.filesConfigService.updateReadonly(readonlyUris, true);
         return result;
     }
     async listPromptFilesForStorage(type, storage, token) {
+        let promptPaths;
         switch (storage) {
         case PromptsStorage.extension:
-            return this.getExtensionPromptFiles(type, token);
+            promptPaths = await this.getExtensionPromptFiles(type, token);
+            break;
         case PromptsStorage.local:
-            return this.fileLocator.listFiles(type, PromptsStorage.local, token).then(uris => ( uris.map(uri => ({
+            promptPaths = await this.fileLocator.listFiles(type, PromptsStorage.local, token).then(uris => ( uris.map(uri => ({
                 uri,
                 storage: PromptsStorage.local,
                 type
             }))));
+            break;
         case PromptsStorage.user:
-            return this.fileLocator.listFiles(type, PromptsStorage.user, token).then(uris => ( uris.map(uri => ({
+            promptPaths = await this.fileLocator.listFiles(type, PromptsStorage.user, token).then(uris => ( uris.map(uri => ({
                 uri,
                 storage: PromptsStorage.user,
                 type
             }))));
+            break;
         case PromptsStorage.plugin:
-            return this._pluginPromptFilesByType.get(type) ?? [];
+            promptPaths = this._pluginPromptFilesByType.get(type) ?? [];
+            break;
         default:
             throw ( new Error(`[listPromptFilesForStorage] Unsupported prompt storage type: ${storage}`));
         }
+        return promptPaths;
     }
     async getExtensionPromptFiles(type, token) {
         await this.extensionService.whenInstalledExtensionsRegistered();
         const settledResults = await Promise.allSettled(( this.contributedFiles[type].values()));
-        const contributedFiles = ( settledResults.filter(result => result.status === "fulfilled").map(result => result.value)).filter(file => {
+        const contributedFiles = ( settledResults.filter(result => result.status === "fulfilled").map(result => result.value));
+        const activationEvent = this.getProviderActivationEvent(type);
+        const providerFiles = activationEvent ? await this.listFromProviders(type, activationEvent, token) : [];
+        return [...contributedFiles, ...providerFiles].filter(file => {
             if (!file.when) {
                 return true;
             }
-            const expr = ContextKeyExpr.deserialize(file.when);
-            if (!expr) {
+            const when = ContextKeyExpr.deserialize(file.when);
+            if (!when) {
                 this.logger.warn(
                     `[getExtensionPromptFiles] Ignoring contributed prompt file with invalid when clause: ${file.when}`
                 );
                 return false;
             }
-            return this.contextKeyService.contextMatchesRules(expr);
+            return this.contextKeyService.contextMatchesRules(when);
         });
-        const activationEvent = this.getProviderActivationEvent(type);
-        if (!activationEvent) {
-            return contributedFiles;
-        }
-        const providerFiles = await this.listFromProviders(type, activationEvent, token);
-        return [...contributedFiles, ...providerFiles];
     }
     getProviderActivationEvent(type) {
         switch (type) {
@@ -471,68 +478,88 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeSlashCommands() {
         return this.cachedSlashCommands.onDidChangePromise;
     }
-    async getPromptSlashCommands(token, sessionResource) {
-        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(
-                    7621,
-                    "Resolved {0} slash command in {1}ms",
-                    result.length,
-                    elapsed.toFixed(1)
-                )) : ( localize(
-                    7622,
-                    "Resolved {0} slash commands in {1}ms",
-                    result.length,
-                    elapsed.toFixed(1)
-                ));
-                this._onDidLogDiscovery.fire({
-                    sessionResource,
-                    name: ( localize(7623, "Load Slash Commands")),
-                    details,
-                    discoveryInfo,
-                    category: "discovery"
-                });
-            });
-        }
+    async getPromptSlashCommands(token) {
+        const discoveryInfo = await this.cachedSlashCommands.get(token);
+        const result = this.slashCommandsFromDiscoveryInfo(discoveryInfo);
         return result;
     }
-    async computePromptSlashCommands(token) {
+    async computeSlashCommandDiscoveryInfo(token) {
+        const stopWatch = StopWatch.create(true);
         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 disabledSkills = this.getDisabledPromptFiles(PromptsType.skill);
         const slashCommandFiles = [...promptFiles, ...skills.filter(s => !( disabledSkills.has(s.uri)))];
-        const details = await Promise.all(( slashCommandFiles.map(async promptPath => {
+        const parseResults = await Promise.all(( slashCommandFiles.map(async promptPath => {
             try {
                 const parsedPromptFile = await this.parseNew(promptPath.uri, token);
-                return this.asChatPromptSlashCommand(parsedPromptFile, promptPath);
+                const rawName = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
+                const name = promptPath.source === PromptFileSource.Plugin && promptPath.pluginUri ? getCanonicalPluginCommandId({
+                    uri: promptPath.pluginUri
+                }, rawName) : rawName;
+                const description = parsedPromptFile?.header?.description ?? promptPath.description;
+                const argumentHint = parsedPromptFile?.header?.argumentHint;
+                const userInvocable = parsedPromptFile?.header?.userInvocable;
+                return {
+                    status: "loaded",
+                    promptPath: this.withPromptPathMetadata(promptPath, name, description),
+                    argumentHint,
+                    userInvocable
+                };
             } catch (e) {
                 this.logger.error(
-                    `[computePromptSlashCommands] Failed to parse prompt file for slash command: ${promptPath.uri}`,
+                    `[computeSlashCommandDiscoveryInfo] Failed to parse prompt file for slash command: ${promptPath.uri}`,
                     e instanceof Error ? e.message : String(e)
                 );
-                return undefined;
+                return {
+                    status: "skipped",
+                    skipReason: "parse-error",
+                    errorMessage: e instanceof Error ? e.message : String(e),
+                    promptPath
+                };
             }
         })));
+        const files = parseResults;
+        const promptSourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.prompt);
+        const sourceFolders = [...promptSourceFolders];
+        if (useAgentSkills) {
+            const skillSourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
+            sourceFolders.push(...skillSourceFolders);
+        }
+        return {
+            type: PromptsType.prompt,
+            files,
+            sourceFolders,
+            durationInMillis: stopWatch.elapsed()
+        };
+    }
+    slashCommandsFromDiscoveryInfo(discoveryInfo) {
         const result = [];
         const seen = ( new ResourceSet());
-        for (const detail of details) {
-            if (detail) {
-                result.push(detail);
-                seen.add(detail.promptPath.uri);
+        for (const file of discoveryInfo.files) {
+            if (file.status === "loaded") {
+                result.push(
+                    this.asChatPromptSlashCommand(file.argumentHint, file.userInvocable, file.promptPath)
+                );
+                seen.add(file.promptPath.uri);
             }
         }
         for (const model of this.modelService.getModels()) {
             if (model.getLanguageId() === PROMPT_LANGUAGE_ID && model.uri.scheme === Schemas.untitled && !( seen.has(model.uri))) {
                 const parsedPromptFile = this.getParsedPromptFile(model);
-                result.push(this.asChatPromptSlashCommand(parsedPromptFile, {
-                    uri: model.uri,
-                    storage: PromptsStorage.local,
-                    type: PromptsType.prompt
-                }));
+                const name = parsedPromptFile?.header?.name ?? getCleanPromptName(model.uri);
+                const description = parsedPromptFile?.header?.description;
+                result.push(this.asChatPromptSlashCommand(
+                    parsedPromptFile?.header?.argumentHint,
+                    parsedPromptFile?.header?.userInvocable,
+                    {
+                        uri: model.uri,
+                        storage: PromptsStorage.local,
+                        type: PromptsType.prompt,
+                        name,
+                        description
+                    }
+                ));
             }
         }
         return result;
@@ -542,23 +569,37 @@ let PromptsService = class PromptsService extends Disposable {
     }
     async resolvePromptSlashCommand(name, token) {
         const commands = await this.getPromptSlashCommands(token);
-        return commands.find(cmd => cmd.name === name);
+        const command = commands.find(cmd => cmd.name === name);
+        if (command) {
+            return {
+                ...command,
+                parsedPromptFile: await this.parseNew(command.uri, token)
+            };
+        }
+        return undefined;
     }
-    asChatPromptSlashCommand(parsedPromptFile, promptPath) {
-        let name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
+    asChatPromptSlashCommand(argumentHint, userInvocable, promptPath) {
+        let name = promptPath.name ?? getCleanPromptName(promptPath.uri);
         name = name.replace(/[^\p{L}\d_\-\.:]+/gu, "-");
+        const when = isExtensionPromptPath(promptPath) && promptPath.when ? ContextKeyExpr.deserialize(promptPath.when) ?? undefined : undefined;
         return {
+            uri: promptPath.uri,
             name: name,
-            description: parsedPromptFile?.header?.description ?? promptPath.description,
-            argumentHint: parsedPromptFile?.header?.argumentHint,
-            parsedPromptFile,
-            promptPath,
-            when: undefined
+            source: promptPath.source,
+            storage: promptPath.storage,
+            type: promptPath.type,
+            extension: promptPath.extension,
+            pluginUri: promptPath.pluginUri,
+            description: promptPath.description,
+            argumentHint: argumentHint,
+            userInvocable: userInvocable ?? true,
+            when,
+            sessionTypes: promptPath.sessionTypes
         };
     }
     async getPromptSlashCommandName(uri, token) {
         const slashCommands = await this.getPromptSlashCommands(token);
-        const slashCommand = slashCommands.find(c => isEqual(c.promptPath.uri, uri));
+        const slashCommand = slashCommands.find(c => isEqual(c.uri, uri));
         if (!slashCommand) {
             return getCleanPromptName(uri);
         }
@@ -570,144 +611,173 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeInstructions() {
         return this.cachedInstructions.onDidChangePromise;
     }
-    async getCustomAgents(token, sessionResource) {
-        const sw = StopWatch.create();
-        const result = await this.cachedCustomAgents.get(token);
-        if (sessionResource) {
-            const elapsed = sw.elapsed();
-            void this.getAgentDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
-                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(7626, "Load Agents")),
-                    details,
-                    discoveryInfo,
-                    category: "discovery"
-                });
-            });
+    async getCustomAgents(token) {
+        const discoveryInfo = await this.cachedCustomAgents.get(token);
+        const result = this.agentsFromDiscoveryInfo(discoveryInfo);
+        return result;
+    }
+    agentsFromDiscoveryInfo(discoveryInfo) {
+        const result = [];
+        for (const file of discoveryInfo.files) {
+            if (file.status === "loaded" && file.agent) {
+                result.push(file.agent);
+            }
         }
         return result;
     }
-    async computeCustomAgents(token) {
-        let agentFiles = await this.listPromptFiles(PromptsType.agent, token);
+    async computeAgentDiscoveryInfo(token) {
+        const stopWatch = StopWatch.create(true);
+        const allAgentFiles = await this.listPromptFiles(PromptsType.agent, token);
         const disabledAgents = this.getDisabledPromptFiles(PromptsType.agent);
-        agentFiles = agentFiles.filter(promptPath => !( disabledAgents.has(promptPath.uri)));
         const userHomeUri = await this.pathService.userHome();
         const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
         const defaultFolder = this.workspaceService.getWorkspace().folders[0];
-        const customAgentsResults = await Promise.allSettled(( agentFiles.map(async promptPath => {
+        const files = await Promise.all(( allAgentFiles.map(async promptPath => {
             const uri = promptPath.uri;
-            const ast = await this.parseNew(uri, token);
-            let metadata;
-            if (ast.header) {
-                const advanced = ast.header.getAttribute(PromptHeaderAttributes.advancedOptions);
-                if (advanced && advanced.value.type === "map") {
-                    metadata = {};
-                    for (const [key, value] of Object.entries(advanced.value)) {
-                        if (value.type === "scalar") {
-                            metadata[key] = value;
+            if (( disabledAgents.has(uri))) {
+                return {
+                    status: "skipped",
+                    skipReason: "disabled",
+                    promptPath
+                };
+            }
+            try {
+                const ast = await this.parseNew(uri, token);
+                let metadata;
+                if (ast.header) {
+                    const advanced = ast.header.getAttribute(PromptHeaderAttributes.advancedOptions);
+                    if (advanced && advanced.value.type === "map") {
+                        metadata = {};
+                        for (const [key, value] of Object.entries(advanced.value)) {
+                            if (value.type === "scalar") {
+                                metadata[key] = value;
+                            }
                         }
                     }
                 }
-            }
-            const toolReferences = [];
-            if (ast.body) {
-                const bodyOffset = ast.body.offset;
-                const bodyVarRefs = ast.body.variableReferences;
-                for (let i = bodyVarRefs.length - 1; i >= 0; i--) {
-                    const {
-                        name,
-                        offset
-                    } = bodyVarRefs[i];
-                    const range = ( new OffsetRange(offset - bodyOffset, offset - bodyOffset + name.length + 1));
-                    toolReferences.push({
+                const toolReferences = [];
+                if (ast.body) {
+                    const bodyOffset = ast.body.offset;
+                    const bodyVarRefs = ast.body.variableReferences;
+                    for (let i = bodyVarRefs.length - 1; i >= 0; i--) {
+                        const {
+                            name,
+                            offset,
+                            fullLength
+                        } = bodyVarRefs[i];
+                        const range = ( new OffsetRange(offset - bodyOffset, offset - bodyOffset + fullLength));
+                        toolReferences.push({
+                            name,
+                            range
+                        });
+                    }
+                }
+                const agentInstructions = {
+                    content: ast.body?.getContent() ?? "",
+                    toolReferences,
+                    metadata
+                };
+                const name = ast.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+                const description = ast.header?.description ?? promptPath.description;
+                const target = getTarget(PromptsType.agent, ast.header ?? uri);
+                const source = IAgentSource.fromPromptPath(promptPath);
+                const when = isExtensionPromptPath(promptPath) && promptPath.when ? ContextKeyExpr.deserialize(promptPath.when) ?? undefined : undefined;
+                if (!ast.header) {
+                    const agent = {
+                        uri,
                         name,
-                        range
-                    });
+                        agentInstructions,
+                        source,
+                        target,
+                        visibility: {
+                            userInvocable: true,
+                            agentInvocable: true
+                        },
+                        sessionTypes: promptPath.sessionTypes,
+                        ...(when !== undefined ? {
+                            when
+                        } : undefined)
+                    };
+                    return {
+                        status: "loaded",
+                        promptPath: this.withPromptPathMetadata(promptPath, name, description),
+                        agent
+                    };
                 }
-            }
-            const agentInstructions = {
-                content: ast.body?.getContent() ?? "",
-                toolReferences,
-                metadata
-            };
-            const name = ast.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
-            const target = getTarget(PromptsType.agent, ast.header ?? uri);
-            const source = IAgentSource.fromPromptPath(promptPath);
-            if (!ast.header) {
-                return {
+                const visibility = {
+                    userInvocable: ast.header.userInvocable !== false,
+                    agentInvocable: ast.header.infer !== undefined ? ast.header.infer === true : ast.header.disableModelInvocation !== true
+                };
+                let model = ast.header.model;
+                if (target === Target.Claude && model) {
+                    model = mapClaudeModels(model);
+                }
+                let {
+                    tools,
+                    handOffs,
+                    argumentHint,
+                    agents
+                } = ast.header;
+                if (target === Target.Claude && tools) {
+                    tools = mapClaudeTools(tools);
+                }
+                let hooks;
+                const useCustomAgentHooks = this.configurationService.getValue(PromptsConfig.USE_CUSTOM_AGENT_HOOKS);
+                const hooksRaw = ast.header.hooksRaw;
+                if (useCustomAgentHooks && hooksRaw) {
+                    const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(uri) ?? defaultFolder;
+                    const workspaceRootUri = hookWorkspaceFolder?.uri;
+                    hooks = parseSubagentHooksFromYaml(hooksRaw, workspaceRootUri, userHome, target);
+                }
+                const agent = {
                     uri,
                     name,
+                    description,
+                    model,
+                    tools,
+                    handOffs,
+                    argumentHint,
+                    target,
+                    visibility,
+                    agents,
+                    hooks,
                     agentInstructions,
                     source,
-                    target,
-                    visibility: {
-                        userInvocable: true,
-                        agentInvocable: true
-                    }
+                    sessionTypes: promptPath.sessionTypes,
+                    ...(when !== undefined ? {
+                        when
+                    } : undefined)
                 };
-            }
-            const visibility = {
-                userInvocable: ast.header.userInvocable !== false,
-                agentInvocable: ast.header.infer !== undefined ? ast.header.infer === true : ast.header.disableModelInvocation !== true
-            };
-            let model = ast.header.model;
-            if (target === Target.Claude && model) {
-                model = mapClaudeModels(model);
-            }
-            let {
-                description,
-                tools,
-                handOffs,
-                argumentHint,
-                agents
-            } = ast.header;
-            if (target === Target.Claude && tools) {
-                tools = mapClaudeTools(tools);
-            }
-            let hooks;
-            const useCustomAgentHooks = this.configurationService.getValue(PromptsConfig.USE_CUSTOM_AGENT_HOOKS);
-            const hooksRaw = ast.header.hooksRaw;
-            if (useCustomAgentHooks && hooksRaw) {
-                const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(uri) ?? defaultFolder;
-                const workspaceRootUri = hookWorkspaceFolder?.uri;
-                hooks = parseSubagentHooksFromYaml(hooksRaw, workspaceRootUri, userHome, target);
-            }
-            return {
-                uri,
-                name,
-                description,
-                model,
-                tools,
-                handOffs,
-                argumentHint,
-                target,
-                visibility,
-                agents,
-                hooks,
-                agentInstructions,
-                source
-            };
-        })));
-        const customAgents = [];
-        for (let i = 0; i < customAgentsResults.length; i++) {
-            const result = customAgentsResults[i];
-            if (result.status === "fulfilled") {
-                customAgents.push(result.value);
-            } else {
-                const uri = agentFiles[i].uri;
-                const error = result.reason;
+                return {
+                    status: "loaded",
+                    promptPath: this.withPromptPathMetadata(promptPath, name, description),
+                    agent
+                };
+            } catch (e) {
+                const error = e instanceof Error ? e : ( new Error(String(e)));
                 if (error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
                     this.logger.warn(
-                        `[computeCustomAgents] Skipping agent file that does not exist: ${uri}`,
+                        `[computeAgentDiscoveryInfo] Skipping agent file that does not exist: ${uri}`,
                         error.message
                     );
                 } else {
-                    this.logger.error(`[computeCustomAgents] Failed to parse agent file: ${uri}`, error);
+                    this.logger.error(`[computeAgentDiscoveryInfo] Failed to parse agent file: ${uri}`, error);
                 }
+                return {
+                    status: "skipped",
+                    skipReason: "parse-error",
+                    errorMessage: error.message,
+                    promptPath
+                };
             }
-        }
-        return customAgents;
+        })));
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.agent);
+        return {
+            type: PromptsType.agent,
+            files,
+            sourceFolders,
+            durationInMillis: stopWatch.elapsed()
+        };
     }
     async parseNew(uri, token) {
         const model = this.modelService.getModel(uri);
@@ -720,7 +790,7 @@ let PromptsService = class PromptsService extends Disposable {
         }
         return ( new PromptFileParser()).parse(uri, ( fileContent.value.toString()));
     }
-    registerContributedFile(type, uri, extension, name, description, when) {
+    registerContributedFile(type, uri, extension, name, description, when, sessionTypes) {
         const bucket = this.contributedFiles[type];
         if (( bucket.has(uri))) {
             return Disposable.None;
@@ -740,20 +810,12 @@ let PromptsService = class PromptsService extends Disposable {
                     throw e;
                 }
             }
-            try {
-                await this.filesConfigService.updateReadonly(uri, true);
-            } catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                this.logger.error(
-                    `[registerContributedFile] Failed to make prompt file readonly: ${uri}`,
-                    msg
-                );
-            }
             return {
                 uri,
                 name,
                 description,
                 when,
+                sessionTypes,
                 storage: PromptsStorage.extension,
                 type,
                 extension,
@@ -761,6 +823,7 @@ let PromptsService = class PromptsService extends Disposable {
             };
         })();
         bucket.set(uri, entryPromise);
+        this._enqueueReadonlyUpdate(uri);
         if (when) {
             this._contributedWhenClauses.set(`${type}/${( uri.toString())}`, when);
         }
@@ -789,6 +852,18 @@ let PromptsService = class PromptsService extends Disposable {
             }
         };
     }
+    _enqueueReadonlyUpdate(uri) {
+        this._pendingReadonlyUris.push(uri);
+        if (!this._pendingReadonlyFlush) {
+            this._pendingReadonlyFlush = true;
+            queueMicrotask(() => {
+                const uris = this._pendingReadonlyUris;
+                this._pendingReadonlyUris = [];
+                this._pendingReadonlyFlush = false;
+                void this.filesConfigService.updateReadonly(uris, true);
+            });
+        }
+    }
     _updateContributedWhenKeys() {
         this._contributedWhenKeys.clear();
         for (const whenClause of ( this._contributedWhenClauses.values())) {
@@ -797,6 +872,14 @@ let PromptsService = class PromptsService extends Disposable {
                 this._contributedWhenKeys.add(key);
             }
         }
+        for (const whenClauses of ( this._providerWhenClauses.values())) {
+            for (const whenClause of whenClauses) {
+                const expr = ContextKeyExpr.deserialize(whenClause);
+                for (const key of expr?.keys() ?? []) {
+                    this._contributedWhenKeys.add(key);
+                }
+            }
+        }
     }
     getPromptLocationLabel(promptPath) {
         switch (promptPath.storage) {
@@ -805,17 +888,17 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(7627, "User Data");
+            return localize(7746, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    7628,
+                    7747,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
         case PromptsStorage.plugin:
-            return localize(7629, "Plugin");
+            return localize(7748, "Plugin");
         default:
             assertNever(promptPath, "Unknown prompt storage type");
         }
@@ -843,7 +926,7 @@ let PromptsService = class PromptsService extends Disposable {
         } else {
             rootFiles.push({
                 fileName: AGENT_MD_FILENAME,
-                type: AgentFileType.agentsMd
+                type: AgentInstructionFileType.agentsMd
             });
         }
         const useClaudeMD = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_MD);
@@ -852,12 +935,12 @@ let PromptsService = class PromptsService extends Disposable {
         } else {
             const claudeMdFile = {
                 fileName: CLAUDE_MD_FILENAME,
-                type: AgentFileType.claudeMd
+                type: AgentInstructionFileType.claudeMd
             };
             rootFiles.push(claudeMdFile);
             rootFiles.push({
                 fileName: CLAUDE_LOCAL_MD_FILENAME,
-                type: AgentFileType.claudeMd
+                type: AgentInstructionFileType.claudeMd
             });
             promises.push(this.fileLocator.findFilesInRoots(
                 rootFolders,
@@ -880,7 +963,7 @@ let PromptsService = class PromptsService extends Disposable {
         } else {
             const githubConfigFiles = [{
                 fileName: COPILOT_CUSTOM_INSTRUCTIONS_FILENAME,
-                type: AgentFileType.copilotInstructionsMd
+                type: AgentInstructionFileType.copilotInstructionsMd
             }];
             promises.push(this.fileLocator.findFilesInRoots(
                 rootFolders,
@@ -1025,35 +1108,24 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeSkills() {
         return this.cachedSkills.onDidChangePromise;
     }
-    async findAgentSkills(token, sessionResource) {
+    get onDidChangeHooks() {
+        return this.cachedHooks.onDidChangePromise;
+    }
+    async findAgentSkills(token) {
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
         if (!useAgentSkills) {
             return undefined;
         }
-        const sw = StopWatch.create();
-        const result = await this.cachedSkills.get(token);
-        if (sessionResource) {
-            const elapsed = sw.elapsed();
-            void this.getSkillDiscoveryInfo(token).catch(() => undefined).then(discoveryInfo => {
-                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(7632, "Load Skills")),
-                    details,
-                    discoveryInfo,
-                    category: "discovery"
-                });
-            });
-        }
+        const discoveryInfo = await this.cachedSkills.get(token);
+        const result = this.skillsFromDiscoveryInfo(discoveryInfo);
         return result;
     }
-    async computeAgentSkills(token) {
-        const files = await this.computeSkillDiscoveryInfo(token);
+    skillsFromDiscoveryInfo(discoveryInfo) {
         const result = [];
-        const skillsBySource = ( new Map());
-        for (const file of files) {
+        for (const file of discoveryInfo.files) {
             if (file.status === "loaded" && file.promptPath.name) {
                 const sanitizedDescription = this.truncateAgentSkillDescription(file.promptPath.description, file.promptPath.uri);
+                const when = isExtensionPromptPath(file.promptPath) && file.promptPath.when ? ContextKeyExpr.deserialize(file.promptPath.when) ?? undefined : undefined;
                 result.push({
                     uri: file.promptPath.uri,
                     storage: file.promptPath.storage,
@@ -1061,10 +1133,22 @@ let PromptsService = class PromptsService extends Disposable {
                     description: sanitizedDescription,
                     disableModelInvocation: file.disableModelInvocation ?? false,
                     userInvocable: file.userInvocable ?? true,
-                    when: undefined,
+                    when,
                     pluginUri: file.promptPath.pluginUri,
-                    extension: file.promptPath.extension
+                    extension: file.promptPath.extension,
+                    sessionTypes: file.promptPath.sessionTypes
                 });
+            }
+        }
+        return result;
+    }
+    async computeSkillDiscovery(token) {
+        const stopWatch = StopWatch.create(true);
+        const files = await this.computeSkillDiscoveryInfo(token);
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
+        const skillsBySource = ( new Map());
+        for (const file of files) {
+            if (file.status === "loaded" && file.promptPath.name) {
                 const source = file.promptPath.source;
                 if (source) {
                     skillsBySource.set(source, (skillsBySource.get(source) || 0) + 1);
@@ -1097,8 +1181,9 @@ let PromptsService = class PromptsService extends Disposable {
                 }
             }
         }
+        const totalSkillsFound = files.filter(f => f.status === "loaded" && f.promptPath.name).length;
         this.telemetryService.publicLog2("agentSkillsFound", {
-            totalSkillsFound: result.length,
+            totalSkillsFound,
             claudePersonal: skillsBySource.get(PromptFileSource.ClaudePersonal) ?? 0,
             claudeWorkspace: skillsBySource.get(PromptFileSource.ClaudeWorkspace) ?? 0,
             copilotPersonal: skillsBySource.get(PromptFileSource.CopilotPersonal) ?? 0,
@@ -1116,51 +1201,55 @@ let PromptsService = class PromptsService extends Disposable {
             skippedNameMismatch,
             skippedParseFailed
         });
+        return {
+            type: PromptsType.skill,
+            files,
+            sourceFolders,
+            durationInMillis: stopWatch.elapsed()
+        };
+    }
+    async getHooks(token) {
+        const discoveryInfo = await this.cachedHooks.get(token);
+        const result = discoveryInfo.hooksInfo;
         return result;
     }
-    async getHooks(token, sessionResource) {
-        const sw = StopWatch.create();
-        const result = await this.cachedHooks.get(token);
-        if (sessionResource) {
-            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(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(7635, "Load Hooks")),
-                    details,
-                    discoveryInfo,
-                    category: "discovery"
-                });
-            });
+    async getDiscoveryInfo(type, token) {
+        switch (type) {
+        case PromptsType.instructions:
+            return this.cachedInstructions.get(token);
+        case PromptsType.prompt:
+            return this.cachedSlashCommands.get(token);
+        case PromptsType.agent:
+            return this.cachedCustomAgents.get(token);
+        case PromptsType.skill:
+            return this.cachedSkills.get(token);
+        case PromptsType.hook:
+            return this.cachedHooks.get(token);
         }
-        return result;
     }
-    async getInstructionFiles(token, sessionResource) {
-        const sw = StopWatch.create();
+    async getInstructionFiles(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();
-            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"
-            });
+        const result = this.instructionsFromDiscoveryInfo(discoveryInfo);
+        return result;
+    }
+    instructionsFromDiscoveryInfo(discoveryInfo) {
+        const result = [];
+        for (const file of discoveryInfo.files) {
+            if (file.status === "loaded" && file.promptPath.name) {
+                const when = isExtensionPromptPath(file.promptPath) && file.promptPath.when ? ContextKeyExpr.deserialize(file.promptPath.when) ?? undefined : undefined;
+                result.push({
+                    uri: file.promptPath.uri,
+                    storage: file.promptPath.storage,
+                    extension: file.promptPath.extension,
+                    pluginUri: file.promptPath.pluginUri,
+                    source: file.promptPath.source,
+                    name: file.promptPath.name,
+                    description: file.promptPath.description,
+                    pattern: file.pattern,
+                    when,
+                    sessionTypes: file.promptPath.sessionTypes
+                });
+            }
         }
         return result;
     }
@@ -1175,63 +1264,100 @@ let PromptsService = class PromptsService extends Disposable {
         return await this.getInstructionsDiscoveryInfo(token);
     }
     async computeHooks(token) {
+        const stopWatch = StopWatch.create(true);
         const useChatHooks = this.configurationService.getValue(PromptsConfig.USE_CHAT_HOOKS);
-        if (!useChatHooks) {
-            return undefined;
-        }
-        if (!this.workspaceTrustService.isWorkspaceTrusted()) {
-            return undefined;
+        if (!useChatHooks || !this.workspaceTrustService.isWorkspaceTrusted()) {
+            const hookFiles = await this.listPromptFiles(PromptsType.hook, token);
+            const skipReason = !useChatHooks ? "disabled" : "workspace-untrusted";
+            const files = ( hookFiles.map(promptPath => ({
+                status: "skipped",
+                skipReason,
+                promptPath: this.withPromptPathMetadata(promptPath, basename(promptPath.uri), promptPath.description)
+            })));
+            const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.hook);
+            return {
+                type: PromptsType.hook,
+                files,
+                sourceFolders,
+                hooksInfo: undefined,
+                durationInMillis: stopWatch.elapsed()
+            };
         }
         const useClaudeHooks = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_HOOKS);
         const hookFiles = await this.listPromptFiles(PromptsType.hook, token);
         this.logger.trace(`[PromptsService] Found ${hookFiles.length} hook file(s).`);
         const userHomeUri = await this.pathService.userHome();
         const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
-        let hasDisabledClaudeHooks = false;
-        const collectedHooks = ( new Map());
         const defaultFolder = this.workspaceService.getWorkspace().folders[0];
-        for (const hookFile of hookFiles) {
+        const fileResults = await Promise.all(( hookFiles.map(async hookFile => {
+            const name = basename(hookFile.uri);
             if (hookFile.storage === PromptsStorage.plugin) {
-                continue;
+                return {
+                    file: {
+                        status: "loaded",
+                        promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                    }
+                };
             }
             try {
                 const content = await this.fileService.readFile(hookFile.uri);
                 const json = parse(( content.value.toString()));
+                if (!json || typeof json !== "object") {
+                    return {
+                        file: {
+                            status: "skipped",
+                            skipReason: "parse-error",
+                            errorMessage: "Invalid hooks file: must be a JSON object",
+                            promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                        }
+                    };
+                }
                 const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(hookFile.uri) ?? defaultFolder;
                 const workspaceRootUri = hookWorkspaceFolder?.uri;
                 const {
                     format,
-                    hooks,
+                    hooks: parsedHooks,
                     disabledAllHooks
                 } = parseHooksFromFile(hookFile.uri, json, workspaceRootUri, userHome);
                 if (disabledAllHooks) {
                     this.logger.trace(
                         `[PromptsService] Skipping hook file with disableAllHooks: ${hookFile.uri}`
                     );
-                    continue;
+                    return {
+                        file: {
+                            status: "skipped",
+                            skipReason: "all-hooks-disabled",
+                            promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                        }
+                    };
                 }
                 if (format === HookSourceFormat.Claude && useClaudeHooks === false) {
-                    const hasAnyCommands = ( [...( hooks.values())].some((
+                    const hasAnyCommands = ( [...( parsedHooks.values())].some((
                         {
                             hooks: cmds
                         }
                     ) => cmds.length > 0));
-                    if (hasAnyCommands) {
-                        hasDisabledClaudeHooks = true;
-                    }
                     this.logger.trace(
                         `[PromptsService] Skipping Claude hook file (disabled via setting): ${hookFile.uri}`
                     );
-                    continue;
+                    return {
+                        file: {
+                            status: "skipped",
+                            skipReason: "claude-hooks-disabled",
+                            promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                        },
+                        hasDisabledClaudeHooks: hasAnyCommands
+                    };
                 }
+                const hooks = ( new Map());
                 for (const [hookType, {
                     hooks: commands
-                }] of hooks) {
+                }] of parsedHooks) {
                     for (const command of commands) {
-                        let bucket = collectedHooks.get(hookType);
+                        let bucket = hooks.get(hookType);
                         if (!bucket) {
                             bucket = [];
-                            collectedHooks.set(hookType, bucket);
+                            hooks.set(hookType, bucket);
                         }
                         bucket.push(command);
                         this.logger.trace(
@@ -1239,8 +1365,56 @@ let PromptsService = class PromptsService extends Disposable {
                         );
                     }
                 }
+                return {
+                    file: {
+                        status: "loaded",
+                        promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                    },
+                    hooks,
+                    sourceUri: hookFile.uri
+                };
             } catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
                 this.logger.warn(`[PromptsService] Failed to parse hook file: ${hookFile.uri}`, error);
+                return {
+                    file: {
+                        status: "skipped",
+                        skipReason: "parse-error",
+                        errorMessage: msg,
+                        promptPath: this.withPromptPathMetadata(hookFile, name, hookFile.description)
+                    }
+                };
+            }
+        })));
+        const files = [];
+        let hasDisabledClaudeHooks = false;
+        const collectedHooks = ( new Map());
+        for (const {
+            file,
+            hooks,
+            sourceUri,
+            hasDisabledClaudeHooks: disabled
+        } of fileResults) {
+            if (file) {
+                files.push(file);
+            }
+            if (disabled) {
+                hasDisabledClaudeHooks = true;
+            }
+            if (hooks && sourceUri) {
+                for (const [hookType, commands] of hooks) {
+                    let bucket = collectedHooks.get(hookType);
+                    if (!bucket) {
+                        bucket = [];
+                        collectedHooks.set(hookType, bucket);
+                    }
+                    for (const command of commands) {
+                        bucket.push({
+                            ...command,
+                            sourceUri
+                        });
+                    }
+                }
             }
         }
         const plugins = this.agentPluginService.plugins.get();
@@ -1254,42 +1428,36 @@ let PromptsService = class PromptsService extends Disposable {
                     bucket = [];
                     collectedHooks.set(hook.type, bucket);
                 }
-                bucket.push(...hook.hooks);
+                for (const command of hook.hooks) {
+                    bucket.push({
+                        ...command,
+                        sourceUri: hook.uri
+                    });
+                }
             }
         }
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.hook);
         if (collectedHooks.size === 0) {
             this.logger.trace("[PromptsService] No valid hooks collected.");
-            return undefined;
-        }
-        const result = Object.fromEntries(collectedHooks);
-        this.logger.trace(`[PromptsService] Collected hooks: ${JSON.stringify(( Object.keys(result)))}`);
-        return {
-            hooks: result,
-            hasDisabledClaudeHooks
-        };
-    }
-    async getSkillDiscoveryInfo(token) {
-        const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
-        if (!useAgentSkills) {
-            const allFiles = await this.listPromptFiles(PromptsType.skill, token);
-            const files = ( allFiles.map(promptPath => ({
-                status: "skipped",
-                skipReason: "disabled",
-                promptPath
-            })));
-            const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
             return {
-                type: PromptsType.skill,
+                type: PromptsType.hook,
                 files,
-                sourceFolders
+                sourceFolders,
+                hooksInfo: undefined,
+                durationInMillis: stopWatch.elapsed()
             };
         }
-        const files = await this.computeSkillDiscoveryInfo(token);
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill);
+        const result = Object.fromEntries(collectedHooks);
+        this.logger.trace(`[PromptsService] Collected hooks: ${JSON.stringify(( Object.keys(result)))}`);
         return {
-            type: PromptsType.skill,
+            type: PromptsType.hook,
             files,
-            sourceFolders
+            sourceFolders,
+            hooksInfo: {
+                hooks: result,
+                hasDisabledClaudeHooks
+            },
+            durationInMillis: stopWatch.elapsed()
         };
     }
     async computeSkillDiscoveryInfo(token) {
@@ -1379,78 +1547,8 @@ let PromptsService = class PromptsService extends Disposable {
         }
         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;
-            if (( disabledAgents.has(uri))) {
-                files.push({
-                    status: "skipped",
-                    skipReason: "disabled",
-                    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({
-                    status: "loaded",
-                    promptPath: this.withPromptPathMetadata(promptPath, name, description)
-                });
-            } catch (e) {
-                files.push({
-                    status: "skipped",
-                    skipReason: "parse-error",
-                    errorMessage: e instanceof Error ? e.message : String(e),
-                    promptPath
-                });
-            }
-        }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.agent);
-        return {
-            type: PromptsType.agent,
-            files,
-            sourceFolders
-        };
-    }
-    async getPromptSlashCommandDiscoveryInfo(token) {
-        const files = [];
-        const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
-        for (const promptPath of promptFiles) {
-            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({
-                    status: "loaded",
-                    promptPath: this.withPromptPathMetadata(promptPath, name, description)
-                });
-            } catch (e) {
-                files.push({
-                    status: "skipped",
-                    skipReason: "parse-error",
-                    errorMessage: e instanceof Error ? e.message : String(e),
-                    promptPath
-                });
-            }
-        }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.prompt);
-        return {
-            type: PromptsType.prompt,
-            files,
-            sourceFolders
-        };
-    }
     async getInstructionsDiscoveryInfo(token) {
+        const stopWatch = StopWatch.create(true);
         const files = [];
         const instructionsFiles = await this.listPromptFiles(PromptsType.instructions, token);
         for (const promptPath of instructionsFiles) {
@@ -1459,8 +1557,10 @@ let PromptsService = class PromptsService extends Disposable {
                 const parsedPromptFile = await this.parseNew(uri, token);
                 const name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
                 const description = parsedPromptFile?.header?.description ?? promptPath.description;
+                const pattern = evaluateApplyToPattern(parsedPromptFile.header, isInClaudeRulesFolder(uri));
                 files.push({
                     status: "loaded",
+                    pattern,
                     promptPath: this.withPromptPathMetadata(promptPath, name, description)
                 });
             } catch (e) {
@@ -1476,79 +1576,8 @@ let PromptsService = class PromptsService extends Disposable {
         return {
             type: PromptsType.instructions,
             files,
-            sourceFolders
-        };
-    }
-    async getHookDiscoveryInfo(token) {
-        const files = [];
-        const userHomeUri = await this.pathService.userHome();
-        const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
-        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;
-            const name = basename(uri);
-            if (!this.workspaceTrustService.isWorkspaceTrusted()) {
-                files.push({
-                    status: "skipped",
-                    skipReason: "workspace-untrusted",
-                    promptPath: this.withPromptPathMetadata(promptPath, basename(promptPath.uri), promptPath.description)
-                });
-                continue;
-            }
-            if (getHookSourceFormat(uri) === HookSourceFormat.Claude && useClaudeHooks === false) {
-                files.push({
-                    status: "skipped",
-                    skipReason: "claude-hooks-disabled",
-                    promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
-                });
-                continue;
-            }
-            try {
-                const content = await this.fileService.readFile(uri);
-                const json = parse(( content.value.toString()));
-                if (!json || typeof json !== "object") {
-                    files.push({
-                        status: "skipped",
-                        skipReason: "parse-error",
-                        errorMessage: "Invalid hooks file: must be a JSON object",
-                        promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
-                    });
-                    continue;
-                }
-                const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(uri) ?? this.workspaceService.getWorkspace().folders[0];
-                const workspaceRootUri = hookWorkspaceFolder?.uri;
-                const {
-                    disabledAllHooks
-                } = parseHooksFromFile(uri, json, workspaceRootUri, userHome);
-                if (disabledAllHooks) {
-                    files.push({
-                        status: "skipped",
-                        skipReason: "all-hooks-disabled",
-                        promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
-                    });
-                    continue;
-                }
-                files.push({
-                    status: "loaded",
-                    promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
-                });
-            } catch (e) {
-                files.push({
-                    status: "skipped",
-                    skipReason: "parse-error",
-                    errorMessage: e instanceof Error ? e.message : String(e),
-                    promptPath: this.withPromptPathMetadata(promptPath, name, promptPath.description)
-                });
-            }
-        }
-        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.hook);
-        return {
-            type: PromptsType.hook,
-            files,
-            sourceFolders
+            sourceFolders,
+            durationInMillis: stopWatch.elapsed()
         };
     }
 };