Adopt latest provider pattern for org/enterprise custom agents (#2737)

* PR

* activation

* fix test

* wip

* update

* tests

* Update src/platform/github/common/githubService.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/extension/agents/vscode-node/organizationInstructionsProvider.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/platform/github/common/octoKitServiceImpl.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* update

* update setting name

* wip

* fix

* use enum

* PR

* nit

* add polling

* tests

* cleanup

* use helper

* remove instructions

* clean

* use custom source

* update

* update

* test updates

* fix tests

* update types

* PR

* use proposed API

* Update src/platform/customInstructions/common/customInstructionsService.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix tests

* update for skills

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: pwang347

package.json

@@ -84,7 +84,7 @@
 		"onUri",
 		"onFileSystem:ccreq",
 		"onFileSystem:ccsettings",
-		"onCustomAgentsProvider"
+		"onCustomAgentProvider"
 	],
 	"main": "./dist/extension",
 	"l10n": "./l10n",
@@ -136,7 +136,8 @@
 		"languageModelThinkingPart",
 		"chatSessionsProvider@3",
 		"devDeviceId",
-		"contribEditorContentMenu"
+		"contribEditorContentMenu",
+		"chatPromptFiles"
 	],
 	"contributes": {
 		"languageModelTools": [

src/extension/agents/vscode-node/organizationAndEnterpriseAgentProvider.ts

@@ -14,13 +14,15 @@ import { Disposable } from '../../../util/vs/base/common/lifecycle';
 
 const AgentFileExtension = '.agent.md';
 
-export class OrganizationAndEnterpriseAgentProvider extends Disposable implements vscode.CustomAgentsProvider {
+export class OrganizationAndEnterpriseAgentProvider extends Disposable implements vscode.CustomAgentProvider {
+
+	label: string = vscode.l10n.t('GitHub Organization');
 
 	private readonly _onDidChangeCustomAgents = this._register(new vscode.EventEmitter<void>());
 	readonly onDidChangeCustomAgents = this._onDidChangeCustomAgents.event;
 
 	private isFetching = false;
-	private memoryCache: vscode.CustomAgentResource[] | undefined;
+	private memoryCache: vscode.CustomAgentChatResource[] | undefined;
 
 	constructor(
 		@IOctoKitService private readonly octoKitService: IOctoKitService,
@@ -42,9 +44,9 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 	}
 
 	async provideCustomAgents(
-		_options: vscode.CustomAgentQueryOptions,
+		_options: vscode.CustomAgentContext,
 		_token: vscode.CancellationToken
-	): Promise<vscode.CustomAgentResource[]> {
+	): Promise<vscode.CustomAgentChatResource[]> {
 		try {
 			if (this.memoryCache !== undefined) {
 				return this.memoryCache;
@@ -58,15 +60,15 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 		}
 	}
 
-	private async readFromCache(): Promise<vscode.CustomAgentResource[]> {
+	private async readFromCache(): Promise<vscode.CustomAgentChatResource[]> {
 		try {
 			const cacheDir = this.getCacheDir();
 			if (!cacheDir) {
 				this.logService.trace('[OrganizationAndEnterpriseAgentProvider] No workspace open, cannot use cache');
 				return [];
 			}
 
-			const agents: vscode.CustomAgentResource[] = [];
+			const agents: vscode.CustomAgentChatResource[] = [];
 
 			// Check if cache directory exists
 			try {
@@ -91,11 +93,7 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 					const metadata = this.parseAgentMetadata(text, filename);
 					if (metadata) {
 						const fileUri = vscode.Uri.joinPath(orgDir, filename);
-						agents.push({
-							name: metadata.name,
-							description: metadata.description,
-							uri: fileUri,
-						});
+						agents.push(new vscode.CustomAgentChatResource(fileUri));
 					}
 				}
 			}

…organizationAndEnterpriseAgentContrib.ts …/agents/vscode-node/promptFileContrib.tssrc/extension/agents/vscode-node/organizationAndEnterpriseAgentContrib.ts renamed to src/extension/agents/vscode-node/promptFileContrib.ts src/extension/agents/vscode-node/organizationAndEnterpriseAgentContrib.ts renamed to src/extension/agents/vscode-node/promptFileContrib.ts

@@ -10,20 +10,21 @@ import { IInstantiationService } from '../../../util/vs/platform/instantiation/c
 import { IExtensionContribution } from '../../common/contributions';
 import { OrganizationAndEnterpriseAgentProvider } from './organizationAndEnterpriseAgentProvider';
 
-export class OrganizationAndEnterpriseAgentContribution extends Disposable implements IExtensionContribution {
-	readonly id = 'OrganizationAndEnterpriseAgents';
+export class PromptFileContribution extends Disposable implements IExtensionContribution {
+	readonly id = 'PromptFiles';
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 
-		if ('registerCustomAgentsProvider' in vscode.chat) {
+		// Register custom agent provider
+		if ('registerCustomAgentProvider' in vscode.chat) {
 			// Only register the provider if the setting is enabled
 			if (configurationService.getConfig(ConfigKey.ShowOrganizationAndEnterpriseAgents)) {
-				const provider = instantiationService.createInstance(OrganizationAndEnterpriseAgentProvider);
-				this._register(vscode.chat.registerCustomAgentsProvider(provider));
+				const orgAndEnterpriseAgentProvider = instantiationService.createInstance(OrganizationAndEnterpriseAgentProvider);
+				this._register(vscode.chat.registerCustomAgentProvider(orgAndEnterpriseAgentProvider));
 			}
 		}
 	}