@codingame/monaco-vscode-api 36.2.7 → 37.1.0

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

@@ -9,12 +9,13 @@ import { Disposable, MutableDisposable, DisposableStore } from '../../../../../.
 import { StopWatch } from '../../../../../../base/common/stopwatch.js';
 import '../../../../../../base/common/observableInternal/index.js';
 import { ResourceMap, ResourceSet } from '../../../../../../base/common/map.js';
-import { isEqual, dirname, basename } from '../../../../../../base/common/resources.js';
+import { isEqual, dirname, joinPath, basename } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { OffsetRange } from '../../../../../../editor/common/core/ranges/offsetRange.js';
 import { IModelService } from '../../../../../../editor/common/services/model.service.js';
 import { localize } from '../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
+import { isAgentBuiltinCustomizationUri } from '../../../../../../platform/agentHost/common/agentHostCustomizationUri.js';
 import { FileOperationError, FileOperationResult } from '../../../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -25,12 +26,12 @@ import { IStorageService } from '../../../../../../platform/storage/common/stora
 import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.service.js';
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.service.js';
 import { PromptsConfig } from '../config/config.js';
-import { getSkillFolderName, getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_CONFIG_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, GITHUB_CONFIG_FOLDER, COPILOT_CONFIG_FOLDER, isInClaudeRulesFolder } from '../config/promptFileLocations.js';
+import { getSkillFolderName, getCleanPromptName, AGENT_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_CONFIG_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, GITHUB_CONFIG_FOLDER, COPILOT_CONFIG_FOLDER, VOICE_INSTRUCTIONS_FILENAME, DICTATION_INSTRUCTIONS_FILENAME, isInClaudeRulesFolder } from '../config/promptFileLocations.js';
 import { PromptsType, PromptFileSource, PROMPT_LANGUAGE_ID, getPromptsTypeForLanguageId, Target } from '../promptTypes.js';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, evaluateApplyToPattern, PromptHeaderAttributes } from '../promptFileParser.js';
 import { PromptsStorage, matchesSessionType, IAgentSource, AgentInstructionFileType } from './promptsService.js';
-import { Delayer, raceCancellationError } from '../../../../../../base/common/async.js';
+import { Limiter, Delayer, raceCancellationError } from '../../../../../../base/common/async.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 import { parseSubagentHooksFromYaml } from '../hookSchema.js';
 import { parseHooksFromFile, HookSourceFormat } from '../hookCompatibility.js';
@@ -43,9 +44,18 @@ import { IAgentPluginService } from '../../plugins/agentPluginService.service.js
 import { isContributionEnabled } from '../../enablement.js';
 import { assertNever } from '../../../../../../base/common/assert.js';
 import { ExtensionPromptFileService } from './extensionPromptFileService.js';
