Fix EditFileTool in remote windows (microsoft#239250)

Map the filePath to a URI in the EH, then uriTransformer runs, tool gets a proper URI.

Author: roblourens

src/vs/workbench/api/common/extHostLanguageModelTools.ts

@@ -15,6 +15,8 @@ import { IPreparedToolInvocation, isToolInvocationContext, IToolInvocation, IToo
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto, MainContext, MainThreadLanguageModelToolsShape } from './extHost.protocol.js';
 import * as typeConvert from './extHostTypeConverters.js';
+import { IToolInputProcessor } from '../../contrib/chat/common/tools/tools.js';
+import { EditToolData, EditToolInputProcessor } from '../../contrib/chat/common/tools/editFileTool.js';
 
 export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape {
 	/** A map of tools that were registered in this EH */
@@ -25,6 +27,8 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 	/** A map of all known tools, from other EHs or registered in vscode core */
 	private readonly _allTools = new Map<string, IToolDataDto>();
 
+	private readonly _toolInputProcessors = new Map<string, IToolInputProcessor>();
+
 	constructor(mainContext: IMainContext) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguageModelTools);
 
@@ -33,6 +37,8 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 				this._allTools.set(tool.id, revive(tool));
 			}
 		});
+
+		this._toolInputProcessors.set(EditToolData.id, new EditToolInputProcessor());
 	}
 
 	async $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number> {
@@ -60,10 +66,11 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			}
 
 			// Making the round trip here because not all tools were necessarily registered in this EH
+			const processedInput = this._toolInputProcessors.get(toolId)?.processInput(options.input) ?? options.input;
 			const result = await this._proxy.$invokeTool({
 				toolId,
 				callId,
-				parameters: options.input,
+				parameters: processedInput,
 				tokenBudget: options.tokenizationOptions?.tokenBudget,
 				context: options.toolInvocationToken as IToolInvocationContext | undefined,
 				chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,

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

@@ -79,11 +79,11 @@ import { ChatGettingStartedContribution } from './actions/chatGettingStarted.js'
 import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
 import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
 import { ChatQuotasService, ChatQuotasStatusBarEntry, IChatQuotasService } from './chatQuotasService.js';
-import { BuiltinToolsContribution } from './tools/tools.js';
 import { ChatSetupContribution } from './chatSetup.js';
 import { ChatEditorOverlayController } from './chatEditorOverlay.js';
 import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
 import { PromptFilesConfig } from '../common/promptSyntax/config.js';
+import { BuiltinToolsContribution } from '../common/tools/tools.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);

src/vs/workbench/contrib/chat/browser/tools/tools.ts renamed to src/vs/workbench/contrib/chat/common/tools/editFileTool.ts

@@ -5,43 +5,20 @@
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../../base/common/observable.js';
-import { URI } from '../../../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { SaveReason } from '../../../../common/editor.js';
 import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
 import { ICodeMapperService } from '../../common/chatCodeMapperService.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { ChatModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
-import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../common/languageModelToolsService.js';
-
-export class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'chat.builtinTools';
-
-	constructor(
-		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		const editTool = instantiationService.createInstance(EditTool);
-		this._register(toolsService.registerToolData(editToolData));
-		this._register(toolsService.registerToolImplementation(editToolData.id, editTool));
-	}
-}
-
-interface EditToolParams {
-	filePath: string;
-	explanation: string;
-	code: string;
-}
+import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../common/languageModelToolsService.js';
+import { IToolInputProcessor } from './tools.js';
 
 const codeInstructions = `
 The user is very smart and can understand how to apply your edits to their files, you just need to provide minimal hints.
@@ -63,7 +40,7 @@ class Person {
 }
 `;
 
-const editToolData: IToolData = {
+export const EditToolData: IToolData = {
 	id: 'vscode_editFile',
 	tags: ['vscode_editing'],
 	displayName: localize('chat.tools.editFile', "Edit File"),
@@ -88,7 +65,7 @@ const editToolData: IToolData = {
 	}
 };
 
-class EditTool implements IToolImpl {
+export class EditTool implements IToolImpl {
 
 	constructor(
 		@IChatService private readonly chatService: IChatService,
@@ -105,13 +82,13 @@ class EditTool implements IToolImpl {
 		}
 
 		const parameters = invocation.parameters as EditToolParams;
-		const uri = URI.file(parameters.filePath);
+		const uri = URI.revive(parameters.file); // TODO@roblourens do revive in MainThreadLanguageModelTools
 		if (!this.workspaceContextService.isInsideWorkspace(uri)) {
-			throw new Error(`File ${parameters.filePath} can't be edited because it's not inside the current workspace`);
+			throw new Error(`File ${uri.fsPath} can't be edited because it's not inside the current workspace`);
 		}
 
 		if (await this.ignoredFilesService.fileIsIgnored(uri, token)) {
-			throw new Error(`File ${parameters.filePath} can't be edited because it is configured to be ignored by Copilot`);
+			throw new Error(`File ${uri.fsPath} can't be edited because it is configured to be ignored by Copilot`);
 		}
 
 		const model = this.chatService.getSession(invocation.context?.sessionId) as ChatModel;
@@ -182,3 +159,31 @@ class EditTool implements IToolImpl {
 		};
 	}
 }
+
+export interface EditToolParams {
+	file: UriComponents;
+	explanation: string;
+	code: string;
+}
+
+export interface EditToolRawParams {
+	filePath: string;
+	explanation: string;
+	code: string;
+}
+
+export class EditToolInputProcessor implements IToolInputProcessor {
+	processInput(input: EditToolRawParams): EditToolParams {
+		if (!input.filePath) {
+			// Tool name collision, or input wasn't properly validated upstream
+			return input as any;
+		}
+
+		// Runs in EH, will be mapped
+		return {
+			file: URI.file(input.filePath),
+			explanation: input.explanation,
+			code: input.code,
+		};
+	}
+}

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

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { EditTool, EditToolData } from './editFileTool.js';
+
+export class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.builtinTools';
+
+	constructor(
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		const editTool = instantiationService.createInstance(EditTool);
+		this._register(toolsService.registerToolData(EditToolData));
+		this._register(toolsService.registerToolImplementation(EditToolData.id, editTool));
+	}
+}
+
+export interface IToolInputProcessor {
+	processInput(input: any): any;
+}