@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

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

@@ -2,9 +2,10 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+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 '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { isEqual, dirname, joinPath, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -25,17 +26,25 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { PromptsConfig } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
 import { getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_CONFIG_FOLDER, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, PromptFileSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { PromptsType, PROMPT_LANGUAGE_ID, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptsType, PROMPT_LANGUAGE_ID, Target, getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, PromptHeaderAttributes } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser';
-import { PromptsStorage, ExtensionAgentSourceType, SKILL_PROVIDER_ACTIVATION_EVENT, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, Target, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+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 { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { getTarget, mapClaudeModels, mapClaudeTools } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator';
-import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { parseSubagentHooksFromYaml } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import { parseHooksFromFile, HookSourceFormat, getHookSourceFormat } 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';
+import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
+import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 class SkillMissingNameError extends Error {
     constructor(uri) {
@@ -73,7 +82,10 @@ let PromptsService = class PromptsService extends Disposable {
         extensionService,
         telemetryService,
         workspaceService,
-        pathService
+        pathService,
+        contextKeyService,
+        agentPluginService,
+        workspaceTrustService
     ) {
         super();
         this.logger = logger;
@@ -89,7 +101,12 @@ let PromptsService = class PromptsService extends Disposable {
         this.telemetryService = telemetryService;
         this.workspaceService = workspaceService;
         this.pathService = pathService;
+        this.contextKeyService = contextKeyService;
+        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 = {
@@ -99,39 +116,100 @@ let PromptsService = class PromptsService extends Disposable {
             [PromptsType.skill]: ( new ResourceMap()),
             [PromptsType.hook]: ( new ResourceMap())
         };
+        this._contributedWhenKeys = ( new Set());
+        this._contributedWhenClauses = ( 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.promptFileProviders = [];
         this.disabledPromptsStorageKeyPrefix = "chat.disabledPromptFiles.";
-        this.fileLocator = this.instantiationService.createInstance(PromptFilesLocator);
+        this.fileLocator = this.createPromptFilesLocator();
         this._register(this.modelService.onModelRemoved(model => {
             this.cachedParsedPromptFromModels.delete(model.uri);
         }));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(this._contributedWhenKeys)) {
+                for (const type of ( Object.keys(this.cachedFileLocations))) {
+                    this.cachedFileLocations[type] = undefined;
+                }
+                this._onDidContributedWhenChange.fire();
+            }
+        }));
         const modelChangeEvent = this._register(( new ModelChangeTracker(this.modelService))).onDidPromptChange;
         this.cachedCustomAgents = this._register(( new CachedPromise(token => this.computeCustomAgents(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.agent),
-            Event.filter(modelChangeEvent, e => e.promptType === PromptsType.agent)
+            Event.filter(modelChangeEvent, e => e.promptType === PromptsType.agent),
+            this._onDidContributedWhenChange.event,
+            Event.filter(
+                this.configurationService.onDidChangeConfiguration,
+                e => e.affectsConfiguration(PromptsConfig.USE_CUSTOM_AGENT_HOOKS)
+            )
         ))));
         this.cachedSlashCommands = this._register(( new CachedPromise(token => this.computePromptSlashCommands(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.prompt),
             this.getFileLocatorEvent(PromptsType.skill),
             Event.filter(modelChangeEvent, e => e.promptType === PromptsType.prompt),
-            Event.filter(modelChangeEvent, e => e.promptType === PromptsType.skill)
+            Event.filter(modelChangeEvent, e => e.promptType === PromptsType.skill),
+            this._onDidContributedWhenChange.event,
+            this._onDidPluginPromptFilesChange.event
         ))));
         this.cachedSkills = this._register(( new CachedPromise(token => this.computeAgentSkills(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.skill),
-            Event.filter(modelChangeEvent, e => e.promptType === PromptsType.skill)
+            Event.filter(modelChangeEvent, e => e.promptType === PromptsType.skill),
+            this._onDidContributedWhenChange.event,
+            this._onDidPluginPromptFilesChange.event
         ))));
         this.cachedHooks = this._register(( new CachedPromise(
             token => this.computeHooks(token),
             () => Event.any(this.getFileLocatorEvent(PromptsType.hook), Event.filter(
                 this.configurationService.onDidChangeConfiguration,
-                e => e.affectsConfiguration(PromptsConfig.USE_CHAT_HOOKS)
-            ), Event.filter(
-                this.configurationService.onDidChangeConfiguration,
-                e => e.affectsConfiguration(PromptsConfig.USE_CLAUDE_HOOKS)
-            ))
+                e => e.affectsConfiguration(PromptsConfig.USE_CHAT_HOOKS) || e.affectsConfiguration(PromptsConfig.USE_CLAUDE_HOOKS)
+            ), this._onDidPluginHooksChange.event, this.workspaceTrustService.onDidChangeTrust)
         )));
