Merge pull request microsoft#258346 from microsoft/osortega/remove-label-chat-session-provider

Removing chat session provider label

Author: osortega

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

@@ -51,10 +51,9 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		this._proxy = this._extHostContext.getProxy(ExtHostContext.ExtHostChatSessions);
 	}
 
-	$registerChatSessionItemProvider(handle: number, chatSessionType: string, label: string): void {
+	$registerChatSessionItemProvider(handle: number, chatSessionType: string): void {
 		// Register the provider handle - this tracks that a provider exists
 		const provider: IChatSessionItemProvider = {
-			label,
 			chatSessionType,
 			provideChatSessionItems: (token) => this._provideChatSessionItems(handle, token)
 		};

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

@@ -3129,7 +3129,7 @@ export interface ChatSessionDto {
 
 
 export interface MainThreadChatSessionsShape extends IDisposable {
-	$registerChatSessionItemProvider(handle: number, chatSessionType: string, label: string): void;
+	$registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
 	$unregisterChatSessionItemProvider(handle: number): void;
 	$onDidChangeChatSessionItems(chatSessionType: string): void;
 

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

@@ -87,7 +87,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		const disposables = new DisposableStore();
 
 		this._chatSessionItemProviders.set(handle, { provider, extension, disposable: disposables });
-		this._proxy.$registerChatSessionItemProvider(handle, chatSessionType, provider.label);
+		this._proxy.$registerChatSessionItemProvider(handle, chatSessionType);
 		if (provider.onDidChangeChatSessionItems) {
 			disposables.add(provider.onDidChangeChatSessionItems(() => {
 				this._proxy.$onDidChangeChatSessionItems(chatSessionType);

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

@@ -82,6 +82,7 @@ export class ChatSessionsContribution extends Disposable implements IWorkbenchCo
 				}
 				for (const contribution of ext.value) {
 					const c: IChatSessionsExtensionPoint = {
+						id: contribution.id,
 						type: contribution.type,
 						name: contribution.name,
 						displayName: contribution.displayName,

src/vs/workbench/contrib/chat/browser/chatSessions.ts

@@ -25,7 +25,7 @@ import { Extensions, IViewContainersRegistry, IViewDescriptorService, ViewContai
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
-import { IChatSessionItem, IChatSessionItemProvider, IChatSessionsService } from '../common/chatSessionsService.js';
+import { IChatSessionItem, IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionsService } from '../common/chatSessionsService.js';
 import { IAsyncDataSource, ITreeRenderer, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
 import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
@@ -117,7 +117,6 @@ export class ChatSessionsView extends Disposable implements IWorkbenchContributi
 class LocalChatSessionsProvider extends Disposable implements IChatSessionItemProvider {
 	static readonly CHAT_WIDGET_VIEW_ID = 'workbench.panel.chat.view.copilot';
 	readonly chatSessionType = 'local';
-	readonly label = 'Local Chat Sessions';
 
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
@@ -439,10 +438,10 @@ class ChatSessionsViewPaneContainer extends ViewPaneContainer {
 		}
 
 		// Register new views
-		this.registerViews();
+		this.registerViews(contributions);
 	}
 
-	private async registerViews() {
+	private async registerViews(extensionPointContributions: IChatSessionsExtensionPoint[]) {
 		const container = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).get(VIEWLET_ID);
 		const providers = this.getAllChatSessionProviders();
 
@@ -453,11 +452,22 @@ class ChatSessionsViewPaneContainer extends ViewPaneContainer {
 			providers.forEach(provider => {
 				// Only register if not already registered
 				if (!this.registeredViewDescriptors.has(provider.chatSessionType)) {
+					let displayName = '';
+					if (provider.chatSessionType === 'local') {
+						displayName = 'Local Chat Sessions';
+					} else {
+						const extContribution = extensionPointContributions.find(c => c.id === provider.chatSessionType);
+						if (!extContribution) {
+							this.logService.warn(`No extension contribution found for chat session type: ${provider.chatSessionType}`);
+							return; // Skip if no contribution found
+						}
+						displayName = extContribution.displayName;
+					}
 					const viewDescriptor: IViewDescriptor = {
 						id: `${VIEWLET_ID}.${provider.chatSessionType}`,
 						name: {
-							value: provider.label,
-							original: provider.label,
+							value: displayName,
+							original: displayName,
 						},
 						ctorDescriptor: new SyncDescriptor(SessionsViewPane, [provider]),
 						canToggleVisibility: true,

src/vs/workbench/contrib/chat/common/chatSessionsService.ts

@@ -14,6 +14,7 @@ import { IChatAgentRequest } from './chatAgents.js';
 import { IRelaxedExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 
 export interface IChatSessionsExtensionPoint {
+	readonly id: string;
 	readonly type: string;
 	readonly name: string;
 	readonly displayName: string;
@@ -51,7 +52,6 @@ export interface ChatSession extends IDisposable {
 
 export interface IChatSessionItemProvider {
 	readonly chatSessionType: string;
-	readonly label: string;
 	provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]>;
 }
 

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

@@ -8,11 +8,6 @@ declare module 'vscode' {
 	 * Provides a list of information about chat sessions.
 	 */
 	export interface ChatSessionItemProvider {
-		/**
-		 * Label of the extension that registers the provider.
-		 */
-		readonly label: string; // TODO: move to contribution or registration
-
 		/**
 		 * Event that the provider can fire to signal that chat sessions have changed.
 		 */