+import { COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG, COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG } from '../../../../../../platform/policy/common/copilotManagedSettings.js';
+import { isPromptTypeBlocked } from '../../customizationLockdown.js';
+import { isAgentPluginForceEnabledByPolicy } from '../../plugins/agentPluginEnablement.js';
+import { ChatConfiguration } from '../../constants.js';
+import { observableFromEvent } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
+const PROMPT_FILE_DISCOVERY_CONCURRENCY = 10;
 let PromptsService = class PromptsService extends Disposable {
+    queueDiscoveryRead(task) {
+        return this._discoveryLimiter.queue(task);
+    }
     constructor(
         logger,
         labelService,
@@ -75,6 +85,7 @@ let PromptsService = class PromptsService extends Disposable {
         this.pathService = pathService;
         this.agentPluginService = agentPluginService;
         this.workspaceTrustService = workspaceTrustService;
+        this._discoveryLimiter = this._register(( new Limiter(PROMPT_FILE_DISCOVERY_CONCURRENCY)));
         this.agentInstructionsWatcher = this._register(( new MutableDisposable()));
         this._onDidChangeAgentInstructions = this._register(( new Emitter({
             onWillAddFirstListener: () => {
@@ -105,6 +116,17 @@ let PromptsService = class PromptsService extends Disposable {
         }));
         this.extensionPromptFiles = this._register(this.instantiationService.createInstance(ExtensionPromptFileService));
         const onDidChangeExtensionPromptFiles = this.extensionPromptFiles.onDidChange;
+        const onDidChangeCustomizationLockdown = Event.filter(
+            this.configurationService.onDidChangeConfiguration,
+            e => e.affectsConfiguration(COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG) || e.affectsConfiguration(COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG)
+        );
+        this._register(onDidChangeCustomizationLockdown(() => {
+            this.cachedFileLocations[PromptsType.agent] = undefined;
+            this.cachedFileLocations[PromptsType.skill] = undefined;
+            this.cachedFileLocations[PromptsType.hook] = undefined;
+            this.cachedFileLocations[PromptsType.instructions] = undefined;
+            this._onDidChangeAgentInstructions.fire();
+        }));
         this._register(onDidChangeExtensionPromptFiles(e => {
             this.cachedFileLocations[e.type] = undefined;
         }));
@@ -118,6 +140,7 @@ let PromptsService = class PromptsService extends Disposable {
             ),
             Event.filter(onDidChangeExtensionPromptFiles, e => e.type === PromptsType.agent),
             Event.filter(this._onDidPluginPromptFilesChange.event, t => t === PromptsType.agent),
+            onDidChangeCustomizationLockdown,
             this.workspaceTrustService.onDidChangeTrust
         ))));
         this.cachedSlashCommands = this._register(( new CachedPromise(token => this.computeSlashCommandDiscoveryInfo(token), () => Event.any(
@@ -132,20 +155,22 @@ let PromptsService = class PromptsService extends Disposable {
             Event.filter(
                 this._onDidPluginPromptFilesChange.event,
                 t => t === PromptsType.prompt || t === PromptsType.skill
-            )
+            ),
+            onDidChangeCustomizationLockdown
         ))));
         this.cachedSkills = this._register(( new CachedPromise(token => this.computeSkillDiscovery(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.skill),
             Event.filter(modelChangeEvent, e => e.promptType === PromptsType.skill),
             Event.filter(onDidChangeExtensionPromptFiles, e => e.type === PromptsType.skill),
-            Event.filter(this._onDidPluginPromptFilesChange.event, t => t === PromptsType.skill)
+            Event.filter(this._onDidPluginPromptFilesChange.event, t => t === PromptsType.skill),
+            onDidChangeCustomizationLockdown
         ))));
         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) || e.affectsConfiguration(PromptsConfig.USE_CLAUDE_HOOKS)
-            ), this._onDidPluginHooksChange.event, this.workspaceTrustService.onDidChangeTrust)
+            ), onDidChangeCustomizationLockdown, this._onDidPluginHooksChange.event, this.workspaceTrustService.onDidChangeTrust)
         )));
         this.cachedInstructions = this._register(( new CachedPromise(token => this.computeInstructionFiles(token), () => Event.any(
             this.getFileLocatorEvent(PromptsType.instructions),
@@ -153,7 +178,8 @@ let PromptsService = class PromptsService extends Disposable {
             Event.filter(
                 this._onDidPluginPromptFilesChange.event,
                 t => t === PromptsType.instructions
-            )
+            ),
+            onDidChangeCustomizationLockdown
         ))));
         this._register(
             this.watchPluginPromptFilesForType(PromptsType.prompt, (plugin, reader) => plugin.commands.read(reader))
@@ -168,11 +194,22 @@ let PromptsService = class PromptsService extends Disposable {
             PromptsType.instructions,
             (plugin, reader) => plugin.instructions.read(reader)
         ));
