Don't resolve variables a second time after intent detection (microsoft#232180)

Fix microsoft/vscode-copilot#9700

Author: roblourens

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

@@ -609,24 +609,32 @@ export class ChatService extends Disposable implements IChatService {
 						const initVariableData: IChatRequestVariableData = { variables: [] };
 						request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, options?.workingSet);
 
-						// Variables may have changed if the agent and slash command changed, so resolve them again even if we already had a chatRequest
-						const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext, model, progressCallback, token);
-						for (const variable of variableData.variables) {
-							if (request.workingSet && variable.isFile && URI.isUri(variable.value)) {
-								request.workingSet.push(variable.value);
+						let variableData: IChatRequestVariableData;
+						let message: string;
+						if (chatRequest) {
+							variableData = chatRequest.variableData;
+							message = getPromptText(request.message).message;
+						} else {
+							variableData = await this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext, model, progressCallback, token);
+							for (const variable of variableData.variables) {
+								if (request.workingSet && variable.isFile && URI.isUri(variable.value)) {
+									request.workingSet.push(variable.value);
+								}
 							}
+							model.updateRequest(request, variableData);
+
+							const promptTextResult = getPromptText(request.message);
+							variableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
+							message = promptTextResult.message;
 						}
-						model.updateRequest(request, variableData);
-						const promptTextResult = getPromptText(request.message);
-						const updatedVariableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
 
 						return {
 							sessionId,
 							requestId: request.id,
 							agentId: agent.id,
-							message: promptTextResult.message,
+							message,
 							command: command?.name,
-							variables: updatedVariableData,
+							variables: variableData,
 							enableCommandDetection,
 							isParticipantDetected,
 							attempt,