-        this._register(this.cachedHooks.onDidChange(() => {}));
         this._register(this.cachedSkills.onDidChange(() => {}));
+        this._register(this.cachedHooks.onDidChange(() => {}));
+        this._register(
+            this.watchPluginPromptFilesForType(PromptsType.prompt, (plugin, reader) => plugin.commands.read(reader))
+        );
+        this._register(
+            this.watchPluginPromptFilesForType(PromptsType.skill, (plugin, reader) => plugin.skills.read(reader))
+        );
+        this._register(
+            this.watchPluginPromptFilesForType(PromptsType.agent, (plugin, reader) => plugin.agents.read(reader))
+        );
+        this._register(autorun(reader => {
+            const plugins = this.agentPluginService.plugins.read(reader);
+            for (const plugin of plugins) {
+                plugin.hooks.read(reader);
+            }
+            this._onDidPluginHooksChange.fire();
+        }));
+    }
+    watchPluginPromptFilesForType(type, getItems) {
+        return autorun(reader => {
+            const plugins = this.agentPluginService.plugins.read(reader);
+            const nextFiles = [];
+            for (const plugin of plugins) {
+                for (const item of getItems(plugin, reader)) {
+                    nextFiles.push({
+                        uri: item.uri,
+                        storage: PromptsStorage.plugin,
+                        type,
+                        name: getCanonicalPluginCommandId(plugin, item.name),
+                        pluginUri: plugin.uri
+                    });
+                }
+            }
+            nextFiles.sort((a, b) => `${a.name ?? ""}|${( a.uri.toString())}`.localeCompare(`${b.name ?? ""}|${( b.uri.toString())}`));
+            this._pluginPromptFilesByType.set(type, nextFiles);
+            this.cachedFileLocations[type] = undefined;
+            this._onDidPluginPromptFilesChange.fire();
+        });
+    }
+    createPromptFilesLocator() {
+        return this.instantiationService.createInstance(PromptFilesLocator);
     }
     getFileLocatorEvent(type) {
         let event = this.fileLocatorEvents[type];
@@ -178,10 +256,41 @@ let PromptsService = class PromptsService extends Disposable {
                 storage: PromptsStorage.local,
                 type
             })))),
-            this.getExtensionPromptFiles(type, token)
+            this.getExtensionPromptFiles(type, token),
+            this._pluginPromptFilesByType.get(type) ?? []
         ]);
         return [...prompts.flat()];
     }
