Add proposed API for prompt files providers

src/vs/workbench/api/browser/mainThreadChatAgents2.ts

@@ -26,7 +26,7 @@ import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIde
 import { IChatWidgetService } from '../../contrib/chat/browser/chat.js';
 import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js';
 import { IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js';
-import { ICustomAgentQueryOptions, IPromptsService } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { ICustomAgentQueryOptions, IPromptsService, IInstructionQueryOptions } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
 import { IChatEditingService, IChatRelatedFileProviderMetadata } from '../../contrib/chat/common/chatEditingService.js';
 import { IChatModel } from '../../contrib/chat/common/chatModel.js';
 import { ChatRequestAgentPart } from '../../contrib/chat/common/chatParserTypes.js';
@@ -98,6 +98,8 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 
 	private readonly _customAgentsProviders = this._register(new DisposableMap<number, IDisposable>());
 	private readonly _customAgentsProviderEmitters = this._register(new DisposableMap<number, Emitter<void>>());
+	private readonly _instructionsProviders = this._register(new DisposableMap<number, IDisposable>());
+	private readonly _instructionsProviderEmitters = this._register(new DisposableMap<number, Emitter<void>>());
 
 	private readonly _pendingProgress = new Map<string, { progress: (parts: IChatProgress[]) => void; chatSession: IChatModel | undefined }>();
 	private readonly _proxy: ExtHostChatAgentsShape2;
@@ -468,6 +470,46 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 			emitter.fire();
 		}
 	}
+
+	async $registerInstructionsProvider(handle: number, extensionId: ExtensionIdentifier): Promise<void> {
+		const extension = await this._extensionService.getExtension(extensionId.value);
+		if (!extension) {
+			this._logService.error(`[MainThreadChatAgents2] Could not find extension for InstructionsProvider: ${extensionId.value}`);
+			return;
+		}
+
+		const emitter = new Emitter<void>();
+		this._instructionsProviderEmitters.set(handle, emitter);
+
+		const disposable = this._promptsService.registerInstructionsProvider(extension, {
+			onDidChangeInstructions: emitter.event,
+			provideInstructions: async (options: IInstructionQueryOptions, token: CancellationToken) => {
+				const instructions = await this._proxy.$provideInstructions(handle, options, token);
+				if (!instructions) {
+					return undefined;
+				}
+				// Convert UriComponents to URI
+				return instructions.map(instruction => ({
+					...instruction,
+					uri: URI.revive(instruction.uri)
+				}));
+			}
+		});
+
+		this._instructionsProviders.set(handle, disposable);
+	}
+
+	$unregisterInstructionsProvider(handle: number): void {
+		this._instructionsProviders.deleteAndDispose(handle);
+		this._instructionsProviderEmitters.deleteAndDispose(handle);
+	}
+
+	$onDidChangeInstructions(handle: number): void {
+		const emitter = this._instructionsProviderEmitters.get(handle);
+		if (emitter) {
+			emitter.fire();
+		}
+	}
 }
 
 

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -1545,6 +1545,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
 				return extHostChatAgents2.registerCustomAgentsProvider(extension, provider);
 			},
+			registerInstructionsProvider(provider: vscode.InstructionsProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
+				return extHostChatAgents2.registerInstructionsProvider(extension, provider);
+			},
 		};
 
 		// namespace: lm

src/vs/workbench/api/common/extHost.protocol.ts

@@ -65,7 +65,7 @@ import { IChatRequestVariableValue } from '../../contrib/chat/common/chatVariabl
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatMessage, IChatResponsePart, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep, IToolResult, ToolDataSource } from '../../contrib/chat/common/languageModelToolsService.js';
-import { ICustomAgentQueryOptions, IExternalCustomAgent } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { ICustomAgentQueryOptions, IExternalCustomAgent, IInstructionQueryOptions, IExternalInstruction } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
@@ -1397,6 +1397,9 @@ export interface MainThreadChatAgentsShape2 extends IChatAgentProgressShape, IDi
 	$registerCustomAgentsProvider(handle: number, extension: ExtensionIdentifier): void;
 	$unregisterCustomAgentsProvider(handle: number): void;
 	$onDidChangeCustomAgents(handle: number): void;
+	$registerInstructionsProvider(handle: number, extension: ExtensionIdentifier): void;
+	$unregisterInstructionsProvider(handle: number): void;
+	$onDidChangeInstructions(handle: number): void;
 	$registerAgentCompletionsProvider(handle: number, id: string, triggerCharacters: string[]): void;
 	$unregisterAgentCompletionsProvider(handle: number, id: string): void;
 	$updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
