Adopt isSubAgent tool call hint (#1173)

See microsoft/vscode#266588

Author: roblourens

src/extension/inlineChat/vscode-node/inlineChatCommands.ts

@@ -383,7 +383,8 @@ function fetchSuggestion(accessor: ServicesAccessor, thread: vscode.CommentThrea
 			toolInvocationToken: undefined as never,
 			model: null!,
 			tools: new Map(),
-			id: '1'
+			id: '1',
+			sessionId: '1',
 		};
 		let markdown = '';
 		const edits: ReviewSuggestionChange[] = [];

src/extension/mcp/vscode-node/commands.ts

@@ -257,7 +257,8 @@ Error: ${error}`);
 					toolInvocationToken: generateUuid() as never,
 					toolReferences: [],
 					tools: new Map(),
-					id: '1'
+					id: '1',
+					sessionId: ''
 				},
 				props: {
 					targetSchema: validateArgs.targetConfig,

src/extension/prompt/common/intents.ts

@@ -56,6 +56,7 @@ export interface IBuildPromptContext {
 		readonly toolReferences: readonly InternalToolReference[];
 		readonly toolInvocationToken: vscode.ChatParticipantToolToken;
 		readonly availableTools: readonly vscode.LanguageModelToolInformation[];
+		readonly inSubAgent?: boolean;
 	};
 	readonly modeInstructions?: vscode.ChatRequestModeInstructions;
 

src/extension/prompt/node/executePromptToolCalling.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { randomUUID } from 'crypto';
-import type { CancellationToken, ChatRequest, LanguageModelToolInformation, Progress } from 'vscode';
+import type { CancellationToken, ChatRequest, ChatResponseStream, LanguageModelToolInformation, Progress } from 'vscode';
 import { IAuthenticationChatUpgradeService } from '../../../platform/authentication/common/authenticationUpgrade';
 import { ChatLocation, ChatResponse } from '../../../platform/chat/common/commonTypes';
 import { IEndpointProvider } from '../../../platform/endpoint/common/endpointProvider';
@@ -43,6 +43,17 @@ export class ExecutePromptToolCallingLoop extends ToolCallingLoop<IExecutePrompt
 		super(options, instantiationService, endpointProvider, logService, requestLogger, authenticationChatUpgradeService, telemetryService);
 	}
 
+	protected override createPromptContext(availableTools: LanguageModelToolInformation[], outputStream: ChatResponseStream | undefined) {
+		const context = super.createPromptContext(availableTools, outputStream);
+		if (context.tools) {
+			context.tools = {
+				...context.tools,
+				inSubAgent: true
+			};
+		}
+		return context;
+	}
+
 	private async getEndpoint(request: ChatRequest) {
 		let endpoint = await this.endpointProvider.getChatEndpoint(this.options.request);
 		if (!endpoint.supportsToolCalls) {

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

@@ -127,6 +127,7 @@ suite('defaultIntentRequestHandler', () => {
 		model: LanguageModelChat = { family: '' } as any;
 		tools = new Map();
 		id = generateUuid();
+		sessionId = generateUuid();
 	}
 
 	const responseStream = new ChatResponseStreamImpl(p => response.push(p), () => { });

src/extension/prompts/node/panel/toolCalling.tsx

@@ -5,7 +5,7 @@
 
 import { RequestMetadata, RequestType } from '@vscode/copilot-api';
 import { AssistantMessage, BasePromptElementProps, PromptRenderer as BasePromptRenderer, Chunk, IfEmpty, Image, JSONTree, PromptElement, PromptElementProps, PromptMetadata, PromptPiece, PromptSizing, TokenLimit, ToolCall, ToolMessage, useKeepWith, UserMessage } from '@vscode/prompt-tsx';
-import type { ChatParticipantToolToken, LanguageModelToolResult2, LanguageModelToolTokenizationOptions } from 'vscode';
+import type { ChatParticipantToolToken, LanguageModelToolInvocationOptions, LanguageModelToolResult2, LanguageModelToolTokenizationOptions } from 'vscode';
 import { IAuthenticationService } from '../../../../platform/authentication/common/authentication';
 import { ConfigKey, IConfigurationService } from '../../../../platform/configuration/common/configurationService';
 import { modelCanUseMcpResultImageURL } from '../../../../platform/endpoint/common/chatModelCapabilities';
@@ -213,7 +213,17 @@ class ToolResultElement extends PromptElement<ToolResultElementProps, void> {
 						inputObj = await copilotTool.resolveInput(inputObj, this.props.promptContext, this.props.toolCallMode);
 					}
 
-					toolResult = await this.toolsService.invokeTool(this.props.toolCall.name, { input: inputObj, toolInvocationToken: this.props.toolInvocationToken, tokenizationOptions, chatRequestId: this.props.requestId }, CancellationToken.None);
+					const invocationOptions: LanguageModelToolInvocationOptions<unknown> = {
+						input: inputObj,
+						toolInvocationToken: this.props.toolInvocationToken,
+						tokenizationOptions,
+						chatRequestId: this.props.requestId
+					};
+					if (this.props.promptContext.tools?.inSubAgent) {
+						invocationOptions.fromSubAgent = true;
+					}
+
+					toolResult = await this.toolsService.invokeTool(this.props.toolCall.name, invocationOptions, CancellationToken.None);
 					sendInvokedToolTelemetry(this.promptEndpoint.acquireTokenizer(), this.telemetryService, this.props.toolCall.name, toolResult);
 				} catch (err) {
 					const errResult = toolCallErrorToResult(err);

src/extension/test/node/testHelpers.ts

@@ -23,6 +23,7 @@ export class TestChatRequest implements ChatRequest {
 	public model = null!;
 	public tools = new Map();
 	public id = generateUuid();
+	public sessionId = generateUuid();
 
 	constructor(
 		public prompt: string

src/extension/tools/node/executeTaskTool.ts

@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
+import { ChatResponseStreamImpl } from '../../../util/common/chatResponseStreamImpl';
 import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
-import { ChatResponseMarkdownPart, ExtendedLanguageModelToolResult, LanguageModelTextPart } from '../../../vscodeTypes';
+import { ChatPrepareToolInvocationPart, ExtendedLanguageModelToolResult, LanguageModelTextPart } from '../../../vscodeTypes';
 import { Conversation, Turn } from '../../prompt/common/conversation';
 import { IBuildPromptContext } from '../../prompt/common/intents';
 import { ExecutePromptToolCallingLoop } from '../../prompt/node/executePromptToolCalling';
 import { ToolName } from '../common/toolNames';
 import { CopilotToolMode, ICopilotTool, ToolRegistry } from '../common/toolsRegistry';
-import { ChatResponseStreamImpl } from '../../../util/common/chatResponseStreamImpl';
 
 export interface IExecuteTaskParams {
 	prompt: string;
@@ -36,11 +36,10 @@ class ExecuteTaskTool implements ICopilotTool<IExecuteTaskParams> {
 			promptText: options.input.prompt,
 		});
 
-		// TODO This also prevents codeblock pills from being rendered
-		// I want to render this content as thinking blocks but couldn't get it to work
+		// I want to render this content as thinking blocks when we they include tool calls
 		const stream = this._inputContext?.stream && ChatResponseStreamImpl.filter(
 			this._inputContext.stream,
-			part => !(part instanceof ChatResponseMarkdownPart)
+			part => part instanceof ChatPrepareToolInvocationPart
 		);
 
 		const loopResult = await loop.run(stream, token);

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

@@ -103,6 +103,7 @@ declare module 'vscode' {
 		isConfirmed?: boolean;
 		isComplete?: boolean;
 		toolSpecificData?: ChatTerminalToolInvocationData;
+		fromSubAgent?: boolean;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
 	}

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

@@ -55,6 +55,11 @@ declare module 'vscode' {
 		 */
 		readonly attempt: number;
 
+		/**
+		 * The session identifier for this chat request
+		 */
+		readonly sessionId: string;
+
 		/**
 		 * If automatic command detection is enabled.
 		 */
@@ -216,6 +221,7 @@ declare module 'vscode' {
 		chatSessionId?: string;
 		chatInteractionId?: string;
 		terminalCommand?: string;
+		fromSubAgent?: boolean;
 	}
 
 	export interface LanguageModelToolInvocationPrepareOptions<T> {