Forward chat summaries for cloud button v2 impl (#269583)

* merge

* refactor and movie magic to hide fake progress chat req

Author: joshspicer

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

@@ -170,7 +170,11 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 				this._pendingProgress.set(request.requestId, progress);
 				try {
 					const chatSessionContext = this._chatService.getChatSessionFromInternalId(request.sessionId);
-					return await this._proxy.$invokeAgent(handle, request, { history, chatSessionContext }, token) ?? {};
+					return await this._proxy.$invokeAgent(handle, request, {
+						history,
+						chatSessionContext,
+						chatSummary: request.chatSummary
+					}, token) ?? {};
 				} finally {
 					this._pendingProgress.delete(request.requestId);
 				}

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

@@ -1369,7 +1369,7 @@ export type IChatAgentHistoryEntryDto = {
 };
 
 export interface ExtHostChatAgentsShape2 {
-	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: { chatSessionType: string; chatSessionId: string; isUntitled: boolean } }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
+	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: { chatSessionType: string; chatSessionId: string; isUntitled: boolean }; chatSummary?: { prompt?: string; history?: string } }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
 	$provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]>;
 	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
 	$acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;

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

@@ -541,7 +541,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		this._onDidChangeChatRequestTools.fire(request.extRequest);
 	}
 
-	async $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: { chatSessionType: string; chatSessionId: string; isUntitled: boolean } }, token: CancellationToken): Promise<IChatAgentResult | undefined> {
+	async $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: { chatSessionType: string; chatSessionId: string; isUntitled: boolean }; chatSummary?: { prompt?: string; history?: string } }, token: CancellationToken): Promise<IChatAgentResult | undefined> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			throw new Error(`[CHAT](${handle}) CANNOT invoke agent because the agent is not registered`);
@@ -588,7 +588,11 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				};
 			}
 
-			const chatContext: vscode.ChatContext = { history, chatSessionContext };
+			const chatContext: vscode.ChatContext = {
+				history,
+				chatSessionContext,
+				chatSummary: context.chatSummary
+			};
 			const task = agent.invoke(
 				extRequest,
 				chatContext,

src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts

@@ -26,7 +26,7 @@ import { IQuickInputService } from '../../../../../platform/quickinput/common/qu
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { IRemoteCodingAgent, IRemoteCodingAgentsService } from '../../../remoteCodingAgents/common/remoteCodingAgentsService.js';
-import { IChatAgentHistoryEntry, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgent, IChatAgentHistoryEntry, IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeys, ChatContextKeyExprs } from '../../common/chatContextKeys.js';
 import { IChatModel, IChatRequestModel, toChatHistoryContent } from '../../common/chatModel.js';
 import { IChatMode, IChatModeService } from '../../common/chatModes.js';
@@ -648,14 +648,14 @@ export class CreateRemoteAgentJobAction extends Action2 {
 	private async createWithChatSessions(
 		chatSessionsService: IChatSessionsService,
 		chatService: IChatService,
-		chatAgentService: IChatAgentService,
 		quickPickService: IQuickInputService,
-		chatModel: IChatModel,
-		requestParser: ChatRequestParser,
 		sessionId: string,
-		widget: IChatWidget,
 		attachedContext: ChatRequestVariableSet,
 		userPrompt: string,
+		chatSummary?: {
+			prompt?: string;
+			history?: string;
+		}
 	) {
 		const contributions = chatSessionsService.getAllChatSessionContributions();
 		const agent = await this.pickCodingAgent(quickPickService, contributions);
@@ -664,9 +664,11 @@ export class CreateRemoteAgentJobAction extends Action2 {
 		}
 		// TODO(jospicer): The previous chat history doesn't get sent to chat participants!
 		const { type } = agent;
+
 		await chatService.sendRequest(sessionId, userPrompt, {
 			agentIdSilent: type,
 			attachedContext: attachedContext.asArray(),
+			chatSummary,
 		});
 	}
 
@@ -797,22 +799,6 @@ export class CreateRemoteAgentJobAction extends Action2 {
 			const instantiationService = accessor.get(IInstantiationService);
 			const requestParser = instantiationService.createInstance(ChatRequestParser);
 
-			const isChatSessionsExperimentEnabled = configurationService.getValue<boolean>(ChatConfiguration.UseCloudButtonV2);
-			if (isChatSessionsExperimentEnabled) {
-				return await this.createWithChatSessions(
-					chatSessionsService,
-					chatService,
-					chatAgentService,
-					quickPickService,
-					chatModel,
-					requestParser,
-					sessionId,
-					widget,
-					attachedContext,
-					userPrompt
-				);
-			}
-
 			// Add the request to the model first
 			const parsedRequest = requestParser.parseChatRequest(sessionId, userPrompt, ChatAgentLocation.Chat);
 			const addedRequest = chatModel.addRequest(
@@ -836,23 +822,7 @@ export class CreateRemoteAgentJobAction extends Action2 {
 					)
 				});
 
-				const userPromptEntry: IChatAgentHistoryEntry = {
-					request: {
-						sessionId,
-						requestId: generateUuid(),
-						agentId: '',
-						message: userPrompt,
-						command: undefined,
-						variables: { variables: attachedContext.asArray() },
-						location: ChatAgentLocation.Chat,
-						editedFileEvents: [],
-					},
-					response: [],
-					result: {}
-				};
-				const historyEntries = [userPromptEntry];
-				title = await chatAgentService.getChatTitle(defaultAgent.id, historyEntries, CancellationToken.None);
-				summarizedUserPrompt = await chatAgentService.getChatSummary(defaultAgent.id, historyEntries, CancellationToken.None);
+				({ title, summarizedUserPrompt } = await this.generateSummarizedUserPrompt(sessionId, userPrompt, attachedContext, title, chatAgentService, defaultAgent, summarizedUserPrompt));
 			}
 
 			let summary: string = '';
@@ -870,34 +840,31 @@ export class CreateRemoteAgentJobAction extends Action2 {
 						CreateRemoteAgentJobAction.markdownStringTrustedOptions
 					)
 				});
