Fix #new (#1042)

Fix #265380

Author: roblourens

src/extension/prompt/common/conversation.ts

@@ -15,6 +15,8 @@ import { Location, Range } from '../../../vscodeTypes';
 import { InternalToolReference, IToolCallRound } from '../common/intents';
 import { ChatVariablesCollection } from './chatVariablesCollection';
 import { ToolCallRound } from './toolCallRound';
+import { ServicesAccessor } from '../../../util/vs/platform/instantiation/common/instantiation';
+import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
 export { PromptReference } from '@vscode/prompt-tsx';
 
 export enum TurnStatus {
@@ -331,6 +333,7 @@ export interface IResultMetadata {
 	/** The user message exactly as it must be rendered in history. Should not be optional, but not every prompt will adopt this immediately */
 	renderedUserMessage?: Raw.ChatCompletionContentPart[];
 	renderedGlobalContext?: Raw.ChatCompletionContentPart[];
+	globalContextCacheKey?: string;
 	command?: string;
 	filterCategory?: FilterReason;
 
@@ -363,5 +366,11 @@ export class RenderedUserMessageMetadata {
 export class GlobalContextMessageMetadata {
 	constructor(
 		readonly renderedGlobalContext: Raw.ChatCompletionContentPart[],
+		readonly cacheKey: string
 	) { }
 }
+
+export function getGlobalContextCacheKey(accessor: ServicesAccessor): string {
+	const workspaceService = accessor.get(IWorkspaceService);
+	return workspaceService.getWorkspaceFolders().map(folder => folder.toString()).join(',');
+}

src/extension/prompt/node/chatParticipantRequestHandler.ts

@@ -35,7 +35,7 @@ import { IIntentService } from '../../intents/node/intentService';
 import { UnknownIntent } from '../../intents/node/unknownIntent';
 import { ContributedToolName } from '../../tools/common/toolNames';
 import { ChatVariablesCollection } from '../common/chatVariablesCollection';
-import { Conversation, GlobalContextMessageMetadata, ICopilotChatResult, ICopilotChatResultIn, normalizeSummariesOnRounds, RenderedUserMessageMetadata, Turn, TurnStatus } from '../common/conversation';
+import { Conversation, getGlobalContextCacheKey, GlobalContextMessageMetadata, ICopilotChatResult, ICopilotChatResultIn, normalizeSummariesOnRounds, RenderedUserMessageMetadata, Turn, TurnStatus } from '../common/conversation';
 import { InternalToolReference } from '../common/intents';
 import { ChatTelemetryBuilder } from './chatParticipantTelemetry';
 import { DefaultIntentRequestHandler } from './defaultIntentRequestHandler';
@@ -325,9 +325,7 @@ export class ChatParticipantRequestHandler {
 
 
 export function addHistoryToConversation(accessor: ServicesAccessor, history: ReadonlyArray<ChatRequestTurn | ChatResponseTurn>): { turns: Turn[]; sessionId: string | undefined } {
-	const commandService = accessor.get(ICommandService);
-	const conversationStore = accessor.get(IConversationStore);
-	const workspaceService = accessor.get(IWorkspaceService);
+	const instaService = accessor.get(IInstantiationService);
 
 	const turns: Turn[] = [];
 	let sessionId: string | undefined;
@@ -339,12 +337,12 @@ export function addHistoryToConversation(accessor: ServicesAccessor, history: Re
 		if (entry instanceof ChatRequestTurn) {
 			previousChatRequestTurn = entry;
 		} else {
-			const existingTurn = findExistingTurnFromVSCodeChatHistoryTurn(conversationStore, entry);
+			const existingTurn = instaService.invokeFunction(findExistingTurnFromVSCodeChatHistoryTurn, entry);
 			if (existingTurn) {
 				turns.push(existingTurn);
 			} else {
 				if (previousChatRequestTurn) {
-					const deserializedTurn = createTurnFromVSCodeChatHistoryTurns(previousChatRequestTurn, entry, commandService, workspaceService);
+					const deserializedTurn = instaService.invokeFunction(createTurnFromVSCodeChatHistoryTurns, previousChatRequestTurn, entry);
 					previousChatRequestTurn = undefined;
 					turns.push(deserializedTurn);
 				}
@@ -363,7 +361,8 @@ export function addHistoryToConversation(accessor: ServicesAccessor, history: Re
 /**
  * Try to find an existing `Turn` instance that we created previously based on the responseId of a vscode turn.
  */
-function findExistingTurnFromVSCodeChatHistoryTurn(conversationStore: IConversationStore, turn: ChatRequestTurn | ChatResponseTurn): Turn | undefined {
+function findExistingTurnFromVSCodeChatHistoryTurn(accessor: ServicesAccessor, turn: ChatRequestTurn | ChatResponseTurn): Turn | undefined {
+	const conversationStore = accessor.get(IConversationStore);
 	const responseId = getResponseIdFromVSCodeChatHistoryTurn(turn);
 	const conversation = responseId ? conversationStore.getConversation(responseId) : undefined;
 	return conversation?.turns.find(turn => turn.id === responseId);
@@ -381,11 +380,14 @@ function getResponseIdFromVSCodeChatHistoryTurn(turn: ChatRequestTurn | ChatResp
  * Try as best as possible to create a `Turn` object from data that comes from vscode.
  */
 function createTurnFromVSCodeChatHistoryTurns(
+	accessor: ServicesAccessor,
 	chatRequestTurn: ChatRequestTurn2,
-	chatResponseTurn: ChatResponseTurn,
-	commandService: ICommandService,
-	workspaceService: IWorkspaceService
+	chatResponseTurn: ChatResponseTurn
 ): Turn {
+	const commandService = accessor.get(ICommandService);
+	const workspaceService = accessor.get(IWorkspaceService);
+	const instaService = accessor.get(IInstantiationService);
+
 	const currentTurn = new Turn(
 		undefined,
 		{ message: chatRequestTurn.prompt, type: 'user' },
@@ -428,7 +430,8 @@ function createTurnFromVSCodeChatHistoryTurns(
 	currentTurn.setResponse(status, { message: content, type: 'model', name: command?.commandId || UnknownIntent.ID }, undefined, chatResponseTurn.result);
 	const turnMetadata = (chatResponseTurn.result as ICopilotChatResultIn).metadata;
 	if (turnMetadata?.renderedGlobalContext) {
-		currentTurn.setMetadata(new GlobalContextMessageMetadata(turnMetadata?.renderedGlobalContext));
+		const cacheKey = turnMetadata.globalContextCacheKey ?? instaService.invokeFunction(getGlobalContextCacheKey);
+		currentTurn.setMetadata(new GlobalContextMessageMetadata(turnMetadata?.renderedGlobalContext, cacheKey));
 	}
 	if (turnMetadata?.renderedUserMessage) {
 		currentTurn.setMetadata(new RenderedUserMessageMetadata(turnMetadata.renderedUserMessage));

src/extension/prompts/node/agent/agentPrompt.tsx

@@ -26,7 +26,7 @@ import { ChatRequestEditedFileEventKind, Position, Range } from '../../../../vsc
 import { GenericBasePromptElementProps } from '../../../context/node/resolvers/genericPanelIntentInvocation';
 import { GitHubPullRequestProviders } from '../../../conversation/node/githubPullRequestProviders';
 import { ChatVariablesCollection } from '../../../prompt/common/chatVariablesCollection';
-import { GlobalContextMessageMetadata, RenderedUserMessageMetadata, Turn } from '../../../prompt/common/conversation';
+import { getGlobalContextCacheKey, GlobalContextMessageMetadata, RenderedUserMessageMetadata, Turn } from '../../../prompt/common/conversation';
 import { InternalToolReference } from '../../../prompt/common/intents';
 import { IPromptVariablesService } from '../../../prompt/node/promptVariablesService';
 import { ToolName } from '../../../tools/common/toolNames';
@@ -234,14 +234,17 @@ export class AgentPrompt extends PromptElement<AgentPromptProps> {
 		if (firstTurn) {
 			const metadata = firstTurn.getMetadata(GlobalContextMessageMetadata);
 			if (metadata) {
-				return metadata.renderedGlobalContext;
+				const currentCacheKey = this.instantiationService.invokeFunction(getGlobalContextCacheKey);
+				if (metadata.cacheKey === currentCacheKey) {
+					return metadata.renderedGlobalContext;
+				}
 			}
 		}
 
 		const rendered = await renderPromptElement(this.instantiationService, endpoint, GlobalAgentContext, { enableCacheBreakpoints: this.props.enableCacheBreakpoints, availableTools: this.props.promptContext.tools?.availableTools }, undefined, undefined);
 		const msg = rendered.messages.at(0)?.content;
 		if (msg) {
-			firstTurn?.setMetadata(new GlobalContextMessageMetadata(msg));
+			firstTurn?.setMetadata(new GlobalContextMessageMetadata(msg, this.instantiationService.invokeFunction(getGlobalContextCacheKey)));
 			return msg;
 		}
 	}