add isSystemInitiated and relevant changes (#4944)

* add isSystemInitiated and relevant changes

* simplify agent interaction type determination and add utility function for request kind mapping

* update proposed api

* resolve issue

* Address feedback

* update

* revert unrelated changes

* revert changes

* fix tests

Author: meganrogge

src/extension/intents/node/toolCallingLoop.ts

@@ -1285,7 +1285,7 @@ export abstract class ToolCallingLoop<TOptions extends IToolCallingLoopOptions =
 					type: 'function',
 				})),
 			},
-			userInitiatedRequest: (iterationNumber === 0 && !isContinuation && !this.options.request.subAgentInvocationId) || this.stopHookUserInitiated,
+			userInitiatedRequest: (iterationNumber === 0 && !isContinuation && !this.options.request.subAgentInvocationId && !this.options.request.isSystemInitiated) || this.stopHookUserInitiated,
 			enableThinking,
 			reasoningEffort,
 		}, token).finally(() => {

src/extension/prompt/node/chatParticipantTelemetry.ts

@@ -152,6 +152,7 @@ type RequestPanelTelemetryProperties = RequestTelemetryProperties & {
 	parentRequestId: string | undefined;
 	vscodeRequestId: string | undefined;
 	slashCommand: string;
+	isSystemInitiated: string;
 };
 
 type RequestTelemetryMeasurements = {
@@ -717,7 +718,8 @@ export class PanelChatTelemetry extends ChatTelemetry<IDocumentContext | undefin
 				"mode": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The chat mode used for this request (e.g., ask, edit, agent, custom)." },
 				"parentRequestId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The parent request id if this request is from a subagent." },
 				"vscodeRequestId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The VS Code chat request id, for joining with VS Code telemetry events." },
-				"slashCommand": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The slash command used by the user, if any (e.g. troubleshoot, explain). Empty if no slash command was used." }
+				"slashCommand": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The slash command used by the user, if any (e.g. troubleshoot, explain). Empty if no slash command was used." },
+				"isSystemInitiated": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Whether the request was system-initiated (e.g. terminal completion notification) rather than user-typed." }
 			}
 		*/
 		this._telemetryService.sendMSFTTelemetryEvent('panel.request', {
@@ -737,7 +739,8 @@ export class PanelChatTelemetry extends ChatTelemetry<IDocumentContext | undefin
 			mode: this._getModeNameForTelemetry(),
 			parentRequestId: this._request.parentRequestId,
 			vscodeRequestId: this._request.id,
-			slashCommand: getSlashCommandForTelemetry(this._request, URI.from(this._extensionContext.extensionUri))
+			slashCommand: getSlashCommandForTelemetry(this._request, URI.from(this._extensionContext.extensionUri)),
+			isSystemInitiated: String(!!this._request.isSystemInitiated)
 		} satisfies RequestPanelTelemetryProperties, {
 			turn: this._conversation.turns.length,
 			round: roundIndex,

src/extension/prompt/node/defaultIntentRequestHandler.ts

@@ -718,7 +718,7 @@ class DefaultToolCallingLoop extends ToolCallingLoop<IDefaultToolLoopOptions> {
 				messageId: this.telemetry.telemetryMessageId,
 				conversationId: this.options.conversation.sessionId,
 				messageSource: this.options.intent?.id && this.options.intent.id !== UnknownIntent.ID ? `${messageSourcePrefix}.${this.options.intent.id}` : `${messageSourcePrefix}.user`,
-				subType: this.options.request.subAgentInvocationId ? `subagent` : undefined,
+				subType: this.options.request.subAgentInvocationId ? `subagent` : this.options.request.isSystemInitiated ? 'system-initiated' : undefined,
 				parentRequestId: this.options.request.parentRequestId,
 			},
 			requestKindOptions: this.options.request.subAgentInvocationId

src/extension/prompt/node/test/__snapshots__/defaultIntentRequestHandler.spec.ts.snap

@@ -670,6 +670,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -911,6 +912,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -1152,6 +1154,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -1393,6 +1396,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -1684,6 +1688,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -1925,6 +1930,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -2166,6 +2172,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -2407,6 +2414,7 @@ exports[`defaultIntentRequestHandler > confirms on max tool call iterations, and
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -2731,6 +2739,7 @@ exports[`defaultIntentRequestHandler > makes a successful request with a single
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -3082,6 +3091,7 @@ exports[`defaultIntentRequestHandler > makes a tool call turn 2`] = `
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",
@@ -3323,6 +3333,7 @@ exports[`defaultIntentRequestHandler > makes a tool call turn 2`] = `
         "contextTypes": "none",
         "conversationId": "some-session-id",
         "isParticipantDetected": "false",
+        "isSystemInitiated": "false",
         "languageId": undefined,
         "mode": "ask",
         "model": "gpt-4.1-2025-04-14",

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

@@ -305,6 +305,8 @@ export interface AgentUserMessageProps extends BasePromptElementProps, AgentUser
 	readonly hasStopHookQuery?: boolean;
 	/** Additional context provided by SubagentStart hooks. */
 	readonly additionalHookContext?: string;
+	/** When true, this request was system-initiated (e.g. terminal completion notification) and should skip context/wrapping. */
+	readonly isSystemInitiated?: boolean;
 }
 
 export function getUserMessagePropsFromTurn(turn: Turn, endpoint: IChatEndpoint, customizations?: AgentUserMessageCustomizations): AgentUserMessageProps {
@@ -334,6 +336,7 @@ export function getUserMessagePropsFromAgentProps(agentProps: AgentPromptProps,
 		editedFileEvents: agentProps.promptContext.editedFileEvents,
 		hasStopHookQuery: agentProps.promptContext.hasStopHookQuery,
 		additionalHookContext: agentProps.promptContext.additionalHookContext,
+		isSystemInitiated: agentProps.promptContext.request?.isSystemInitiated,
 		// TODO:@roblourens
 		sessionId: (agentProps.promptContext.tools?.toolInvocationToken as any)?.sessionId,
 		sessionResource: (agentProps.promptContext.tools?.toolInvocationToken as any)?.sessionResource,
@@ -365,6 +368,12 @@ export class AgentUserMessage extends PromptElement<AgentUserMessageProps> {
 			this.logService.trace('Re-rendering historical user message');
 		}
 
+		// System-initiated messages (e.g. terminal completion notifications) are
+		// self-contained and should not be wrapped in <userRequest> or have context re-added.
+		if (this.props.isSystemInitiated) {
+			return <UserMessage>{this.props.request}</UserMessage>;
+		}
+
 		const query = await this.promptVariablesService.resolveToolReferencesInPrompt(this.props.request, this.props.toolReferences ?? []);
 		const hasReplaceStringTool = !!this.props.availableTools?.find(tool => tool.name === ToolName.ReplaceString);
 		const hasMultiReplaceStringTool = !!this.props.availableTools?.find(tool => tool.name === ToolName.MultiReplaceString);