Adopt mode name in agent instructions (#1421)

* Adopt mode name in agent instructions

* Test

Author: roblourens

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

@@ -185,12 +185,12 @@ export class AgentPrompt extends PromptElement<AgentPromptProps> {
 			/>
 		);
 		if (this.props.promptContext.modeInstructions) {
-			const { content, toolReferences } = this.props.promptContext.modeInstructions;
+			const { name, content, toolReferences } = this.props.promptContext.modeInstructions;
 			const resolvedContent = toolReferences && toolReferences.length > 0 ? await this.promptVariablesService.resolveToolReferencesInPrompt(content, toolReferences) : content;
 
 			customInstructionsBodyParts.push(
-				<Tag name='customInstructions'>
-					Below are some additional instructions from the user.<br />
+				<Tag name='modeInstructions'>
+					You are currently running in "{name}" mode. Below are your instructions for this mode, they must take precedence over any instructions above.<br />
 					<br />
 					{resolvedContent}
 				</Tag>

src/extension/prompts/node/agent/test/__snapshots__/agentPrompt.spec.tsx.snap

@@ -796,11 +796,11 @@ When generating code, please follow these user provided coding instructions. You
 <instructions>
 This is a test custom instruction file
 </instructions>
-<customInstructions>
-Below are some additional instructions from the user.
+<modeInstructions>
+You are currently running in "Plan" mode. Below are your instructions for this mode, they must take precedence over any instructions above.
 
 custom mode instructions
-</customInstructions>
+</modeInstructions>
 
 
 [copilot_cache_control: { type: 'ephemeral' }]
@@ -2092,11 +2092,11 @@ When generating code, please follow these user provided coding instructions. You
 <instructions>
 This is a test custom instruction file
 </instructions>
-<customInstructions>
-Below are some additional instructions from the user.
+<modeInstructions>
+You are currently running in "Plan" mode. Below are your instructions for this mode, they must take precedence over any instructions above.
 
 custom mode instructions
-</customInstructions>
+</modeInstructions>
 
 
 [copilot_cache_control: { type: 'ephemeral' }]
@@ -3805,11 +3805,11 @@ When generating code, please follow these user provided coding instructions. You
 <instructions>
 This is a test custom instruction file
 </instructions>
-<customInstructions>
-Below are some additional instructions from the user.
+<modeInstructions>
+You are currently running in "Plan" mode. Below are your instructions for this mode, they must take precedence over any instructions above.
 
 custom mode instructions
-</customInstructions>
+</modeInstructions>
 
 
 [copilot_cache_control: { type: 'ephemeral' }]

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

@@ -255,7 +255,7 @@ import { AgentPrompt, AgentPromptProps } from '../agentPrompt';
 				chatVariables: new ChatVariablesCollection(),
 				history: [],
 				query: 'hello',
-				modeInstructions: { content: 'custom mode instructions' },
+				modeInstructions: { name: 'Plan', content: 'custom mode instructions' },
 			}, undefined)).toMatchSnapshot();
 		});
 

src/extension/vscode.proposed.chatParticipantAdditions.d.ts

@@ -6,7 +6,7 @@
 declare module 'vscode' {
 
 	export interface ChatParticipant {
-		onDidPerformAction: Event<ChatUserActionEvent>;
+		readonly onDidPerformAction: Event<ChatUserActionEvent>;
 	}
 
 	/**
@@ -442,7 +442,7 @@ declare module 'vscode' {
 		 * Event that fires when a request is paused or unpaused.
 		 * Chat requests are initially unpaused in the {@link requestHandler}.
 		 */
-		onDidChangePauseState: Event<ChatParticipantPauseStateEvent>;
+		readonly onDidChangePauseState: Event<ChatParticipantPauseStateEvent>;
 	}
 
 	export interface ChatParticipantPauseStateEvent {
@@ -652,6 +652,7 @@ declare module 'vscode' {
 	}
 
 	export interface ChatRequestModeInstructions {
+		readonly name: string;
 		readonly content: string;
 		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
 		readonly metadata?: Record<string, boolean | string | number>;