Wait for chat session contribution registration (microsoft#259641)

joshspicer · web-flow · commit 18948aa9ca87 · 2025-08-04T15:48:38.000-04:00
* revert microsoft#259126 * move extensionPoint handler callback * await chatSessionsService#canResolveContentProvider when loading in chat session editor * fix test
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -567,7 +567,7 @@ export function registerChatActions() {
 						// Use the new Promise-based API to get chat sessions
 						const cancellationToken = new CancellationTokenSource();
 						try {
-							const providers = await chatSessionsService.getChatSessionContributions();
+							const providers = chatSessionsService.getChatSessionContributions();
 							const providerNSessions: { providerType: string; session: IChatSessionItem }[] = [];
 
 							for (const provider of providers) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
@@ -130,7 +130,8 @@ export class ChatEditor extends EditorPane {
 		if (input.resource.scheme === Schemas.vscodeChatSession) {
 			const identifier = ChatSessionUri.parse(input.resource);
 			if (identifier) {
-				const contributions = await this.chatSessionsService.getChatSessionContributions([input.resource.authority]);
+				await this.chatSessionsService.canResolveContentProvider(input.resource.authority);
+				const contributions = this.chatSessionsService.getChatSessionContributions();
 				const contribution = contributions.find(c => c.type === identifier.chatSessionType);
 				if (contribution) {
 					this.widget.lockToCodingAgent(contribution.name, contribution.displayName);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts
@@ -13,12 +13,9 @@ import { ContextKeyExpr, IContextKeyService } from '../../../../platform/context
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { IChatWidgetService } from '../browser/chat.js';
 import { ChatEditorInput } from '../browser/chatEditorInput.js';
 import { IChatAgentData, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../common/chatAgents.js';
@@ -68,42 +65,6 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsEx
 	}
 });
 
-export class ChatSessionsContribution extends Disposable implements IWorkbenchContribution {
-	constructor(
-		@ILogService private readonly logService: ILogService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super();
-
-		extensionPoint.setHandler(extensions => {
-			for (const ext of extensions) {
-				if (!isProposedApiEnabled(ext.description, 'chatSessionsProvider')) {
-					continue;
-				}
-				if (!Array.isArray(ext.value)) {
-					continue;
-				}
-				for (const contribution of ext.value) {
-					const c: IChatSessionsExtensionPoint = {
-						id: contribution.id,
-						type: contribution.type,
-						name: contribution.name,
-						displayName: contribution.displayName,
-						description: contribution.description,
-						when: contribution.when,
-						extensionDescription: ext.description,
-					};
-					this.logService.info(`Registering chat session from extension contribution: ${c.displayName} (id='${c.type}' name='${c.name}')`);
-					this._register(this.chatSessionsService.registerContribution(c)); // TODO: Is it for contribution to own this? I think not
-				}
-			}
-		});
-	}
-}
-
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
-workbenchRegistry.registerWorkbenchContribution(ChatSessionsContribution, LifecyclePhase.Restored);
-
 class ContributedChatSessionData implements IDisposable {
 	private readonly _disposableStore: DisposableStore;
 
@@ -148,6 +109,29 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 	) {
 		super();
+		this._register(extensionPoint.setHandler(extensions => {
+			for (const ext of extensions) {
+				if (!isProposedApiEnabled(ext.description, 'chatSessionsProvider')) {
+					continue;
+				}
+				if (!Array.isArray(ext.value)) {
+					continue;
+				}
+				for (const contribution of ext.value) {
+					const c: IChatSessionsExtensionPoint = {
+						id: contribution.id,
+						type: contribution.type,
+						name: contribution.name,
+						displayName: contribution.displayName,
+						description: contribution.description,
+						when: contribution.when,
+						extensionDescription: ext.description,
+					};
+					this._logService.info(`Registering chat session from extension contribution: ${c.displayName} (id='${c.type}' name='${c.name}')`);
+					this._register(this.registerContribution(c));
+				}
+			}
+		}));
 
 		// Listen for context changes and re-evaluate contributions
 		this._register(Event.filter(this._contextKeyService.onDidChangeContext, e => e.affectsSome(this._contextKeys))(() => {
@@ -295,11 +279,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		return disposable;
 	}
 
-	async getChatSessionContributions(waitForActivation?: string[]): Promise<IChatSessionsExtensionPoint[]> {
-		await this._extensionService.whenInstalledExtensionsRegistered();
-		if (waitForActivation) {
-			await Promise.all(waitForActivation.map(id => this._extensionService.activateByEvent(`onChatSession:${id}`)));
-		}
+	getChatSessionContributions(): IChatSessionsExtensionPoint[] {
 		return Array.from(this._contributions.values()).filter(contribution =>
 			this._isContributionAvailable(contribution)
 		);
@@ -314,7 +294,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 	async canResolveItemProvider(chatViewType: string) {
-		// First check if the contribution is available based on its when clause
+		await this._extensionService.whenInstalledExtensionsRegistered();
 		const contribution = this._contributions.get(chatViewType);
 		if (contribution && !this._isContributionAvailable(contribution)) {
 			return false;
@@ -324,7 +304,6 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 			return true;
 		}
 
-		await this._extensionService.whenInstalledExtensionsRegistered();
 		await this._extensionService.activateByEvent(`onChatSession:${chatViewType}`);
 
 		return this._itemsProviders.has(chatViewType);
@@ -335,7 +314,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 	async canResolveContentProvider(chatViewType: string) {
-		// First check if the contribution is available based on its when clause
+		await this._extensionService.whenInstalledExtensionsRegistered();
 		const contribution = this._contributions.get(chatViewType);
 		if (contribution && !this._isContributionAvailable(contribution)) {
 			return false;
@@ -345,7 +324,6 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 			return true;
 		}
 
-		await this._extensionService.whenInstalledExtensionsRegistered();
 		await this._extensionService.activateByEvent(`onChatSession:${chatViewType}`);
 
 		return this._contentProviders.has(chatViewType);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions.ts b/src/vs/workbench/contrib/chat/browser/chatSessions.ts
@@ -715,16 +715,16 @@ class SessionsViewPane extends ViewPane {
 		}
 	}
 
-	private async getProviderDisplayName(): Promise<string> {
-		const contributions = await this.chatSessionsService.getChatSessionContributions();
+	private getProviderDisplayName(): string {
+		const contributions = this.chatSessionsService.getChatSessionContributions();
 		const contribution = contributions.find(c => c.type === this.provider.chatSessionType);
 		if (contribution) {
 			return contribution.displayName;
 		}
 		return '';
 	}
 
-	private async showEmptyMessage(): Promise<void> {
+	private showEmptyMessage(): void {
 		if (!this.messageElement) {
 			return;
 		}
@@ -735,7 +735,7 @@ class SessionsViewPane extends ViewPane {
 			return;
 		}
 
-		const providerName = await this.getProviderDisplayName();
+		const providerName = this.getProviderDisplayName();
 		if (!providerName) {
 			return;
 		}
@@ -775,15 +775,15 @@ class SessionsViewPane extends ViewPane {
 	 * Updates the empty state message based on current tree data.
 	 * Uses the tree's existing data to avoid redundant provider calls.
 	 */
-	private async updateEmptyStateMessage(): Promise<void> {
+	private updateEmptyStateMessage(): void {
 		try {
 			// Check if the tree has the provider node and get its children count
 			if (this.tree?.hasNode(this.provider)) {
 				const providerNode = this.tree.getNode(this.provider);
 				const childCount = providerNode.children?.length || 0;
 
 				if (childCount === 0) {
-					await this.showEmptyMessage();
+					this.showEmptyMessage();
 				} else {
 					this.hideMessage();
 				}
@@ -814,7 +814,7 @@ class SessionsViewPane extends ViewPane {
 			);
 
 			// Check for empty state after refresh using tree data
-			await this.updateEmptyStateMessage();
+			this.updateEmptyStateMessage();
 		} catch (error) {
 			// Log error but don't throw to avoid breaking the UI
 			this.logService.error('Error refreshing chat sessions tree:', error);
@@ -842,7 +842,7 @@ class SessionsViewPane extends ViewPane {
 			);
 
 			// Check for empty state after loading using tree data
-			await this.updateEmptyStateMessage();
+			this.updateEmptyStateMessage();
 		} catch (error) {
 			// Log error but don't throw to avoid breaking the UI
 			this.logService.error('Error loading chat sessions data:', error);
diff --git a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
@@ -68,7 +68,7 @@ export interface IChatSessionsService {
 	readonly onDidChangeSessionItems: Event<string>;
 	readonly onDidChangeAvailability: Event<void>;
 	registerContribution(contribution: IChatSessionsExtensionPoint): IDisposable;
-	getChatSessionContributions(waitForActivation?: string[]): Promise<IChatSessionsExtensionPoint[]>;
+	getChatSessionContributions(): IChatSessionsExtensionPoint[];
 	canResolveItemProvider(chatSessionType: string): Promise<boolean>;
 	canResolveContentProvider(chatSessionType: string): Promise<boolean>;
 	getChatSessionItemProviders(): IChatSessionItemProvider[];
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
@@ -104,6 +104,8 @@ suite('ChatEditingService', function () {
 
 		chatService = insta.get(IChatService);
 
+		store.add(insta.get(IChatSessionsService) as ChatSessionsService); // Needs to be disposed in between test runs to clear extensionPoint contribution
+
 		const chatAgentService = insta.get(IChatAgentService);
 
 		const agent: IChatAgentImplementation = {
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
@@ -141,6 +141,7 @@ suite('InlineChatSession', function () {
 
 		instaService = store.add(workbenchInstantiationService(undefined, store).createChild(serviceCollection));
 		inlineChatSessionService = store.add(instaService.get(IInlineChatSessionService));
+		store.add(instaService.get(IChatSessionsService) as ChatSessionsService);  // Needs to be disposed in between test runs to clear extensionPoint contribution
 
 		instaService.get(IChatAgentService).registerDynamicAgent({
 			extensionId: nullExtensionDescription.identifier,