+    async _collectSourceFolderDiagnostics(type, foundFiles) {
+        const resolvedFolders = await this.fileLocator.getSourceFoldersInDiscoveryOrder(type);
+        const results = [];
+        for (const folder of resolvedFolders) {
+            const fileCount = foundFiles.filter(f => f.uri.path.startsWith(folder.uri.path + "/")).length;
+            let exists = fileCount > 0;
+            let errorMessage;
+            if (!exists) {
+                try {
+                    const stat = await this.fileService.stat(folder.uri);
+                    exists = stat.isDirectory;
+                } catch (e) {
+                    if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
+                        exists = false;
+                    } else {
+                        exists = false;
+                        errorMessage = e instanceof Error ? e.message : String(e);
+                    }
+                }
+            }
+            results.push({
+                uri: folder.uri,
+                storage: folder.storage,
+                exists,
+                fileCount,
+                errorMessage
+            });
+        }
+        return results;
+    }
     registerPromptFileProvider(extension, type, provider) {
         const providerEntry = {
             extension,
@@ -192,26 +301,28 @@ let PromptsService = class PromptsService extends Disposable {
         const disposables = ( new DisposableStore());
         if (provider.onDidChangePromptFiles) {
             disposables.add(provider.onDidChangePromptFiles(() => {
-                if (type === PromptsType.agent) {
-                    this.cachedFileLocations[PromptsType.agent] = undefined;
-                    this.cachedCustomAgents.refresh();
-                } else if (type === PromptsType.instructions) {
-                    this.cachedFileLocations[PromptsType.instructions] = undefined;
-                } else if (type === PromptsType.prompt) {
-                    this.cachedFileLocations[PromptsType.prompt] = undefined;
-                    this.cachedSlashCommands.refresh();
-                } else if (type === PromptsType.skill) {
-                    this.cachedFileLocations[PromptsType.skill] = undefined;
-                    this.cachedSkills.refresh();
-                    this.cachedSlashCommands.refresh();
-                }
+                this.invalidatePromptFileCache(type);
             }));
         }
+        this.invalidatePromptFileCache(type);
+        disposables.add({
+            dispose: () => {
+                const index = this.promptFileProviders.findIndex(p => p === providerEntry);
+                if (index >= 0) {
+                    this.promptFileProviders.splice(index, 1);
+                    this.invalidatePromptFileCache(type);
+                }
+            }
+        });
+        return disposables;
+    }
+    invalidatePromptFileCache(type) {
         if (type === PromptsType.agent) {
             this.cachedFileLocations[PromptsType.agent] = undefined;
             this.cachedCustomAgents.refresh();
         } else if (type === PromptsType.instructions) {
             this.cachedFileLocations[PromptsType.instructions] = undefined;
+            this._onDidChangeInstructions.fire();
         } else if (type === PromptsType.prompt) {
             this.cachedFileLocations[PromptsType.prompt] = undefined;
             this.cachedSlashCommands.refresh();
@@ -220,28 +331,6 @@ let PromptsService = class PromptsService extends Disposable {
             this.cachedSkills.refresh();
             this.cachedSlashCommands.refresh();
         }
-        disposables.add({
-            dispose: () => {
-                const index = this.promptFileProviders.findIndex(p => p === providerEntry);
-                if (index >= 0) {
-                    this.promptFileProviders.splice(index, 1);
-                    if (type === PromptsType.agent) {
-                        this.cachedFileLocations[PromptsType.agent] = undefined;
-                        this.cachedCustomAgents.refresh();
-                    } else if (type === PromptsType.instructions) {
-                        this.cachedFileLocations[PromptsType.instructions] = undefined;
-                    } else if (type === PromptsType.prompt) {
-                        this.cachedFileLocations[PromptsType.prompt] = undefined;
-                        this.cachedSlashCommands.refresh();
-                    } else if (type === PromptsType.skill) {
-                        this.cachedFileLocations[PromptsType.skill] = undefined;
-                        this.cachedSkills.refresh();
-                        this.cachedSlashCommands.refresh();
-                    }
-                }
-            }
-        });
-        return disposables;
     }
     async listFromProviders(type, activationEvent, token) {
         const result = [];
@@ -268,7 +357,9 @@ let PromptsService = class PromptsService extends Disposable {
                         storage: PromptsStorage.extension,
                         type,
                         extension: providerEntry.extension,
-                        source: ExtensionAgentSourceType.provider
+                        source: ExtensionAgentSourceType.provider,
+                        name: file.name,
+                        description: file.description
                     });
                 }
             } catch (e) {
@@ -296,6 +387,8 @@ let PromptsService = class PromptsService extends Disposable {
                 storage: PromptsStorage.user,
                 type
             }))));
+        case PromptsStorage.plugin:
+            return this._pluginPromptFilesByType.get(type) ?? [];
         default:
             throw ( new Error(`[listPromptFilesForStorage] Unsupported prompt storage type: ${storage}`));
         }
@@ -303,7 +396,19 @@ let PromptsService = class PromptsService extends Disposable {
     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));