@@ -1462,6 +1465,7 @@ export interface ExtHostChatAgentsShape2 {
 	$detectChatParticipant(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { participants: IChatParticipantMetadata[]; location: ChatAgentLocation }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
 	$provideRelatedFiles(handle: number, request: Dto<IChatRequestDraft>, token: CancellationToken): Promise<Dto<IChatRelatedFile>[] | undefined>;
 	$provideCustomAgents(handle: number, options: ICustomAgentQueryOptions, token: CancellationToken): Promise<Dto<IExternalCustomAgent>[] | undefined>;
+	$provideInstructions(handle: number, options: IInstructionQueryOptions, token: CancellationToken): Promise<Dto<IExternalInstruction>[] | undefined>;
 	$setRequestTools(requestId: string, tools: UserSelectedTools): void;
 }
 export interface IChatParticipantMetadata {

src/vs/workbench/api/common/extHostChatAgents2.ts

@@ -35,7 +35,7 @@ import { ExtHostLanguageModels } from './extHostLanguageModels.js';
 import { ExtHostLanguageModelTools } from './extHostLanguageModelTools.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
-import { ICustomAgentQueryOptions, IExternalCustomAgent } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { ICustomAgentQueryOptions, IExternalCustomAgent, IInstructionQueryOptions, IExternalInstruction } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 
 export class ChatAgentResponseStream {
@@ -400,6 +400,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 	private static _customAgentsProviderIdPool = 0;
 	private readonly _customAgentsProviders = new Map<number, { extension: IExtensionDescription; provider: vscode.CustomAgentsProvider }>();
+	private static _instructionsProviderIdPool = 0;
+	private readonly _instructionsProviders = new Map<number, { extension: IExtensionDescription; provider: vscode.InstructionsProvider }>();
 
 	private readonly _sessionDisposables: DisposableResourceMap<DisposableStore> = this._register(new DisposableResourceMap());
 	private readonly _completionDisposables: DisposableMap<number, DisposableStore> = this._register(new DisposableMap());
@@ -501,6 +503,28 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return disposables;
 	}
 
+	registerInstructionsProvider(extension: IExtensionDescription, provider: vscode.InstructionsProvider): vscode.Disposable {
+		const handle = ExtHostChatAgents2._instructionsProviderIdPool++;
+		this._instructionsProviders.set(handle, { extension, provider });
+		this._proxy.$registerInstructionsProvider(handle, extension.identifier);
+
+		const disposables = new DisposableStore();
+
+		// Listen to provider change events and notify main thread
+		if (provider.onDidChangeInstructions) {
+			disposables.add(provider.onDidChangeInstructions(() => {
+				this._proxy.$onDidChangeInstructions(handle);
+			}));
+		}
+
+		disposables.add(toDisposable(() => {
+			this._instructionsProviders.delete(handle);
+			this._proxy.$unregisterInstructionsProvider(handle);
+		}));
+
+		return disposables;
+	}
+
 	async $provideRelatedFiles(handle: number, request: IChatRequestDraft, token: CancellationToken): Promise<Dto<IChatRelatedFile>[] | undefined> {
 		const provider = this._relatedFilesProviders.get(handle);
 		if (!provider) {
@@ -520,6 +544,15 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return await providerData.provider.provideCustomAgents(options, token) ?? undefined;
 	}
 
+	async $provideInstructions(handle: number, options: IInstructionQueryOptions, token: CancellationToken): Promise<IExternalInstruction[] | undefined> {
+		const providerData = this._instructionsProviders.get(handle);
+		if (!providerData) {
+			return Promise.resolve(undefined);
+		}
+
+		return await providerData.provider.provideInstructions(options, token) ?? undefined;
+	}
+
 	async $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { location: ChatAgentLocation; participants?: vscode.ChatParticipantMetadata[] }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined> {
 		const detector = this._participantDetectionProviders.get(handle);
 		if (!detector) {

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

@@ -20,11 +20,21 @@ import { ResourceSet } from '../../../../../../base/common/map.js';
  */
 export const CUSTOM_AGENTS_PROVIDER_ACTIVATION_EVENT = 'onCustomAgentsProvider';
 
+/**
+ * Activation event for instructions providers.
+ */
+export const INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT = 'onInstructionsProvider';
+
 /**
  * Options for querying custom agents.
  */
 export interface ICustomAgentQueryOptions { }
 
+/**
+ * Options for querying instructions.
+ */
+export interface IInstructionQueryOptions { }
+
 /**
  * Represents a custom agent resource from an external provider.
  */
@@ -50,6 +60,31 @@ export interface IExternalCustomAgent {
 	readonly isEditable?: boolean;
 }
 
+/**
+ * Represents an instruction resource from an external provider.
+ */
+export interface IExternalInstruction {
+	/**
+	 * The unique identifier/name of the instruction resource.
+	 */
+	readonly name: string;
+
+	/**
+	 * A description of what the instruction resource does.
+	 */
+	readonly description: string;
+
+	/**
+	 * The URI to the instruction resource file.
+	 */
+	readonly uri: URI;
+
+	/**
+	 * Indicates whether the instruction resource is editable. Defaults to false.
+	 */
+	readonly isEditable?: boolean;
+}
+
 /**
  * Provides prompt services.
  */
@@ -327,6 +362,18 @@ export interface IPromptsService extends IDisposable {
 		provideCustomAgents: (options: ICustomAgentQueryOptions, token: CancellationToken) => Promise<IExternalCustomAgent[] | undefined>;
 	}): IDisposable;
 
+	/**
+	 * Registers an InstructionsProvider that can provide instructions for repositories.
+	 * This is part of the proposed API and requires the chatParticipantPrivate proposal.
+	 * @param extension The extension registering the provider.
+	 * @param provider The provider implementation with optional change event.
+	 * @returns A disposable that unregisters the provider when disposed.
+	 */
+	registerInstructionsProvider(extension: IExtensionDescription, provider: {
+		onDidChangeInstructions?: Event<void>;
+		provideInstructions: (options: IInstructionQueryOptions, token: CancellationToken) => Promise<IExternalInstruction[] | undefined>;
+	}): IDisposable;
+
 	/**
 	 * Gets list of claude skills files.
 	 */

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

@@ -30,7 +30,7 @@ import { getCleanPromptName } from '../config/promptFileLocations.js';
 import { PROMPT_LANGUAGE_ID, PromptsType, getPromptsTypeForLanguageId } from '../promptTypes.js';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, ParsedPromptFile, PromptHeaderAttributes } from '../promptFileParser.js';
-import { IAgentInstructions, IAgentSource, IChatPromptSlashCommand, ICustomAgent, IExtensionPromptPath, ILocalPromptPath, IPromptPath, IPromptsService, IClaudeSkill, IUserPromptPath, PromptsStorage, ICustomAgentQueryOptions, IExternalCustomAgent, ExtensionAgentSourceType, CUSTOM_AGENTS_PROVIDER_ACTIVATION_EVENT } from './promptsService.js';
+import { IAgentInstructions, IAgentSource, IChatPromptSlashCommand, ICustomAgent, IExtensionPromptPath, ILocalPromptPath, IPromptPath, IPromptsService, IClaudeSkill, IUserPromptPath, PromptsStorage, ICustomAgentQueryOptions, IExternalCustomAgent, ExtensionAgentSourceType, CUSTOM_AGENTS_PROVIDER_ACTIVATION_EVENT, IInstructionQueryOptions, IExternalInstruction, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT } from './promptsService.js';
 import { Delayer } from '../../../../../../base/common/async.js';
 import { Schemas } from '../../../../../../base/common/network.js';
 
@@ -169,6 +169,15 @@ export class PromptsService extends Disposable implements IPromptsService {
 		provideCustomAgents: (options: ICustomAgentQueryOptions, token: CancellationToken) => Promise<IExternalCustomAgent[] | undefined>;
 	}> = [];
 
+	/**
+	 * Registry of InstructionsProvider instances. Extensions can register providers via the proposed API.
+	 */
+	private readonly instructionsProviders: Array<{
+		extension: IExtensionDescription;
+		onDidChangeInstructions?: Event<void>;
+		provideInstructions: (options: IInstructionQueryOptions, token: CancellationToken) => Promise<IExternalInstruction[] | undefined>;
+	}> = [];
+
 	/**
 	 * Registers a CustomAgentsProvider. This will be called by the extension host bridge when
 	 * an extension registers a provider via vscode.chat.registerCustomAgentsProvider().
@@ -208,6 +217,39 @@ export class PromptsService extends Disposable implements IPromptsService {
 		return disposables;
 	}
 
+	/**
+	 * Registers an InstructionsProvider. This will be called by the extension host bridge when
+	 * an extension registers a provider via vscode.chat.registerInstructionsProvider().
+	 */
+	public registerInstructionsProvider(extension: IExtensionDescription, provider: {
+		onDidChangeInstructions?: Event<void>;
+		provideInstructions: (options: IInstructionQueryOptions, token: CancellationToken) => Promise<IExternalInstruction[] | undefined>;
+	}): IDisposable {
+		const providerEntry = { extension, ...provider };
+		this.instructionsProviders.push(providerEntry);
+
+		const disposables = new DisposableStore();
+
+		// Listen to provider change events
+		if (provider.onDidChangeInstructions) {
+			disposables.add(provider.onDidChangeInstructions(() => {
+				// Invalidate instruction cache when providers change
+				// Instructions might be used for various purposes, trigger refresh
+			}));
+		}
+
+		disposables.add({
+			dispose: () => {
+				const index = this.instructionsProviders.findIndex((p) => p === providerEntry);
+				if (index >= 0) {
+					this.instructionsProviders.splice(index, 1);
+				}
+			}
+		});
+
+		return disposables;
+	}
+
 	private async listCustomAgentsFromProvider(token: CancellationToken): Promise<IPromptPath[]> {
 		const result: IPromptPath[] = [];
 

src/vs/workbench/contrib/chat/test/common/mockPromptsService.ts

@@ -11,7 +11,7 @@ import { ITextModel } from '../../../../../editor/common/model.js';
 import { IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
 import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
 import { ParsedPromptFile } from '../../common/promptSyntax/promptFileParser.js';
-import { IClaudeSkill, ICustomAgent, ICustomAgentQueryOptions, IExternalCustomAgent, IPromptPath, IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
+import { IClaudeSkill, ICustomAgent, ICustomAgentQueryOptions, IExternalCustomAgent, IPromptPath, IPromptsService, PromptsStorage, IInstructionQueryOptions, IExternalInstruction } from '../../common/promptSyntax/service/promptsService.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
 
 export class MockPromptsService implements IPromptsService {
@@ -61,6 +61,7 @@ export class MockPromptsService implements IPromptsService {
 	getDisabledPromptFiles(type: PromptsType): ResourceSet { throw new Error('Method not implemented.'); }
 	setDisabledPromptFiles(type: PromptsType, uris: ResourceSet): void { throw new Error('Method not implemented.'); }
 	registerCustomAgentsProvider(extension: IExtensionDescription, provider: { provideCustomAgents: (options: ICustomAgentQueryOptions, token: CancellationToken) => Promise<IExternalCustomAgent[] | undefined> }): IDisposable { throw new Error('Method not implemented.'); }
+	registerInstructionsProvider(extension: IExtensionDescription, provider: { provideInstructions: (options: IInstructionQueryOptions, token: CancellationToken) => Promise<IExternalInstruction[] | undefined> }): IDisposable { throw new Error('Method not implemented.'); }
 	findClaudeSkills(token: CancellationToken): Promise<IClaudeSkill[] | undefined> { throw new Error('Method not implemented.'); }
 	dispose(): void { }
 }

src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts

@@ -370,13 +370,47 @@ declare module 'vscode' {
 		provideCustomAgents(options: CustomAgentQueryOptions, token: CancellationToken): ProviderResult<CustomAgentResource[]>;
 	}
 
+	// #endregion
+
+	// #region InstructionsProvider
+
+	/**
+	 * Options for querying instructions.
+	 */
+	export interface InstructionQueryOptions { }
+
+	/**
+	 * A provider that supplies instruction resources for repositories.
+	 */
+	export interface InstructionsProvider {
+		/**
+		 * An optional event to signal that instructions have changed.
+		 */
+		readonly onDidChangeInstructions?: Event<void>;
+
+		/**
+		 * Provide the list of instruction resources available for a given repository.
+		 * @param options Optional query parameters.
+		 * @param token A cancellation token.
+		 * @returns An array of instruction resources or a promise that resolves to such.
+		 */
+		provideInstructions(options: InstructionQueryOptions, token: CancellationToken): ProviderResult<CustomAgentResource[]>;
+	}
+
 	export namespace chat {
 		/**
 		 * Register a provider for custom agents.
 		 * @param provider The custom agents provider.
 		 * @returns A disposable that unregisters the provider when disposed.
 		 */
 		export function registerCustomAgentsProvider(provider: CustomAgentsProvider): Disposable;
+
+		/**
+		 * Register a provider for instructions.
+		 * @param provider The instructions provider.
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerInstructionsProvider(provider: InstructionsProvider): Disposable;
 	}
 
 	// #endregion