Merge pull request #256647 from microsoft/osortega/agents-show-chat-menu

Coding agents to show in "Show chats" menu

Author: osortega

src/vs/base/common/marshallingIds.ts

@@ -27,4 +27,5 @@ export const enum MarshalledId {
 	LanguageModelTextPart,
 	LanguageModelPromptTsxPart,
 	LanguageModelDataPart,
+	ChatSessionContext,
 }

src/vs/platform/actions/common/actions.ts

@@ -256,6 +256,7 @@ export class MenuId {
 	static readonly ChatTextEditorMenu = new MenuId('ChatTextEditorMenu');
 	static readonly ChatTerminalMenu = new MenuId('ChatTerminalMenu');
 	static readonly ChatToolOutputResourceContext = new MenuId('ChatToolOutputResourceContext');
+	static readonly ChatSessionsMenu = new MenuId('ChatSessionsMenu');
 	static readonly AccessibleView = new MenuId('AccessibleView');
 	static readonly MultiDiffEditorFileToolbar = new MenuId('MultiDiffEditorFileToolbar');
 	static readonly DiffEditorHunkToolbar = new MenuId('DiffEditorHunkToolbar');

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

@@ -23,9 +23,10 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		super();
 	}
 
-	$registerChatSessionsProvider(handle: number): void {
+	$registerChatSessionsProvider(handle: number, chatSessionType: string): void {
 		// Register the provider handle - this tracks that a provider exists
 		const provider: IChatSessionsProvider = {
+			chatSessionType,
 			provideChatSessions: (token) => this._provideChatSessionsInformation(handle, token)
 		};
 		this._registrations.set(handle, this._chatSessionsService.registerChatSessionsProvider(handle, provider));

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

@@ -112,7 +112,7 @@ import { ExtHostWebviewViews } from './extHostWebviewView.js';
 import { IExtHostWindow } from './extHostWindow.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { ExtHostAiSettingsSearch } from './extHostAiSettingsSearch.js';
-import { IExtHostChatSessions } from './extHostChatSessions.js';
+import { ExtHostChatSessions } from './extHostChatSessions.js';
 
 export interface IExtensionRegistries {
 	mine: ExtensionDescriptionRegistry;
@@ -154,7 +154,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostLanguageModels = accessor.get(IExtHostLanguageModels);
 	const extHostMcp = accessor.get(IExtHostMpcService);
 	const extHostDataChannels = accessor.get(IExtHostDataChannels);
-	const extHostChatSessions = accessor.get(IExtHostChatSessions);
 
 	// register addressable instances
 	rpcProtocol.set(ExtHostContext.ExtHostFileSystemInfo, extHostFileSystemInfo);
@@ -174,7 +173,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	rpcProtocol.set(ExtHostContext.ExtHostAuthentication, extHostAuthentication);
 	rpcProtocol.set(ExtHostContext.ExtHostChatProvider, extHostLanguageModels);
 	rpcProtocol.set(ExtHostContext.ExtHostDataChannels, extHostDataChannels);
-	rpcProtocol.set(ExtHostContext.ExtHostChatSessions, extHostChatSessions);
 
 	// automatically create and register addressable instances
 	const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, accessor.get(IExtHostDecorations));
@@ -231,6 +229,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, new ExtHostStatusBar(rpcProtocol, extHostCommands.converter));
 	const extHostSpeech = rpcProtocol.set(ExtHostContext.ExtHostSpeech, new ExtHostSpeech(rpcProtocol));
 	const extHostEmbeddings = rpcProtocol.set(ExtHostContext.ExtHostEmbeddings, new ExtHostEmbeddings(rpcProtocol));
+	const extHostChatSessions = rpcProtocol.set(ExtHostContext.ExtHostChatSessions, new ExtHostChatSessions(extHostCommands, rpcProtocol, extHostLogService));
+
 	rpcProtocol.set(ExtHostContext.ExtHostMcp, accessor.get(IExtHostMpcService));
 
 	// Check that no named customers are missing

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

@@ -34,7 +34,6 @@ import { ExtHostMcpService, IExtHostMpcService } from './extHostMcp.js';
 import { ExtHostUrls, IExtHostUrlsService } from './extHostUrls.js';
 import { ExtHostProgress, IExtHostProgress } from './extHostProgress.js';
 import { ExtHostDataChannels, IExtHostDataChannels } from './extHostDataChannels.js';
-import { ExtHostChatSessions, IExtHostChatSessions } from './extHostChatSessions.js';
 
 registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
 registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
@@ -65,4 +64,3 @@ registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, InstantiationType.Eager
 registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, InstantiationType.Eager);
 registerSingleton(IExtHostMpcService, ExtHostMcpService, InstantiationType.Eager);
 registerSingleton(IExtHostDataChannels, ExtHostDataChannels, InstantiationType.Eager);