-				const historyEntries: IChatAgentHistoryEntry[] = chatRequests
-					.map(req => ({
-						request: {
-							sessionId,
-							requestId: req.id,
-							agentId: req.response?.agent?.id ?? '',
-							message: req.message.text,
-							command: req.response?.slashCommand?.name,
-							variables: req.variableData,
-							location: ChatAgentLocation.Chat,
-							editedFileEvents: req.editedFileEvents,
-						},
-						response: toChatHistoryContent(req.response!.response.value),
-						result: req.response?.result ?? {}
-					}));
-
-				// TODO: Determine a cutoff point where we stop including earlier history
-				//      For example, if the user has already delegated to a coding agent once,
-				// 		 prefer the conversation afterwards.
-
-				title ??= await chatAgentService.getChatTitle(defaultAgent.id, historyEntries, CancellationToken.None);
-				summary += await chatAgentService.getChatSummary(defaultAgent.id, historyEntries, CancellationToken.None);
+				({ title, summary } = await this.generateSummarizedChatHistory(chatRequests, sessionId, title, chatAgentService, defaultAgent, summary));
 			}
 
 			if (title) {
 				summary += `\nTITLE: ${title}\n`;
 			}
 
+
+			const isChatSessionsExperimentEnabled = configurationService.getValue<boolean>(ChatConfiguration.UseCloudButtonV2);
+			if (isChatSessionsExperimentEnabled) {
+				await chatService.removeRequest(sessionId, addedRequest.id);
+				return await this.createWithChatSessions(
+					chatSessionsService,
+					chatService,
+					quickPickService,
+					sessionId,
+					attachedContext,
+					userPrompt,
+					{
+						prompt: summarizedUserPrompt,
+						history: summary,
+					},
+				);
+			}
+
 			chatModel.acceptResponseProgress(addedRequest, {
 				kind: 'progressMessage',
 				content: new MarkdownString(
@@ -916,6 +883,52 @@ export class CreateRemoteAgentJobAction extends Action2 {
 			remoteJobCreatingKey.set(false);
 		}
 	}
+
+	private async generateSummarizedChatHistory(chatRequests: IChatRequestModel[], sessionId: string, title: string | undefined, chatAgentService: IChatAgentService, defaultAgent: IChatAgent, summary: string) {
+		const historyEntries: IChatAgentHistoryEntry[] = chatRequests
+			.map(req => ({
+				request: {
+					sessionId: sessionId,
+					requestId: req.id,
+					agentId: req.response?.agent?.id ?? '',
+					message: req.message.text,
+					command: req.response?.slashCommand?.name,
+					variables: req.variableData,
+					location: ChatAgentLocation.Chat,
+					editedFileEvents: req.editedFileEvents,
+				},
+				response: toChatHistoryContent(req.response!.response.value),
+				result: req.response?.result ?? {}
+			}));
+
+		// TODO: Determine a cutoff point where we stop including earlier history
+		//      For example, if the user has already delegated to a coding agent once,
+		// 		 prefer the conversation afterwards.
+		title ??= await chatAgentService.getChatTitle(defaultAgent.id, historyEntries, CancellationToken.None);
+		summary += await chatAgentService.getChatSummary(defaultAgent.id, historyEntries, CancellationToken.None);
+		return { title, summary };
+	}
+
+	private async generateSummarizedUserPrompt(sessionId: string, userPrompt: string, attachedContext: ChatRequestVariableSet, title: string | undefined, chatAgentService: IChatAgentService, defaultAgent: IChatAgent, summarizedUserPrompt: string | undefined) {
+		const userPromptEntry: IChatAgentHistoryEntry = {
+			request: {
+				sessionId: sessionId,
+				requestId: generateUuid(),
+				agentId: '',
+				message: userPrompt,
+				command: undefined,
+				variables: { variables: attachedContext.asArray() },
+				location: ChatAgentLocation.Chat,
+				editedFileEvents: [],
+			},
+			response: [],
+			result: {}
+		};
+		const historyEntries = [userPromptEntry];
+		title = await chatAgentService.getChatTitle(defaultAgent.id, historyEntries, CancellationToken.None);
+		summarizedUserPrompt = await chatAgentService.getChatSummary(defaultAgent.id, historyEntries, CancellationToken.None);
+		return { title, summarizedUserPrompt };
+	}
 }
 
 export class ChatSubmitWithCodebaseAction extends Action2 {

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

@@ -148,6 +148,14 @@ export interface IChatAgentRequest {
 	userSelectedTools?: UserSelectedTools;
 	modeInstructions?: IChatRequestModeInstructions;
 	editedFileEvents?: IChatAgentEditedFileEvent[];
+
+	/**
+	 * Summary data for chat sessions context
+	 */
+	chatSummary?: {
+		prompt?: string;
+		history?: string;
+	};
 }
 
 export interface IChatQuestion {

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

@@ -682,6 +682,14 @@ export interface IChatSendRequestOptions {
 	 * The label of the confirmation action that was selected.
 	 */
 	confirmation?: string;
+
+	/**
+	 * Summary data for chat sessions context
+	 */
+	chatSummary?: {
+		prompt?: string;
+		history?: string;
+	};
 }
 
 export const IChatService = createDecorator<IChatService>('IChatService');

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

@@ -822,7 +822,8 @@ export class ChatService extends Disposable implements IChatService {
 							userSelectedModelId: options?.userSelectedModelId,
 							userSelectedTools: options?.userSelectedTools?.get(),
 							modeInstructions: options?.modeInfo?.modeInstructions,
-							editedFileEvents: request.editedFileEvents
+							editedFileEvents: request.editedFileEvents,
+							chatSummary: options?.chatSummary
 						} satisfies IChatAgentRequest;
 					};
 

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

@@ -194,6 +194,10 @@ declare module 'vscode' {
 
 	export interface ChatContext {
 		readonly chatSessionContext?: ChatSessionContext;
+		readonly chatSummary?: {
+			readonly prompt?: string;
+			readonly history?: string;
+		};
 	}
 
 	export interface ChatSessionContext {