Additional changes for custom org/enterprise agents (#2447)

* fix

* fix test

* fix

* clean

* experimental config

Author: pwang347

package.json

@@ -2503,11 +2503,6 @@
 						"default": true,
 						"description": "%github.copilot.config.customInstructionsInSystemMessage%"
 					},
-					"github.copilot.chat.customAgents.showOrganizationAndEnterpriseAgents": {
-						"type": "boolean",
-						"default": true,
-						"description": "%github.copilot.config.customAgents.showOrganizationAndEnterpriseAgents%"
-					},
 					"github.copilot.chat.agent.currentEditorContext.enabled": {
 						"type": "boolean",
 						"default": true,
@@ -3440,6 +3435,14 @@
 							"electron-fetch",
 							"node-fetch"
 						]
+					},
+					"github.copilot.chat.customAgents.showOrganizationAndEnterpriseAgents": {
+						"type": "boolean",
+						"default": false,
+						"description": "%github.copilot.config.customAgents.showOrganizationAndEnterpriseAgents%",
+						"tags": [
+							"experimental"
+						]
 					}
 				}
 			},

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

@@ -14,13 +14,19 @@ import { Disposable } from '../../../util/vs/base/common/lifecycle';
 
 const AgentFileExtension = '.agent.md';
 
+class UserNotSignedInError extends Error {
+	constructor() {
+		super('User is not signed in');
+	}
+}
+
 export class OrganizationAndEnterpriseAgentProvider extends Disposable implements vscode.CustomAgentsProvider {
 
 	private readonly _onDidChangeCustomAgents = this._register(new vscode.EventEmitter<void>());
 	readonly onDidChangeCustomAgents = this._onDidChangeCustomAgents.event;
 
 	private isFetching = false;
-	private memoryCache: vscode.CustomAgentResource[] | undefined = undefined;
+	private memoryCache: vscode.CustomAgentResource[] | undefined;
 
 	constructor(
 		@IOctoKitService private readonly octoKitService: IOctoKitService,
@@ -29,31 +35,29 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 		@IFileSystemService private readonly fileSystem: IFileSystemService,
 	) {
 		super();
+
+		// Trigger async fetch to update cache. Note: this provider is re-created each time
+		// the user signs in, so this will re-fetch on sign-in. See logic in conversationFeature.ts.
+		this.fetchAndUpdateCache().catch(error => {
+			this.logService.error(`[OrganizationAndEnterpriseAgentProvider] Error in background fetch: ${error}`);
+		});
 	}
 
 	private getCacheDir(): vscode.Uri {
 		return vscode.Uri.joinPath(this.extensionContext.globalStorageUri, 'githubAgentsCache');
 	}
 
 	async provideCustomAgents(
-		options: vscode.CustomAgentQueryOptions,
+		_options: vscode.CustomAgentQueryOptions,
 		_token: vscode.CancellationToken
 	): Promise<vscode.CustomAgentResource[]> {
 		try {
-			// If we have successfully fetched and cached in memory, return from memory
 			if (this.memoryCache !== undefined) {
 				return this.memoryCache;
 			}
 
-			// Read from file cache first
-			const fileCachedAgents = await this.readFromCache();
-
-			// Trigger async fetch to update cache
-			this.fetchAndUpdateCache(options).catch(error => {
-				this.logService.error(`[OrganizationAndEnterpriseAgentProvider] Error in background fetch: ${error}`);
-			});
-
-			return fileCachedAgents;
+			// Return results from file cache
+			return await this.readFromCache();
 		} catch (error) {
 			this.logService.error(`[OrganizationAndEnterpriseAgentProvider] Error in provideCustomAgents: ${error}`);
 			return [];
@@ -113,14 +117,12 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 	private async runWithAuthCheck<T>(operation: () => Promise<T>): Promise<T> {
 		const user = await this.octoKitService.getCurrentAuthedUser();
 		if (!user) {
-			throw new Error('User is not signed in');
+			throw new UserNotSignedInError();
 		}
 		return operation();
 	}
 
-	private async fetchAndUpdateCache(
-		options: vscode.CustomAgentQueryOptions
-	): Promise<void> {
+	private async fetchAndUpdateCache(): Promise<void> {
 		// Prevent concurrent fetches
 		if (this.isFetching) {
 			this.logService.trace('[OrganizationAndEnterpriseAgentProvider] Fetch already in progress, skipping');
@@ -147,9 +149,9 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 			this.logService.trace(`[OrganizationAndEnterpriseAgentProvider] Found ${organizations.length} organizations: ${organizations.join(', ')}`);
 
 			// Convert VS Code API options to internal options
-			const internalOptions = options ? {
+			const internalOptions = {
 				includeSources: ['org', 'enterprise'] // don't include 'repo'
-			} satisfies CustomAgentListOptions : undefined;
+			} satisfies CustomAgentListOptions;
 
 			// Fetch agents from all organizations
 			const agentsByOrg = new Map<string, Map<string, CustomAgentListItem>>();
@@ -175,7 +177,7 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 					}
 					this.logService.trace(`[OrganizationAndEnterpriseAgentProvider] Fetched ${agents.length} agents from ${org} using repo ${repoName}`);
 				} catch (error) {
-					if (error instanceof Error && error.message === 'User is not signed in') {
+					if (error instanceof UserNotSignedInError) {
 						this.logService.trace('[OrganizationAndEnterpriseAgentProvider] User signed out during fetch, aborting');
 						return;
 					}
@@ -254,7 +256,7 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 							totalAgents++;
 						}
 					} catch (error) {
-						if (error instanceof Error && error.message === 'User is not signed in') {
+						if (error instanceof UserNotSignedInError) {
 							this.logService.trace('[OrganizationAndEnterpriseAgentProvider] User signed out during fetch, aborting');
 							return;
 						}

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

@@ -115,7 +115,7 @@ suite('OrganizationAndEnterpriseAgentProvider', () => {
 			mockOctoKitService,
 			accessor.get(ILogService),
 			mockExtensionContext as any,
-			mockFileSystem
+			mockFileSystem,
 		);
 		disposables.add(provider);
 		return provider;

src/platform/configuration/common/configurationService.ts

@@ -868,7 +868,7 @@ export namespace ConfigKey {
 	export const EnableAlternateGptPrompt = defineSetting<boolean>('chat.alternateGptPrompt.enabled', ConfigType.ExperimentBased, false);
 
 	/** Enable custom agents from GitHub Enterprise/Organizations */
-	export const ShowOrganizationAndEnterpriseAgents = defineSetting<boolean>('chat.customAgents.showOrganizationAndEnterpriseAgents', ConfigType.Simple, true);
+	export const ShowOrganizationAndEnterpriseAgents = defineSetting<boolean>('chat.customAgents.showOrganizationAndEnterpriseAgents', ConfigType.Simple, false);
 
 	export const CompletionsFetcher = defineSetting<FetcherId | undefined>('chat.completionsFetcher', ConfigType.ExperimentBased, undefined);
 	export const NextEditSuggestionsFetcher = defineSetting<FetcherId | undefined>('chat.nesFetcher', ConfigType.ExperimentBased, undefined);