cleanup dynamic prompt variables (#251444)

Author: aeschli

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

@@ -77,10 +77,9 @@ import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession } from '../common/chatEditingService.js';
 import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
-import { IChatRequestVariableEntry, ChatRequestVariableSet, isPromptFileVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, toPromptFileVariableEntry } from '../common/chatVariableEntries.js';
+import { IChatRequestVariableEntry, ChatRequestVariableSet, isPromptFileVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry } from '../common/chatVariableEntries.js';
 import { ChatMode2, IChatMode, IChatModeService, isBuiltinChatMode, validateChatMode2 } from '../common/chatModes.js';
 import { IChatFollowup } from '../common/chatService.js';
-import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
 import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
 import { ChatAgentLocation, ChatConfiguration, ChatMode, isChatMode, validateChatMode } from '../common/constants.js';
@@ -97,7 +96,6 @@ import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from './chatEdi
 import { ChatFollowups } from './chatFollowups.js';
 import { ChatSelectedTools } from './chatSelectedTools.js';
 import { IChatViewState } from './chatWidget.js';
-import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
 import { ChatRelatedFiles } from './contrib/chatInputRelatedFilesContrib.js';
 import { resizeImage } from './imageUtils.js';
@@ -167,35 +165,18 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	public async getAttachedAndImplicitContext(sessionId: string): Promise<ChatRequestVariableSet> {
 
-		// prompt files may have nested child references to other prompt
-		// files that are resolved asynchronously, hence we need to wait
-		// for the entire prompt instruction tree to be processed
-
 		const contextArr = new ChatRequestVariableSet();
 
+		// get prompt file variables (instructions) and all rereferenced contents first
 		contextArr.add(... await this.attachmentModel.getPromptFileVariables());
+
+		// then add all other attachments (includes prompt file variables, but they will be ignored if already added)
 		contextArr.add(...this.attachmentModel.attachments);
 
 		if (this.implicitContext?.enabled && this.implicitContext.value) {
 			const implicitChatVariables = await this.implicitContext.toBaseEntries();
 			contextArr.add(...implicitChatVariables);
 		}
-
-		// factor in nested file links of a prompt into the implicit context
-		const variables = this.variableService.getDynamicVariables(sessionId);
-		for (const variable of variables) {
-			if (!(variable instanceof ChatFileReference)) {
-				continue;
-			}
-
-			// the usual URIs list of prompt instructions is `bottom-up`, therefore
-			// we do the same here - first add all child references to the list
-			contextArr.add(
-				...variable.allValidReferences.map((link) => {
-					return toPromptFileVariableEntry(link.uri, false);
-				}),
-			);
-		}
 		return contextArr;
 	}
 
@@ -375,7 +356,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@ITextModelService private readonly textModelResolverService: ITextModelService,
 		@IStorageService private readonly storageService: IStorageService,
 		@ILabelService private readonly labelService: ILabelService,
-		@IChatVariablesService private readonly variableService: IChatVariablesService,
 		@IChatAgentService private readonly agentService: IChatAgentService,
 		@ISharedWebContentExtractorService private readonly sharedWebExtracterService: ISharedWebContentExtractorService,
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,

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

@@ -17,7 +17,6 @@ import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IChatRequestVariableValue, IDynamicVariable } from '../../common/chatVariables.js';
 import { IChatWidget } from '../chat.js';
 import { IChatWidgetContrib } from '../chatWidget.js';
-import { ChatFileReference } from './chatDynamicVariables/chatFileReference.js';
 
 export const dynamicVariableDecorationType = 'chat-dynamic-variable';
 
@@ -87,12 +86,7 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 
 				didChange = true;
 
-				if (ref instanceof ChatFileReference) {
-					ref.range = newRange;
-					return ref;
-				} else {
-					return { ...ref, range: newRange };
-				}
+				return { ...ref, range: newRange };
 			}));
 
 			// cleanup disposable variables
@@ -107,15 +101,7 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 	}
 
 	getInputState(): any {
-		return this.variables
-			.map((variable: IDynamicVariable) => {
-				// return underlying `IDynamicVariable` object for file references
-				if (variable instanceof ChatFileReference) {
-					return variable.reference;
-				}
-
-				return variable;
-			});
+		return this.variables;
 	}
 
 	setInputState(s: any): void {