use correct chat variable IDs for implicit prompt attachments

Author: legomushroom

src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts

@@ -5,6 +5,7 @@
 
 import { URI } from '../../../../../base/common/uri.js';
 import { Emitter } from '../../../../../base/common/event.js';
+import { basename } from '../../../../../base/common/resources.js';
 import { IChatRequestVariableEntry } from '../../common/chatModel.js';
 import { ChatPromptAttachmentModel } from './chatPromptAttachmentModel.js';
 import { PromptsConfig } from '../../../../../platform/prompts/common/config.js';
@@ -13,6 +14,30 @@ import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 
+/**
+ * Prompt IDs start with a well-defined prefix that is used by
+ * the copilot extension to identify prompt references.
+ *
+ * @param uri The URI of the prompt file.
+ * @param isRoot Whether the prompt file is the root file, or a
+ *               child reference that is nested inside the root file.
+ */
+export const createPromptVariableId = (
+	uri: URI,
+	isRoot: boolean,
+): string => {
+	// the default prefix that is used for all prompt files
+	let prefix = 'vscode.prompt.instructions';
+	// if the reference is the root object, add the `.root` suffix
+	if (isRoot) {
+		prefix += '.root';
+	}
+
+	// final `id` for all `prompt files` starts with the well-defined
+	// part that the copilot extension(or other chatbot) can rely on
+	return `${prefix}__${uri}`;
+};
+
 /**
  * Utility to convert a {@link reference} to a chat variable entry.
  * The `id` of the chat variable can be one of the following:
@@ -34,23 +59,14 @@ export const toChatVariable = (
 	// default `id` is the stringified `URI`
 	let id = `${uri}`;
 
-	// for prompt files, we add a prefix to the `id`
+	// prompts have special `id`s that are used by the copilot extension
 	if (isPromptFile) {
-		// the default prefix that is used for all prompt files
-		let prefix = 'vscode.prompt.instructions';
-		// if the reference is the root object, add the `.root` suffix
-		if (isRoot) {
-			prefix += '.root';
-		}
-
-		// final `id` for all `prompt files` starts with the well-defined
-		// part that the copilot extension(or other chatbot) can rely on
-		id = `${prefix}__${id}`;
+		id = createPromptVariableId(uri, isRoot);
 	}
 
 	return {
 		id,
-		name: uri.fsPath,
+		name: `file:${basename(uri)}`,
 		value: uri,
 		kind: 'file',
 	};

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

@@ -9,6 +9,7 @@ import { Disposable, DisposableStore, MutableDisposable } from '../../../../../b
 import { Schemas } from '../../../../../base/common/network.js';
 import { autorun } from '../../../../../base/common/observable.js';
 import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { assertDefined } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
@@ -25,6 +26,7 @@ import { ChatAgentLocation } from '../../common/constants.js';
 import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
 import { PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/constants.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { createPromptVariableId } from '../chatAttachmentModel/chatPromptAttachmentsCollection.js';
 
 export class ChatImplicitContextContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'chat.implicitContext';
@@ -234,6 +236,21 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 
 export class ChatImplicitContext extends Disposable implements IChatRequestImplicitVariableEntry {
 	get id() {
+		// IDs for prompt files need to start with a special prefix
+		// that is used by the copilot extension to identify them
+		if (this.isPrompt) {
+			assertDefined(
+				this.value,
+				'Implicit prompt attachments must have a value.',
+			);
+
+			if (URI.isUri(this.value)) {
+				return createPromptVariableId(this.value, true);
+			}
+
+			return createPromptVariableId(this.value.uri, true);
+		}
+
 		if (URI.isUri(this.value)) {
 			return 'vscode.implicit.file';
 		} else if (this.value) {