fix

Author: pwang347

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

@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode';
 import YAML from 'yaml';
-import { IAuthenticationService } from '../../../platform/authentication/common/authentication';
 import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
 import { IFileSystemService } from '../../../platform/filesystem/common/fileSystemService';
 import { FileType } from '../../../platform/filesystem/common/fileTypes';
@@ -27,20 +26,15 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 	readonly onDidChangeCustomAgents = this._onDidChangeCustomAgents.event;
 
 	private isFetching = false;
-	private memoryCache: vscode.CustomAgentResource[] | undefined = undefined;
+	private memoryCache = new Map<string, vscode.CustomAgentResource[]>();
 
 	constructor(
 		@IOctoKitService private readonly octoKitService: IOctoKitService,
 		@ILogService private readonly logService: ILogService,
 		@IVSCodeExtensionContext readonly extensionContext: IVSCodeExtensionContext,
 		@IFileSystemService private readonly fileSystem: IFileSystemService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 	) {
 		super();
-		this._register(this.authenticationService.onDidAuthenticationChange(() => {
-			this.logService.trace('[OrganizationAndEnterpriseAgentProvider] Authentication changed, firing onDidChangeCustomAgents');
-			this._onDidChangeCustomAgents.fire();
-		}));
 	}
 
 	private getCacheDir(): vscode.Uri {
@@ -52,9 +46,14 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 		_token: vscode.CancellationToken
 	): Promise<vscode.CustomAgentResource[]> {
 		try {
+			const user = await this.octoKitService.getCurrentAuthedUser();
+			if (!user) {
+				return [];
+			}
+
 			// If we have successfully fetched and cached in memory, return from memory
-			if (this.memoryCache !== undefined) {
-				return this.memoryCache;
+			if (this.memoryCache.has(user.login)) {
+				return this.memoryCache.get(user.login)!;
 			}
 
 			// Read from file cache first
@@ -321,8 +320,8 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 			this.logService.trace(`[OrganizationAndEnterpriseAgentProvider] Updated cache with ${totalAgents} agents from ${organizations.length} organizations`);
 
 			// If all fetch operations succeeded, populate memory cache
-			if (!hadAnyFetchErrors && this.memoryCache === undefined) {
-				this.memoryCache = await this.readFromCache();
+			if (!hadAnyFetchErrors && !this.memoryCache.has(user.login)) {
+				this.memoryCache.set(user.login, await this.readFromCache());
 				this.logService.trace('[OrganizationAndEnterpriseAgentProvider] Successfully populated memory cache');
 			}
 

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

@@ -6,54 +6,16 @@
 import { assert } from 'chai';
 import { afterEach, beforeEach, suite, test } from 'vitest';
 import * as vscode from 'vscode';
-import { IAuthenticationService } from '../../../../platform/authentication/common/authentication';
 import { IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService';
 import { FileType } from '../../../../platform/filesystem/common/fileTypes';
 import { MockFileSystemService } from '../../../../platform/filesystem/node/test/mockFileSystemService';
 import { CustomAgentDetails, CustomAgentListItem, CustomAgentListOptions, IOctoKitService } from '../../../../platform/github/common/githubService';
 import { ILogService } from '../../../../platform/log/common/logService';
-import { Emitter } from '../../../../util/vs/base/common/event';
 import { DisposableStore } from '../../../../util/vs/base/common/lifecycle';
 import { URI } from '../../../../util/vs/base/common/uri';
 import { createExtensionUnitTestingServices } from '../../../test/node/services';
 import { OrganizationAndEnterpriseAgentProvider } from '../organizationAndEnterpriseAgentProvider';
 
-class MockAuthenticationService implements IAuthenticationService {
-	_serviceBrand: undefined;
-	private readonly _onDidAuthenticationChange = new Emitter<void>();
-	readonly onDidAuthenticationChange = this._onDidAuthenticationChange.event;
-	readonly onDidAccessTokenChange = new Emitter<void>().event;
-	readonly anyGitHubSession: vscode.AuthenticationSession | undefined;
-
-	readonly isMinimalMode = false;
-	readonly permissiveGitHubSession: vscode.AuthenticationSession | undefined;
-	speculativeDecodingEndpointToken: string | undefined;
-	readonly onDidAdoAuthenticationChange = new Emitter<void>().event;
-
-	async getAnyGitHubSession(options?: vscode.AuthenticationGetSessionOptions): Promise<vscode.AuthenticationSession | undefined> {
-		return undefined;
-	}
-	async getPermissiveGitHubSession(options: vscode.AuthenticationGetSessionOptions): Promise<vscode.AuthenticationSession | undefined> {
-		return undefined;
-	}
-	readonly copilotToken = undefined;
-	async getCopilotToken(forceRefresh?: boolean): Promise<any> {
-		return undefined;
-	}
-
-	resetCopilotToken(httpError?: number): void {
-		// no-op
-	}
-
-	async getAdoAccessTokenBase64(options?: vscode.AuthenticationGetSessionOptions): Promise<string | undefined> {
-		return undefined;
-	}
-
-	fireOnDidAuthenticationChange() {
-		this._onDidAuthenticationChange.fire();
-	}
-}
-
 /**
  * Mock implementation of IOctoKitService for testing
  */
@@ -124,7 +86,6 @@ suite('OrganizationAndEnterpriseAgentProvider', () => {
 	let mockOctoKitService: MockOctoKitService;
 	let mockFileSystem: MockFileSystemService;
 	let mockExtensionContext: MockExtensionContext;
-	let mockAuthenticationService: MockAuthenticationService;
 	let accessor: any;
 	let provider: OrganizationAndEnterpriseAgentProvider;
 
@@ -133,7 +94,6 @@ suite('OrganizationAndEnterpriseAgentProvider', () => {
 
 		// Create mocks first
 		mockOctoKitService = new MockOctoKitService();
-		mockAuthenticationService = new MockAuthenticationService();
 		const storageUri = URI.file('/test/storage');
 		mockExtensionContext = new MockExtensionContext(storageUri);
 
@@ -156,7 +116,6 @@ suite('OrganizationAndEnterpriseAgentProvider', () => {
 			accessor.get(ILogService),
 			mockExtensionContext as any,
 			mockFileSystem,
-			mockAuthenticationService
 		);
 		disposables.add(provider);
 		return provider;
@@ -940,16 +899,4 @@ Test prompt
 		// Should have aborted after first org, so second org shouldn't be processed
 		assert.equal(callCount, 1);
 	});
-
-	test('fires change event when authentication state changes', async () => {
-		const provider = createProvider();
-		let eventFired = false;
-		provider.onDidChangeCustomAgents(() => {
-			eventFired = true;
-		});
-
-		mockAuthenticationService.fireOnDidAuthenticationChange();
-
-		assert.equal(eventFired, true);
-	});
 });