-registerSingleton(IExtHostChatSessions, ExtHostChatSessions, InstantiationType.Eager);

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

@@ -3102,7 +3102,7 @@ export interface MainThreadChatStatusShape {
 }
 
 export interface MainThreadChatSessionsShape extends IDisposable {
-	$registerChatSessionsProvider(handle: number): void;
+	$registerChatSessionsProvider(handle: number, chatSessionType: string): void;
 	$unregisterChatSessionsProvider(handle: number): void;
 }
 

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

@@ -10,6 +10,9 @@ import { ExtHostChatSessionsShape, MainContext, MainThreadChatSessionsShape } fr
 import type * as vscode from 'vscode';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { Proxied } from '../../services/extensions/common/proxyIdentifier.js';
+import { ExtHostCommands } from './extHostCommands.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { URI } from '../../../base/common/uri.js';
 
 export interface IExtHostChatSessions extends ExtHostChatSessionsShape {
 	registerChatSessionsProvider(provider: vscode.ChatSessionsProvider): vscode.Disposable;
@@ -23,21 +26,40 @@ export class ExtHostChatSessions extends Disposable implements IExtHostChatSessi
 	private readonly _proxy: Proxied<MainThreadChatSessionsShape>;
 	private readonly _statusProviders = new Map<number, { provider: vscode.ChatSessionsProvider; disposable: DisposableStore }>();
 	private _nextHandle = 0;
+	private _sessionMap: Map<string, vscode.ChatSessionContent & Record<string, unknown>> = new Map();
 
 	constructor(
+		commands: ExtHostCommands,
 		@IExtHostRpcService private readonly _extHostRpc: IExtHostRpcService,
 		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
 		this._proxy = this._extHostRpc.getProxy(MainContext.MainThreadChatSessions);
+
+		commands.registerArgumentProcessor({
+			processArgument: (arg) => {
+				if (arg && arg.$mid === MarshalledId.ChatSessionContext) {
+					const id = this.uriToId(arg.uri);
+					const sessionContent = this._sessionMap.get(id);
+					if (sessionContent) {
+						return sessionContent;
+					} else {
+						this._logService.warn(`No chat session found for URI: ${id}`);
+						return arg;
+					}
+				}
+
+				return arg;
+			}
+		});
 	}
 
 	registerChatSessionsProvider(provider: vscode.ChatSessionsProvider): vscode.Disposable {
 		const handle = this._nextHandle++;
 		const disposables = new DisposableStore();
 
 		this._statusProviders.set(handle, { provider, disposable: disposables });
-		this._proxy.$registerChatSessionsProvider(handle);
+		this._proxy.$registerChatSessionsProvider(handle, provider.chatSessionType);
 
 		return {
 			dispose: () => {
@@ -56,6 +78,20 @@ export class ExtHostChatSessions extends Disposable implements IExtHostChatSessi
 			return [];
 		}
 
-		return await entry.provider.provideChatSessions(token);
+		const session = await entry.provider.provideChatSessions(token);
+		for (const sessionContent of session) {
+			if (sessionContent.uri) {
+				this._sessionMap.set(
+					this.uriToId(sessionContent.uri),
+					sessionContent as vscode.ChatSessionContent & Record<string, unknown>
+				);
+			}
+		}
+
+		return session;
+	}
+
+	private uriToId(uri: URI): string {
+		return `${uri.scheme}+${uri.authority}+${uri.path}`;
 	}
 }