Update runInTerminalTool to avoid using state when recommending other tools (microsoft#259460)

Author: DonJayamanne

src/vs/workbench/contrib/chat/common/chatService.ts

@@ -277,6 +277,8 @@ export interface IChatTerminalToolInvocationData {
 		userEdited?: string;
 		toolEdited?: string;
 	};
+	/** Message for model recommending the use of an alternative tool */
+	alternativeRecommendation?: string;
 	language: string;
 }
 

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/alternativeRecommendation.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ILanguageModelToolsService, IToolResult } from '../../../chat/common/languageModelToolsService.js';
+import type { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
 
 let previouslyRecommededInSession = false;
 
@@ -26,7 +26,7 @@ const terminalCommands: { commands: RegExp[]; tags: string[] }[] = [
 	}
 ];
 
-export function getRecommendedToolsOverRunInTerminal(commandLine: string, languageModelToolsService: ILanguageModelToolsService): IToolResult | undefined {
+export function getRecommendedToolsOverRunInTerminal(commandLine: string, languageModelToolsService: ILanguageModelToolsService): string | undefined {
 	const tools = languageModelToolsService.getTools();
 	if (!tools || previouslyRecommededInSession) {
 		return;
@@ -55,12 +55,7 @@ export function getRecommendedToolsOverRunInTerminal(commandLine: string, langua
 
 	if (recommendedTools.size) {
 		previouslyRecommededInSession = true;
-		return {
-			content: [{
-				kind: 'text',
-				value: messages.join('  \n')
-			}],
-		};
+		return messages.join('  \n');
 	}
 
 	return undefined;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalTool.ts

@@ -126,10 +126,6 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 	// Immutable window state
 	protected readonly _osBackend: Promise<OperatingSystem>;
 
-	// HACK: Per-tool call state, saved globally
-	// TODO: These should not be part of the state as different sessions could get confused https://github.com/microsoft/vscode/issues/255889
-	private _alternativeRecommendation?: IToolResult;
-
 	private static readonly _backgroundExecutions = new Map<string, BackgroundTerminalExecution>();
 	public static getBackgroundOutput(id: string): string {
 		const backgroundExecution = RunInTerminalTool._backgroundExecutions.get(id);
@@ -176,8 +172,8 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 	async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
 		const args = context.parameters as IRunInTerminalInputParams;
 
-		this._alternativeRecommendation = getRecommendedToolsOverRunInTerminal(args.command, this._languageModelToolsService);
-		const presentation = this._alternativeRecommendation ? 'hidden' : undefined;
+		const alternativeRecommendation = getRecommendedToolsOverRunInTerminal(args.command, this._languageModelToolsService);
+		const presentation = alternativeRecommendation ? 'hidden' : undefined;
 
 		const os = await this._osBackend;
 		const shell = await this._terminalProfileResolverService.getDefaultShell({
@@ -193,7 +189,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		let confirmationMessages: IToolConfirmationMessages | undefined;
-		if (this._alternativeRecommendation) {
+		if (alternativeRecommendation) {
 			confirmationMessages = undefined;
 		} else {
 			const actualCommand = toolEditedCommand ?? args.command;
@@ -250,23 +246,27 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 					toolEdited: toolEditedCommand
 				},
 				language,
+				alternativeRecommendation,
 			}
 		};
 	}
 
 	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
-		if (this._alternativeRecommendation) {
-			return this._alternativeRecommendation;
-		}
-
-		const args = invocation.parameters as IRunInTerminalInputParams;
-
-		this._logService.debug(`RunInTerminalTool: Invoking with options ${JSON.stringify(args)}`);
-
 		const toolSpecificData = invocation.toolSpecificData as IChatTerminalToolInvocationData | undefined;
 		if (!toolSpecificData) {
 			throw new Error('toolSpecificData must be provided for this tool');
 		}
+		if (toolSpecificData.alternativeRecommendation) {
+			return {
+				content: [{
+					kind: 'text',
+					value: toolSpecificData.alternativeRecommendation
+				}]
+			};
+		}
+
+		const args = invocation.parameters as IRunInTerminalInputParams;
+		this._logService.debug(`RunInTerminalTool: Invoking with options ${JSON.stringify(args)}`);
 		let toolResultMessage: string | IMarkdownString | undefined;
 
 		const chatSessionId = invocation.context?.sessionId ?? 'no-chat-session';