copilot-instructions.md not added when chat.promptFiles is disabled (#256573)

Author: aeschli

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -1586,6 +1586,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	private async _applyPromptFileIfSet(requestInput: IChatRequestInputOptions): Promise<IPromptParserResult | undefined> {
+		if (!PromptsConfig.enabled(this.configurationService)) {
+			// if prompts are not enabled, we don't need to do anything
+			return undefined;
+		}
+
 
 		let parseResult: IPromptParserResult | undefined;
 
@@ -1656,8 +1661,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			const isUserQuery = !query;
 
-			const instructionsEnabled = PromptsConfig.enabled(this.configurationService);
-			if (instructionsEnabled && !this.viewModel.editing) {
+			if (!this.viewModel.editing) {
 				// process the prompt command
 				await this._applyPromptFileIfSet(requestInputs);
 				await this._autoAttachInstructions(requestInputs);
@@ -1999,14 +2003,22 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	 * - instructions referenced in an already included instruction file
 	 */
 	private async _autoAttachInstructions({ attachedContext }: IChatRequestInputOptions): Promise<void> {
-		let readFileTool = this.toolsService.getToolByName('readFile');
-		const enablementMap = this.input.selectedToolsModel.enablementMap.get();
-		if (readFileTool && Iterable.some(enablementMap, ([tool, enabled]) => tool.id === readFileTool!.id && enabled === false)) {
-			readFileTool = undefined;
-		}
+		const promptsConfigEnabled = PromptsConfig.enabled(this.configurationService);
+		this.logService.debug(`ChatWidget#_autoAttachInstructions: ${PromptsConfig.KEY}: ${promptsConfigEnabled}`);
+
+		if (promptsConfigEnabled) {
+			let readFileTool = this.toolsService.getToolByName('readFile');
+			const enablementMap = this.input.selectedToolsModel.enablementMap.get();
+			if (readFileTool && Iterable.some(enablementMap, ([tool, enabled]) => tool.id === readFileTool!.id && enabled === false)) {
+				readFileTool = undefined;
+			}
 
-		const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, readFileTool);
-		await computer.collect(attachedContext, CancellationToken.None);
+			const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, readFileTool);
+			await computer.collect(attachedContext, CancellationToken.None);
+		} else {
+			const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, undefined);
+			await computer.collectCopilotInstructionsOnly(attachedContext, CancellationToken.None);
+		}
 
 		// add to attached list to make the instructions sticky
 		//this.inputPart.attachmentModel.addContext(...computer.autoAddedInstructions);

src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts

@@ -81,6 +81,17 @@ export class ComputeAutomaticInstructions {
 
 	}
 
+	public async collectCopilotInstructionsOnly(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void> {
+		const copilotInstructions = await this._getCopilotInstructions();
+		for (const entry of copilotInstructions) {
+			variables.add(entry);
+		}
+		this._logService.trace(`[InstructionsContextComputer]  ${copilotInstructions.length} Copilot instructions files added.`);
+		// add all instructions for all instruction files that are in the context
+		await this._addReferencedInstructions(variables, token);
+		return;
+	}
+
 	/** public for testing */
 	public async findInstructionFilesFor(instructionFiles: readonly IPromptPath[], context: { files: ResourceSet; instructions: ResourceSet }, token: CancellationToken): Promise<IPromptFileVariableEntry[]> {