add missing prompt enablement setting checks, add logging (microsoft#251633)

add missing promptEnebled setting checks, add logging

Author: aeschli

src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.ts

@@ -148,8 +148,7 @@ class ManageInstructionsFilesAction extends Action2 {
 			category: CHAT_CATEGORY,
 			menu: {
 				id: MenuId.ViewTitle,
-
-				when: ContextKeyExpr.equals('view', ChatViewId),
+				when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
 				order: 11,
 				group: '2_manage'
 			},

src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.ts

@@ -38,7 +38,7 @@ class ManageModeAction extends Action2 {
 					when: ChatContextKeys.Modes.hasCustomChatModes
 				}, {
 					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.equals('view', ChatViewId),
+					when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
 					order: 12,
 					group: '2_manage'
 				}

src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.ts

@@ -251,7 +251,7 @@ class ManagePromptFilesAction extends Action2 {
 			category: CHAT_CATEGORY,
 			menu: {
 				id: MenuId.ViewTitle,
-				when: ContextKeyExpr.equals('view', ChatViewId),
+				when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
 				order: 10,
 				group: '2_manage'
 			},

src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from '../../../../../../nls.js';
-import { getPromptsTypeForLanguageId, isValidPromptType, PROMPT_LANGUAGE_ID, PromptsType } from '../promptTypes.js';
+import { getPromptsTypeForLanguageId, PROMPT_LANGUAGE_ID, PromptsType } from '../promptTypes.js';
 import { PromptParser } from '../parsers/promptParser.js';
 import { match, splitGlobAware } from '../../../../../../base/common/glob.js';
 import { type URI } from '../../../../../../base/common/uri.js';
@@ -27,6 +27,8 @@ import { IUserDataProfileService } from '../../../../../services/userDataProfile
 import type { IChatPromptSlashCommand, ICustomChatMode, IMetadata, IPromptParserResult, IPromptPath, IPromptsService, TPromptsStorage } from './promptsService.js';
 import { getCleanPromptName, PROMPT_FILE_EXTENSION } from '../config/promptFileLocations.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { PromptsConfig } from '../config/config.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 
 /**
  * Provides prompt services.
@@ -57,6 +59,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IUserDataProfileService private readonly userDataService: IUserDataProfileService,
 		@ILanguageService private readonly languageService: ILanguageService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -126,6 +129,10 @@ export class PromptsService extends Disposable implements IPromptsService {
 	}
 
 	public async listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]> {
+		if (!PromptsConfig.enabled(this.configurationService)) {
+			return [];
+		}
+
 		const prompts = await Promise.all([
 			this.fileLocator.listFiles(type, 'user', token)
 				.then(withType('user', type)),
@@ -137,9 +144,9 @@ export class PromptsService extends Disposable implements IPromptsService {
 	}
 
 	public getSourceFolders(type: PromptsType): readonly IPromptPath[] {
-		// sanity check to make sure we don't miss a new
-		// prompt type that could be added in the future
-		assert(isValidPromptType(type), `Unknown prompt type '${type}'.`);
+		if (!PromptsConfig.enabled(this.configurationService)) {
+			return [];
+		}
 
 		const result: IPromptPath[] = [];
 
@@ -258,20 +265,25 @@ export class PromptsService extends Disposable implements IPromptsService {
 	public async findInstructionFilesFor(files: readonly URI[], ignoreInstructions?: ResourceSet): Promise<readonly { uri: URI; reason: string }[]> {
 		const instructionFiles = await this.listPromptFiles(PromptsType.instructions, CancellationToken.None);
 		if (instructionFiles.length === 0) {
+			this.logger.trace('[PromptsService#findInstructionFilesFor] No instruction files available.');
 			return [];
 		}
+		this.logger.trace(`[PromptsService#findInstructionFilesFor] ${files.length} input files provided. ${files.map(file => file.toString()).join(', ')}`);
+		this.logger.trace(`[PromptsService#findInstructionFilesFor] ${instructionFiles.length} instruction files available.`);
 
 		const result: { uri: URI; reason: string }[] = [];
 		const foundFiles = new ResourceSet();
 		for (const instructionFile of instructionFiles) {
 			const { metadata, uri } = await this.parse(instructionFile.uri, CancellationToken.None);
 
 			if (metadata?.promptType !== PromptsType.instructions) {
+				this.logger.trace(`[PromptsService#findInstructionFilesFor] Not an instruction file: ${uri}`);
 				continue;
 			}
 
 			if (ignoreInstructions?.has(uri) || foundFiles.has(uri)) {
 				// the instruction file is already part of the input or has already been processed
+				this.logger.trace(`[PromptsService#findInstructionFilesFor] Skipping already processed instruction file: ${uri}`);
 				continue;
 			}
 
@@ -310,6 +322,7 @@ export class PromptsService extends Disposable implements IPromptsService {
 			};
 
 
+			let matches = false;
 			for (const pattern of patterns) {
 				const matchResult = patterMatches(pattern);
 				if (matchResult !== false) {
@@ -319,11 +332,14 @@ export class PromptsService extends Disposable implements IPromptsService {
 
 					result.push({ uri, reason });
 					foundFiles.add(uri);
+					this.logger.trace(`[PromptsService#findInstructionFilesFor] ${uri} selected: ${reason}`);
+					matches = true;
 					break;
 				}
 			}
-
-
+			if (!matches) {
+				this.logger.trace(`[PromptsService#findInstructionFilesFor]  ${uri} no match: pattern: ${applyTo}`);
+			}
 		}
 		return result;
 	}