+        const contributedFiles = ( settledResults.filter(result => result.status === "fulfilled").map(result => result.value)).filter(file => {
+            if (!file.when) {
+                return true;
+            }
+            const expr = ContextKeyExpr.deserialize(file.when);
+            if (!expr) {
+                this.logger.warn(
+                    `[getExtensionPromptFiles] Ignoring contributed prompt file with invalid when clause: ${file.when}`
+                );
+                return false;
+            }
+            return this.contextKeyService.contextMatchesRules(expr);
+        });
         const activationEvent = this.getProviderActivationEvent(type);
         if (!activationEvent) {
             return contributedFiles;
@@ -327,16 +432,7 @@ let PromptsService = class PromptsService extends Disposable {
     }
     async getSourceFolders(type) {
         const result = [];
-        if (type === PromptsType.agent) {
-            const folders = await this.fileLocator.getAgentSourceFolders();
-            for (const uri of folders) {
-                result.push({
-                    uri,
-                    storage: PromptsStorage.local,
-                    type
-                });
-            }
-        } else if (type === PromptsType.hook) {
+        if (type === PromptsType.hook) {
             const hooksFolders = await this.fileLocator.getHookSourceFolders();
             for (const uri of hooksFolders) {
                 result.push({
@@ -370,8 +466,8 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeSlashCommands() {
         return this.cachedSlashCommands.onDidChange;
     }
-    async getPromptSlashCommands(token) {
-        return this.cachedSlashCommands.get(token);
+    async getPromptSlashCommands(token, sessionResource) {
+        return await this.cachedSlashCommands.get(token);
     }
     async computePromptSlashCommands(token) {
         const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
@@ -411,7 +507,7 @@ let PromptsService = class PromptsService extends Disposable {
         return result;
     }
     isValidSlashCommandName(command) {
-        return command.match(/^[\p{L}\d_\-\.]+$/u) !== null;
+        return command.match(/^[\p{L}\d_\-\.:]+$/u) !== null;
     }
     async resolvePromptSlashCommand(name, token) {
         const commands = await this.getPromptSlashCommands(token);
@@ -419,7 +515,7 @@ 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, "-");
+        name = name.replace(/[^\p{L}\d_\-\.:]+/gu, "-");
         return {
             name: name,
             description: parsedPromptFile?.header?.description ?? promptPath.description,
@@ -439,23 +535,47 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeCustomAgents() {
         return this.cachedCustomAgents.onDidChange;
     }
-    async getCustomAgents(token) {
-        return this.cachedCustomAgents.get(token);
+    get onDidChangeInstructions() {
+        return Event.any(
+            this.getFileLocatorEvent(PromptsType.instructions),
+            this._onDidContributedWhenChange.event,
+            this._onDidChangeInstructions.event
+        );
+    }
+    async getCustomAgents(token, sessionResource) {
+        const sw = StopWatch.create();
+        const result = await this.cachedCustomAgents.get(token);
+        if (sessionResource) {
+            const elapsed = sw.elapsed();
+            const discoveryInfo = await this.getAgentDiscoveryInfo(token);
+            const details = result.length === 1 ? ( localize(7327, "Resolved {0} agent in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7328, "Resolved {0} agents in {1}ms", result.length, elapsed.toFixed(1)));
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7329, "Load Agents")),
+                details,
+                discoveryInfo,
+                category: "discovery"
+            });
+        }
+        return result;
     }
     async computeCustomAgents(token) {
         let agentFiles = 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 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 === "object") {
+                if (advanced && advanced.value.type === "map") {
                     metadata = {};
                     for (const [key, value] of Object.entries(advanced.value)) {
-                        if (["string", "number", "boolean"].includes(value.type)) {
+                        if (value.type === "scalar") {
                             metadata[key] = value;
                         }
                     }
@@ -493,14 +613,14 @@ let PromptsService = class PromptsService extends Disposable {
                     source,
                     target,
                     visibility: {
-                        userInvokable: true,
-                        agentInvokable: true
+                        userInvocable: true,
+                        agentInvocable: true
                     }
                 };
             }
             const visibility = {
-                userInvokable: ast.header.userInvokable !== false,
-                agentInvokable: ast.header.infer === true || ast.header.disableModelInvocation !== true
+                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) {
@@ -516,6 +636,14 @@ let PromptsService = class PromptsService extends Disposable {
             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,
@@ -527,6 +655,7 @@ let PromptsService = class PromptsService extends Disposable {
                 target,
                 visibility,
                 agents,
+                hooks,
                 agentInstructions,
                 source
             };
@@ -562,7 +691,7 @@ let PromptsService = class PromptsService extends Disposable {
         }
         return ( new PromptFileParser()).parse(uri, ( fileContent.value.toString()));
     }
-    registerContributedFile(type, uri, extension, name, description) {
+    registerContributedFile(type, uri, extension, name, description, when) {
         const bucket = this.contributedFiles[type];
         if (( bucket.has(uri))) {
             return Disposable.None;
@@ -595,6 +724,7 @@ let PromptsService = class PromptsService extends Disposable {
                 uri,
                 name,
                 description,
+                when,
                 storage: PromptsStorage.extension,
                 type,
                 extension,
@@ -602,7 +732,11 @@ let PromptsService = class PromptsService extends Disposable {
             };
         })();
         bucket.set(uri, entryPromise);
+        if (when) {
+            this._contributedWhenClauses.set(`${type}/${( uri.toString())}`, when);
+        }
         const flushCachesIfRequired = () => {
+            this._updateContributedWhenKeys();
             this.cachedFileLocations[type] = undefined;
             switch (type) {
             case PromptsType.agent:
@@ -621,10 +755,20 @@ let PromptsService = class PromptsService extends Disposable {
         return {
             dispose: () => {
                 bucket.delete(uri);
+                this._contributedWhenClauses.delete(`${type}/${( uri.toString())}`);
                 flushCachesIfRequired();
             }
         };
     }
+    _updateContributedWhenKeys() {
+        this._contributedWhenKeys.clear();
+        for (const whenClause of ( this._contributedWhenClauses.values())) {
+            const expr = ContextKeyExpr.deserialize(whenClause);
+            for (const key of expr?.keys() ?? []) {
+                this._contributedWhenKeys.add(key);
+            }
+        }
+    }
     getPromptLocationLabel(promptPath) {
         switch (promptPath.storage) {
         case PromptsStorage.local:
@@ -632,17 +776,19 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(6569, "User Data");
+            return localize(7330, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    6570,
+                    7331,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
+        case PromptsStorage.plugin:
+            return localize(7332, "Plugin");
         default:
-            throw ( new Error("Unknown prompt storage type"));
+            assertNever(promptPath, "Unknown prompt storage type");
         }
     }
     async listNestedAgentMDs(token) {
@@ -843,12 +989,26 @@ let PromptsService = class PromptsService extends Disposable {
     get onDidChangeSkills() {
         return this.cachedSkills.onDidChange;
     }
-    async findAgentSkills(token) {
+    async findAgentSkills(token, sessionResource) {
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
         if (!useAgentSkills) {
             return undefined;
         }
-        return this.cachedSkills.get(token);
+        const sw = StopWatch.create();
+        const result = await this.cachedSkills.get(token);
+        if (sessionResource) {
+            const elapsed = sw.elapsed();
+            const discoveryInfo = await this.getSkillDiscoveryInfo(token);
+            const details = result.length === 1 ? ( localize(7333, "Resolved {0} skill in {1}ms", result.length, elapsed.toFixed(1))) : ( localize(7334, "Resolved {0} skills in {1}ms", result.length, elapsed.toFixed(1)));
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7335, "Load Skills")),
+                details,
+                discoveryInfo,
+                category: "discovery"
+            });
+        }
+        return result;
     }
     async computeAgentSkills(token) {
         const {
@@ -865,7 +1025,7 @@ let PromptsService = class PromptsService extends Disposable {
                     name: file.name,
                     description: sanitizedDescription,
                     disableModelInvocation: file.disableModelInvocation ?? false,
-                    userInvokable: file.userInvokable ?? true
+                    userInvocable: file.userInvocable ?? true
                 });
             }
         }
@@ -907,6 +1067,7 @@ let PromptsService = class PromptsService extends Disposable {
             configPersonal: skillsBySource.get(PromptFileSource.ConfigPersonal) ?? 0,
             extensionContribution: skillsBySource.get(PromptFileSource.ExtensionContribution) ?? 0,
             extensionAPI: skillsBySource.get(PromptFileSource.ExtensionAPI) ?? 0,
+            plugin: skillsBySource.get(PromptFileSource.Plugin) ?? 0,
             skippedDuplicateName,
             skippedMissingName,
             skippedMissingDescription,
@@ -915,40 +1076,73 @@ let PromptsService = class PromptsService extends Disposable {
         });
         return result;
     }
-    async getHooks(token) {
-        return this.cachedHooks.get(token);
+    async getHooks(token, sessionResource) {
+        const sw = StopWatch.create();
+        const result = await this.cachedHooks.get(token);
+        if (sessionResource) {
+            const elapsed = sw.elapsed();
+            const hookCount = result ? ( Object.values(result.hooks)).reduce((sum, arr) => sum + arr.length, 0) : 0;
+            const discoveryInfo = await this.getHookDiscoveryInfo(token);
+            const details = hookCount === 1 ? ( localize(7336, "Resolved {0} hook in {1}ms", hookCount, elapsed.toFixed(1))) : ( localize(7337, "Resolved {0} hooks in {1}ms", hookCount, elapsed.toFixed(1)));
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7338, "Load Hooks")),
+                details,
+                discoveryInfo,
+                category: "discovery"
+            });
+        }
+        return result;
+    }
+    async getInstructionFiles(token, sessionResource) {
+        const sw = StopWatch.create();
+        const result = await this.listPromptFiles(PromptsType.instructions, token);
+        if (sessionResource) {
+            const elapsed = sw.elapsed();
+            const discoveryInfo = await this.getInstructionsDiscoveryInfo(token);
+            const details = result.length === 1 ? ( localize(
+                7339,
+                "Resolved {0} instruction in {1}ms",
+                result.length,
+                elapsed.toFixed(1)
+            )) : ( localize(
+                7340,
+                "Resolved {0} instructions in {1}ms",
+                result.length,
+                elapsed.toFixed(1)
+            ));
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7341, "Load Instructions")),
+                details,
+                discoveryInfo,
+                category: "discovery"
+            });
+        }
+        return result;
     }
     async computeHooks(token) {
         const useChatHooks = this.configurationService.getValue(PromptsConfig.USE_CHAT_HOOKS);
         if (!useChatHooks) {
             return undefined;
         }
-        const useClaudeHooks = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_HOOKS);
-        const hookFiles = await this.listPromptFiles(PromptsType.hook, token);
-        if (hookFiles.length === 0) {
-            this.logger.trace("[PromptsService] No hook files found.");
+        if (!this.workspaceTrustService.isWorkspaceTrusted()) {
             return undefined;
         }
+        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;
-        const workspaceFolder = this.workspaceService.getWorkspace().folders[0];
-        const workspaceRootUri = workspaceFolder?.uri;
         let hasDisabledClaudeHooks = false;
-        const collectedHooks = {
-            [HookType.SessionStart]: [],
-            [HookType.UserPromptSubmit]: [],
-            [HookType.PreToolUse]: [],
-            [HookType.PostToolUse]: [],
-            [HookType.PreCompact]: [],
-            [HookType.SubagentStart]: [],
-            [HookType.SubagentStop]: [],
-            [HookType.Stop]: []
-        };
+        const collectedHooks = ( new Map());
+        const defaultFolder = this.workspaceService.getWorkspace().folders[0];
         for (const hookFile of hookFiles) {
             try {
                 const content = await this.fileService.readFile(hookFile.uri);
                 const json = parse(( content.value.toString()));
+                const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(hookFile.uri) ?? defaultFolder;
+                const workspaceRootUri = hookWorkspaceFolder?.uri;
                 const {
                     format,
                     hooks,
@@ -978,7 +1172,12 @@ let PromptsService = class PromptsService extends Disposable {
                     hooks: commands
                 }] of hooks) {
                     for (const command of commands) {
-                        collectedHooks[hookType].push(command);
+                        let bucket = collectedHooks.get(hookType);
+                        if (!bucket) {
+                            bucket = [];
+                            collectedHooks.set(hookType, bucket);
+                        }
+                        bucket.push(command);
                         this.logger.trace(
                             `[PromptsService] Collected ${hookType} hook from ${hookFile.uri} (format: ${format})`
                         );
@@ -988,37 +1187,74 @@ let PromptsService = class PromptsService extends Disposable {
                 this.logger.warn(`[PromptsService] Failed to parse hook file: ${hookFile.uri}`, error);
             }
         }
-        const hasHooks = ( ( Object.values(collectedHooks)).some(arr => arr.length > 0));
-        if (!hasHooks) {
+        const plugins = this.agentPluginService.plugins.get();
+        for (const plugin of plugins) {
+            for (const hook of plugin.hooks.get()) {
+                let bucket = collectedHooks.get(hook.type);
+                if (!bucket) {
+                    bucket = [];
+                    collectedHooks.set(hook.type, bucket);
+                }
+                bucket.push(...hook.hooks);
+            }
+        }
+        if (collectedHooks.size === 0) {
             this.logger.trace("[PromptsService] No valid hooks collected.");
             return undefined;
         }
-        const result = Object.fromEntries(
-            Object.entries(collectedHooks).filter(([_, commands]) => commands.length > 0)
-        );
+        const result = Object.fromEntries(collectedHooks);
         this.logger.trace(`[PromptsService] Collected hooks: ${JSON.stringify(( Object.keys(result)))}`);
         return {
             hooks: result,
             hasDisabledClaudeHooks
         };
     }
-    async getPromptDiscoveryInfo(type, token) {
+    async getPromptDiscoveryInfo(type, token, sessionResource) {
+        if (sessionResource) {
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7342, "Discovery {0} (Start)", type)),
+                category: "discovery"
+            });
+        }
         const files = [];
+        let result;
         if (type === PromptsType.skill) {
-            return this.getSkillDiscoveryInfo(token);
+            result = await this.getSkillDiscoveryInfo(token);
         } else if (type === PromptsType.agent) {
-            return this.getAgentDiscoveryInfo(token);
+            result = await this.getAgentDiscoveryInfo(token);
         } else if (type === PromptsType.prompt) {
-            return this.getPromptSlashCommandDiscoveryInfo(token);
+            result = await this.getPromptSlashCommandDiscoveryInfo(token);
         } else if (type === PromptsType.instructions) {
-            return this.getInstructionsDiscoveryInfo(token);
+            result = await this.getInstructionsDiscoveryInfo(token);
         } else if (type === PromptsType.hook) {
-            return this.getHookDiscoveryInfo(token);
+            result = await this.getHookDiscoveryInfo(token);
+        } else {
+            result = {
+                type,
+                files
+            };
         }
-        return {
-            type,
-            files
-        };
+        const loadedCount = result.files.filter(f => f.status === "loaded").length;
+        const skippedCount = result.files.filter(f => f.status === "skipped").length;
+        if (!result.sourceFolders) {
+            const sourceFolders = await this._collectSourceFolderDiagnostics(type, result.files.filter(f => f.status === "loaded"));
+            result = {
+                ...result,
+                sourceFolders
+            };
+        }
+        if (sessionResource) {
+            const details = ( localize(7343, "{0} loaded, {1} skipped", loadedCount, skippedCount));
+            this._onDidLogDiscovery.fire({
+                sessionResource,
+                name: ( localize(7344, "Discovery {0} (End)", type)),
+                details,
+                discoveryInfo: result,
+                category: "discovery"
+            });
+        }
+        return result;
     }
     async getSkillDiscoveryInfo(token) {
         const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
@@ -1031,17 +1267,21 @@ let PromptsService = class PromptsService extends Disposable {
                 skipReason: "disabled",
                 extensionId: promptPath.extension?.identifier?.value
             })));
+            const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill, []);
             return {
                 type: PromptsType.skill,
-                files
+                files,
+                sourceFolders
             };
         }
         const {
             files
         } = await this.computeSkillDiscoveryInfo(token);
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.skill, files.filter(f => f.status === "loaded"));
         return {
             type: PromptsType.skill,
-            files
+            files,
+            sourceFolders
         };
     }
     async computeSkillDiscoveryInfo(token) {
@@ -1052,10 +1292,15 @@ let PromptsService = class PromptsService extends Disposable {
         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
         }))));
         const getPriority = skill => {
             if (skill.storage === PromptsStorage.local) {
@@ -1064,13 +1309,16 @@ let PromptsService = class PromptsService extends Disposable {
             if (skill.storage === PromptsStorage.user) {
                 return 1;
             }
-            if (skill.source === PromptFileSource.ExtensionAPI) {
+            if (skill.storage === PromptsStorage.plugin) {
                 return 2;
             }
-            if (skill.source === PromptFileSource.ExtensionContribution) {
+            if (skill.source === PromptFileSource.ExtensionAPI) {
                 return 3;
             }
-            return 4;
+            if (skill.source === PromptFileSource.ExtensionContribution) {
+                return 4;
+            }
+            return 5;
         };
         allSkills.sort((a, b) => getPriority(a) - getPriority(b));
         const extensionIdByUri = ( new Map());
@@ -1152,7 +1400,7 @@ let PromptsService = class PromptsService extends Disposable {
                 seenNames.add(sanitizedName);
                 nameToUri.set(sanitizedName, uri);
                 const disableModelInvocation = parsedFile.header?.disableModelInvocation === true;
-                const userInvokable = parsedFile.header?.userInvokable !== false;
+                const userInvocable = parsedFile.header?.userInvocable !== false;
                 files.push({
                     uri,
                     storage,
@@ -1162,7 +1410,7 @@ let PromptsService = class PromptsService extends Disposable {
                     extensionId,
                     source,
                     disableModelInvocation,
-                    userInvokable
+                    userInvocable
                 });
                 skillsBySource.set(source, (skillsBySource.get(source) || 0) + 1);
             } catch (e) {
@@ -1226,9 +1474,11 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.agent, files.filter(f => f.status === "loaded"));
         return {
             type: PromptsType.agent,
-            files
+            files,
+            sourceFolders
         };
     }
     async getPromptSlashCommandDiscoveryInfo(token) {
@@ -1259,9 +1509,11 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.prompt, files.filter(f => f.status === "loaded"));
         return {
             type: PromptsType.prompt,
-            files
+            files,
+            sourceFolders
         };
     }
     async getInstructionsDiscoveryInfo(token) {
@@ -1292,17 +1544,17 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.instructions, files.filter(f => f.status === "loaded"));
         return {
             type: PromptsType.instructions,
-            files
+            files,
+            sourceFolders
         };
     }
     async getHookDiscoveryInfo(token) {
         const files = [];
         const userHomeUri = await this.pathService.userHome();
         const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
-        const workspaceFolder = this.workspaceService.getWorkspace().folders[0];
-        const workspaceRootUri = workspaceFolder?.uri;
         const useClaudeHooks = this.configurationService.getValue(PromptsConfig.USE_CLAUDE_HOOKS);
         const hookFiles = await this.listPromptFiles(PromptsType.hook, token);
         for (const promptPath of hookFiles) {
@@ -1310,6 +1562,17 @@ let PromptsService = class PromptsService extends Disposable {
             const storage = promptPath.storage;
             const extensionId = promptPath.extension?.identifier?.value;
             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
+                });
+                continue;
+            }
             if (getHookSourceFormat(uri) === HookSourceFormat.Claude && useClaudeHooks === false) {
                 files.push({
                     uri,
@@ -1336,6 +1599,8 @@ let PromptsService = class PromptsService extends Disposable {
                     });
                     continue;
                 }
+                const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(uri) ?? this.workspaceService.getWorkspace().folders[0];
+                const workspaceRootUri = hookWorkspaceFolder?.uri;
                 const {
                     disabledAllHooks
                 } = parseHooksFromFile(uri, json, workspaceRootUri, userHome);
@@ -1369,13 +1634,15 @@ let PromptsService = class PromptsService extends Disposable {
                 });
             }
         }