+        const managedHooksOnly = observableFromEvent(
+            this,
+            onDidChangeCustomizationLockdown,
+            () => this.configurationService.getValue(COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG) === true
+        );
+        const enabledPluginsPolicy = observableFromEvent(this, Event.filter(
+            this.configurationService.onDidChangeConfiguration,
+            e => e.affectsConfiguration(ChatConfiguration.EnabledPlugins)
+        ), () => this.configurationService.inspect(ChatConfiguration.EnabledPlugins).policyValue);
         this._register(autorun(reader => {
             const plugins = this.agentPluginService.plugins.read(reader);
+            const managedHooksOnlyValue = managedHooksOnly.read(reader);
+            const enabledPluginsPolicyValue = enabledPluginsPolicy.read(reader);
             const hookFiles = [];
             for (const plugin of plugins) {
-                if (isContributionEnabled(plugin.enablement.read(reader))) {
+                if (isContributionEnabled(plugin.enablement.read(reader)) && (!managedHooksOnlyValue || isAgentPluginForceEnabledByPolicy(plugin, enabledPluginsPolicyValue))) {
                     for (const hook of plugin.hooks.read(reader)) {
                         hookFiles.push({
                             uri: hook.uri,
@@ -254,23 +291,28 @@ let PromptsService = class PromptsService extends Disposable {
         return listPromise;
     }
     async computeListPromptFiles(type, token) {
+        const allowStandalone = !this.areStandalonePromptFilesBlocked(type);
         const prompts = await Promise.all([
-            this.fileLocator.listFiles(type, PromptsStorage.user, token).then(uris => ( uris.map(uri => ({
-                uri,
+            allowStandalone ? this.fileLocator.listFilesWithSource(type, PromptsStorage.user, token).then(files => ( files.map(file => ({
+                ...file,
                 storage: PromptsStorage.user,
                 type
-            })))),
-            this.fileLocator.listFiles(type, PromptsStorage.local, token).then(uris => ( uris.map(uri => ({
-                uri,
+            })))) : [],
+            allowStandalone ? this.fileLocator.listFilesWithSource(type, PromptsStorage.local, token).then(files => ( files.map(file => ({
+                ...file,
                 storage: PromptsStorage.local,
                 type
-            })))),
+            })))) : [],
             this.getExtensionPromptFiles(type, token),
-            this._pluginPromptFilesByType.get(type) ?? []
+            this._pluginPromptFilesByType.get(type) ?? [],
+            this.getBuiltinPromptFiles(type, token)
         ]);
         return prompts.flat();
     }
     async _collectSourceFolderDiagnostics(type) {
+        if (this.areStandalonePromptFilesBlocked(type)) {
+            return [];
+        }
         const resolvedFolders = await this.fileLocator.getSourceFoldersInDiscoveryOrder(type);
         return ( resolvedFolders.map(folder => ({
             uri: folder.uri,
@@ -280,22 +322,22 @@ let PromptsService = class PromptsService extends Disposable {
     registerPromptFileProvider(extension, type, provider) {
         return this.extensionPromptFiles.registerPromptFileProvider(extension, type, provider);
     }
-    async listPromptFilesForStorage(type, storage, token) {
+    async listPromptFilesForStorage(type, storage, token, root) {
         let promptPaths;
         switch (storage) {
         case PromptsStorage.extension:
             promptPaths = await this.getExtensionPromptFiles(type, token);
             break;
         case PromptsStorage.local:
-            promptPaths = await this.fileLocator.listFiles(type, PromptsStorage.local, token).then(uris => ( uris.map(uri => ({
-                uri,
+            promptPaths = this.areStandalonePromptFilesBlocked(type) ? [] : await this.fileLocator.listFilesWithSource(type, PromptsStorage.local, token, root).then(files => ( files.map(file => ({
+                ...file,
                 storage: PromptsStorage.local,
                 type
             }))));
             break;
         case PromptsStorage.user:
-            promptPaths = await this.fileLocator.listFiles(type, PromptsStorage.user, token).then(uris => ( uris.map(uri => ({
-                uri,
+            promptPaths = this.areStandalonePromptFilesBlocked(type) ? [] : await this.fileLocator.listFilesWithSource(type, PromptsStorage.user, token).then(files => ( files.map(file => ({
+                ...file,
                 storage: PromptsStorage.user,
                 type
             }))));
@@ -303,6 +345,9 @@ let PromptsService = class PromptsService extends Disposable {
         case PromptsStorage.plugin:
             promptPaths = this._pluginPromptFilesByType.get(type) ?? [];
             break;
+        case PromptsStorage.builtIn:
+            promptPaths = await this.getBuiltinPromptFiles(type, token);
+            break;
         default:
             throw ( new Error(`[listPromptFilesForStorage] Unsupported prompt storage type: ${storage}`));
         }
@@ -311,7 +356,13 @@ let PromptsService = class PromptsService extends Disposable {
     getExtensionPromptFiles(type, token) {
         return this.extensionPromptFiles.getExtensionPromptFiles(type, token);
     }
+    async getBuiltinPromptFiles(type, token) {
+        return [];
+    }
     async getSourceFolders(type) {
+        if (this.areStandalonePromptFilesBlocked(type)) {
+            return [];
+        }
         const result = [];
         if (type === PromptsType.hook) {
             const hooksFolders = await this.fileLocator.getHookSourceFolders();
@@ -323,28 +374,57 @@ let PromptsService = class PromptsService extends Disposable {
                     source: folder.source
                 });
             }
-        } else {
-            for (const uri of await this.fileLocator.getConfigBasedSourceFolders(type)) {
+            return result;
+        }
+        if (type === PromptsType.skill) {
+            const resolvedFolders = await this.fileLocator.getResolvedSourceFolders(type);
+            for (const folder of resolvedFolders) {
                 result.push({
-                    uri,
-                    storage: PromptsStorage.local,
-                    type
+                    uri: folder.searchRoot,
+                    storage: folder.storage,
+                    type,
+                    source: folder.source
                 });
             }
+            return result;
         }
-        if (type !== PromptsType.skill && type !== PromptsType.hook) {
-            const userHome = this.userDataService.currentProfile.promptsHome;
+        for (const uri of await this.fileLocator.getConfigBasedSourceFolders(type)) {
             result.push({
-                uri: userHome,
-                storage: PromptsStorage.user,
+                uri,
+                storage: PromptsStorage.local,
                 type
             });
         }
+        const userHome = this.userDataService.currentProfile.promptsHome;
+        result.push({
+            uri: userHome,
+            storage: PromptsStorage.user,
+            type
+        });
         return result;
     }
     async getResolvedSourceFolders(type) {
+        if (this.areStandalonePromptFilesBlocked(type)) {
+            return [];
+        }
         return this.fileLocator.getResolvedSourceFolders(type);
     }
+    areStandalonePromptFilesBlocked(type) {
+        const strictPluginOnly = this.configurationService.getValue(COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG);
+        return isPromptTypeBlocked(strictPluginOnly, type) || (type === PromptsType.hook && this.configurationService.getValue(COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG) === true);
+    }
+    areAgentHooksAllowed(promptPath) {
+        if (this.configurationService.getValue(COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG) === true) {
+            if (promptPath.storage !== PromptsStorage.plugin || !promptPath.pluginUri) {
+                return false;
+            }
+            const plugin = this.agentPluginService.plugins.get().find(candidate => isEqual(candidate.uri, promptPath.pluginUri));
+            const enabledPluginsPolicy = this.configurationService.inspect(ChatConfiguration.EnabledPlugins).policyValue;
+            return plugin !== undefined && isAgentPluginForceEnabledByPolicy(plugin, enabledPluginsPolicy);
+        }
+        const strictPluginOnly = this.configurationService.getValue(COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG);
+        return !isPromptTypeBlocked(strictPluginOnly, PromptsType.hook) || (promptPath.storage !== PromptsStorage.local && promptPath.storage !== PromptsStorage.user);
+    }
     get onDidChangeSlashCommands() {
         return this.cachedSlashCommands.onDidChangePromise;
     }
@@ -361,7 +441,7 @@ let PromptsService = class PromptsService extends Disposable {
         const disabledSkills = this.getDisabledPromptFiles(PromptsType.skill);
         const enabledSkills = skills.filter(s => !( disabledSkills.has(s.uri))).sort((a, b) => this.getSkillPriority(a) - this.getSkillPriority(b));
         const slashCommandFiles = [...promptFiles, ...enabledSkills];
-        const parseResults = await Promise.all(( slashCommandFiles.map(async promptPath => {
+        const parseResults = await Promise.all(( slashCommandFiles.map(promptPath => this.queueDiscoveryRead(async () => {
             try {
                 const parsedPromptFile = await this.parseNew(promptPath.uri, token);
                 let rawName;
@@ -384,10 +464,12 @@ let PromptsService = class PromptsService extends Disposable {
                     userInvocable
                 };
             } catch (e) {
-                this.logger.error(
-                    `[computeSlashCommandDiscoveryInfo] Failed to parse prompt file for slash command: ${promptPath.uri}`,
-                    e instanceof Error ? e.message : String(e)
-                );
+                if (!isCancellationError(e)) {
+                    this.logger.error(
+                        `[computeSlashCommandDiscoveryInfo] Failed to parse prompt file for slash command: ${promptPath.uri}`,
+                        e instanceof Error ? e.message : String(e)
+                    );
+                }
                 return {
                     status: "skipped",
                     skipReason: "parse-error",
@@ -395,7 +477,7 @@ let PromptsService = class PromptsService extends Disposable {
                     promptPath
                 };
             }
-        })));
+        }))));
         const seenSkillNames = ( new Set());
         const files = [];
         for (const result of parseResults) {
@@ -486,6 +568,9 @@ let PromptsService = class PromptsService extends Disposable {
             cmd => cmd.name === name && matchesSessionType(cmd.sessionTypes, sessionType)
         );
         if (command) {
+            if (isAgentBuiltinCustomizationUri(command.uri)) {
+                return command;
+            }
             return {
                 ...command,
                 parsedPromptFile: await this.parseNew(command.uri, token)
@@ -551,14 +636,14 @@ let PromptsService = class PromptsService extends Disposable {
         const userHomeUri = await this.pathService.userHome();
         const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
         const defaultFolder = this.workspaceService.getWorkspace().folders[0];
-        const files = await Promise.all(( allAgentFiles.map(async promptPath => {
+        const files = await Promise.all(( allAgentFiles.map(promptPath => this.queueDiscoveryRead(async () => {
             const uri = promptPath.uri;
             const isEnabled = !( disabledAgents.has(uri));
             try {
                 const ast = await this.parseNew(uri, token);
                 let hooks;
                 const hooksRaw = ast.header?.hooksRaw;
-                if (useChatHooks && isWorkspaceTrusted && hooksRaw) {
+                if (useChatHooks && isWorkspaceTrusted && hooksRaw && this.areAgentHooksAllowed(promptPath)) {
                     const hookWorkspaceFolder = this.workspaceService.getWorkspaceFolder(uri) ?? defaultFolder;
                     const workspaceRootUri = hookWorkspaceFolder?.uri;
                     const target = getTarget(PromptsType.agent, ast.header ?? promptPath.uri);
@@ -582,13 +667,16 @@ let PromptsService = class PromptsService extends Disposable {
                     agent
                 };
             } catch (e) {
+                if (isCancellationError(e)) {
+                    throw e;
+                }
                 const error = e instanceof Error ? e : ( new Error(String(e)));
                 if (error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
                     this.logger.warn(
                         `[computeAgentDiscoveryInfo] Skipping agent file that does not exist: ${uri}`,
                         error.message
                     );
-                } else if (!isCancellationError(e)) {
+                } else {
                     this.logger.error(`[computeAgentDiscoveryInfo] Failed to parse agent file: ${uri}`, error);
                 }
                 return {
@@ -598,7 +686,7 @@ let PromptsService = class PromptsService extends Disposable {
                     promptPath
                 };
             }
-        })));
+        }))));
         const sourceFolders = await this._collectSourceFolderDiagnostics(PromptsType.agent);
         return {
             type: PromptsType.agent,
@@ -628,22 +716,27 @@ let PromptsService = class PromptsService extends Disposable {
                 relative: true
             });
         case PromptsStorage.user:
-            return localize(8940, "User Data");
+            return localize(10853, "User Data");
         case PromptsStorage.extension:
             {
                 return localize(
-                    8941,
+                    10854,
                     "Extension: {0}",
                     promptPath.extension.displayName ?? promptPath.extension.id
                 );
             }
         case PromptsStorage.plugin:
-            return localize(8942, "Plugin");
+            return localize(10855, "Plugin");
+        case PromptsStorage.builtIn:
+            return localize(10856, "Built-in");
         default:
             assertNever(promptPath, "Unknown prompt storage type");
         }
     }
     async listNestedAgentMDs(token) {
+        if (this.areStandalonePromptFilesBlocked(PromptsType.instructions)) {
+            return [];
+        }
         const useAgentMD = this.configurationService.getValue(PromptsConfig.USE_AGENT_MD);
         if (!useAgentMD) {
             return [];
@@ -655,6 +748,9 @@ let PromptsService = class PromptsService extends Disposable {
         return [];
     }
     async listAgentInstructions(token, logger) {
+        if (this.areStandalonePromptFilesBlocked(PromptsType.instructions)) {
+            return [];
+        }
         const resolvedAgentFiles = [];
         const promises = [];
         const includeParents = this.configurationService.getValue(PromptsConfig.USE_CUSTOMIZATIONS_IN_PARENT_REPOS) === true;
@@ -752,6 +848,51 @@ let PromptsService = class PromptsService extends Disposable {
         }
         return result.sort((a, b) => ( a.uri.toString()).localeCompare(( b.uri.toString())));
     }
+    async getVoiceInstructions(token) {
+        return this.getSpeechInstructions(VOICE_INSTRUCTIONS_FILENAME, "voice", token);
+    }
+    async getDictationInstructions(token) {
+        return this.getSpeechInstructions(DICTATION_INSTRUCTIONS_FILENAME, "dictation", token);
+    }
+    async getSpeechInstructions(fileName, kind, token) {
+        const userHome = await this.pathService.userHome();
+        if (token.isCancellationRequested) {
+            return undefined;
+        }
+        const candidates = [joinPath(userHome, COPILOT_CONFIG_FOLDER, fileName)];
+        if (this.workspaceTrustService.isWorkspaceTrusted()) {
+            const workspaceRoots = await this.fileLocator.getWorkspaceFolderRoots(false);
+            if (token.isCancellationRequested) {
+                return undefined;
+            }
+            candidates.push(...( workspaceRoots.map(root => joinPath(root, GITHUB_CONFIG_FOLDER, fileName))));
+        }
+        const contents = [];
+        for (const candidate of candidates) {
+            if (token.isCancellationRequested) {
+                return undefined;
+            }
+            try {
+                const content = ( (await this.fileService.readFile(candidate, undefined, token)).value.toString()).trim();
+                if (token.isCancellationRequested) {
+                    return undefined;
+                }
+                if (content) {
+                    contents.push(content);
+                }
+            } catch (error) {
+                if (token.isCancellationRequested || isCancellationError(error)) {
+                    return undefined;
+                }
+                if (!(error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND)) {
+                    this.logger.warn(
+                        `[PromptsService] Failed to read ${kind} instructions from ${( candidate.toString())}: ${error}`
+                    );
+                }
+            }
+        }
+        return contents.length > 0 ? contents.join("\n\n") : undefined;
+    }
     getAgentFileURIFromModeFile(oldURI) {
         return this.fileLocator.getAgentFileURIFromModeFile(oldURI);
     }
@@ -1003,7 +1144,7 @@ let PromptsService = class PromptsService extends Disposable {
         const userHomeUri = await this.pathService.userHome();
         const userHome = userHomeUri.scheme === Schemas.file ? userHomeUri.fsPath : userHomeUri.path;
         const defaultFolder = this.workspaceService.getWorkspace().folders[0];
-        const fileResults = await Promise.all(( hookFiles.map(async hookFile => {
+        const fileResults = await Promise.all(( hookFiles.map(hookFile => this.queueDiscoveryRead(async () => {
             const name = basename(hookFile.uri);
             if (hookFile.storage === PromptsStorage.plugin) {
                 return {
@@ -1112,7 +1253,7 @@ let PromptsService = class PromptsService extends Disposable {
                     }
                 };
             }
-        })));
+        }))));
         const files = [];
         let hasDisabledClaudeHooks = false;
         const collectedHooks = ( new Map());
@@ -1145,8 +1286,10 @@ let PromptsService = class PromptsService extends Disposable {
             }
         }
         const plugins = this.agentPluginService.plugins.get();
+        const managedHooksOnlyValue = this.configurationService.getValue(COPILOT_ALLOW_MANAGED_HOOKS_ONLY_CONFIG) === true;
+        const enabledPluginsPolicyValue = this.configurationService.inspect(ChatConfiguration.EnabledPlugins).policyValue;
         for (const plugin of plugins) {
-            if (!isContributionEnabled(plugin.enablement.get())) {
+            if (!isContributionEnabled(plugin.enablement.get()) || (managedHooksOnlyValue && !isAgentPluginForceEnabledByPolicy(plugin, enabledPluginsPolicyValue))) {
                 continue;
             }
             for (const hook of plugin.hooks.get()) {
@@ -1210,10 +1353,16 @@ let PromptsService = class PromptsService extends Disposable {
         const seenNames = ( new Set());
         const nameToUri = ( new Map());
         const allSkills = [];
-        const discoveredSkills = await this.fileLocator.findAgentSkills(token);
-        const extensionSkills = await this.getExtensionPromptFiles(PromptsType.skill, token);
-        const pluginSkills = this._pluginPromptFilesByType.get(PromptsType.skill) ?? [];
-        allSkills.push(...discoveredSkills, ...extensionSkills, ...pluginSkills);
+        const standaloneSkills = this.areStandalonePromptFilesBlocked(PromptsType.skill) ? [] : await this.fileLocator.findAgentSkills(token);
+        const skills = await Promise.all([
+            Promise.resolve(standaloneSkills),
+            this.getExtensionPromptFiles(PromptsType.skill, token),
+            Promise.resolve(this._pluginPromptFilesByType.get(PromptsType.skill) ?? []),
+            this.getBuiltinPromptFiles(PromptsType.skill, token)
+        ]);
+        for (const skillList of skills) {
+            allSkills.push(...skillList);
+        }
         allSkills.sort((a, b) => this.getSkillPriority(a) - this.getSkillPriority(b));
         for (const skill of allSkills) {
             const uri = skill.uri;
@@ -1341,12 +1490,13 @@ class CachedPromise extends Disposable {
                 }
                 throw err;
             });
-            promise.finally(() => {
+            const disposePool = () => {
                 if (this.cachedPool === pool) {
                     this.cachedPool = undefined;
                 }
                 pool.dispose();
-            });
+            };
+            promise.then(disposePool, disposePool);
             this.cachedPromise = promise;
             this.cachedPool = pool;
         }

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.d.ts

@@ -4,7 +4,7 @@ import { IWorkspaceFolder } from "../../../../../../platform/workspace/common/wo
 import { IWorkspaceContextService } from "../../../../../../platform/workspace/common/workspace.service.js";
 import { IConfigurationService } from "../../../../../../platform/configuration/common/configuration.service.js";
 import { IPromptSourceFolder, IResolvedPromptSourceFolder } from "../config/promptFileLocations.js";
-import { PromptsType } from "../promptTypes.js";
+import { PromptFileSource, PromptsType } from "../promptTypes.js";
 import { IWorkbenchEnvironmentService } from "../../../../../services/environment/common/environmentService.service.js";
 import { ISearchService } from "../../../../../services/search/common/search.service.js";
 import { CancellationToken } from "../../../../../../base/common/cancellation.js";
@@ -46,7 +46,7 @@ export declare class PromptFilesLocator {
      * Subclasses can override to filter out unsupported sources.
      */
     protected getDefaultSourceFolders(type: PromptsType): readonly IPromptSourceFolder[];
-    getWorkspaceFolderRoots(includeParents: boolean, logger?: Logger): Promise<URI[]>;
+    getWorkspaceFolderRoots(includeParents: boolean, logger?: Logger, root?: URI): Promise<URI[]>;
     /**
      * Walks up from {@link folderUri} collecting parent folders until a
      * repository root (a folder containing `.git`) is found.  Returns the
@@ -60,7 +60,14 @@ export declare class PromptFilesLocator {
      *
      * @returns List of prompt files found in the workspace.
      */
-    listFiles(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly URI[]>;
+    listFiles(type: PromptsType, storage: PromptsStorage, token: CancellationToken, root?: URI): Promise<readonly URI[]>;
+    listFilesWithSource(type: PromptsType, storage: PromptsStorage, token: CancellationToken, root?: URI): Promise<readonly {
+        uri: URI;
+        source: PromptFileSource;
+    }[]>;
+    private isUserDataPromptType;
+    private isUserDataPromptFile;
+    private sourceFolderOverlapsUserData;
     createFilesUpdatedEvent(type: PromptsType): {
         readonly event: Event<void>;
         dispose: () => void;