+        const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.hook, files.filter(f => f.status === "loaded"));
         return {
             type: PromptsType.hook,
-            files
+            files,
+            sourceFolders
         };
     }
 };
-PromptsService = ( __decorate([( __param(0, ILogService)), ( __param(1, ILabelService)), ( __param(2, IModelService)), ( __param(3, IInstantiationService)), ( __param(4, IUserDataProfileService)), ( __param(5, IConfigurationService)), ( __param(6, IFileService)), ( __param(7, IFilesConfigurationService)), ( __param(8, IStorageService)), ( __param(9, IExtensionService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkspaceContextService)), ( __param(12, IPathService))], PromptsService));
+PromptsService = ( __decorate([( __param(0, ILogService)), ( __param(1, ILabelService)), ( __param(2, IModelService)), ( __param(3, IInstantiationService)), ( __param(4, IUserDataProfileService)), ( __param(5, IConfigurationService)), ( __param(6, IFileService)), ( __param(7, IFilesConfigurationService)), ( __param(8, IStorageService)), ( __param(9, IExtensionService)), ( __param(10, ITelemetryService)), ( __param(11, IWorkspaceContextService)), ( __param(12, IPathService)), ( __param(13, IContextKeyService)), ( __param(14, IAgentPluginService)), ( __param(15, IWorkspaceTrustManagementService))], PromptsService));
 class CachedPromise extends Disposable {
     constructor(computeFn, getEvent, delay = 0) {
         super();
@@ -1468,6 +1735,11 @@ var IAgentSource;
                 extensionId: promptPath.extension.identifier,
                 type: promptPath.source
             };
+        } else if (promptPath.storage === PromptsStorage.plugin) {
+            return {
+                storage: PromptsStorage.plugin,
+                pluginUri: promptPath.pluginUri
+            };
         } else {
             return {
                 storage: promptPath.storage