Merge branch 'yemohyle/multi_replace_string' into yemohyle/main

Author: yemohyleyemohyle

IMPLEMENTATION_SUMMARY.md

@@ -758,6 +758,58 @@
 					]
 				}
 			},
+			{
+				"name": "copilot_multiReplaceString",
+				"toolReferenceName": "multiReplaceString",
+				"displayName": "%copilot.tools.multiReplaceString.name%",
+				"modelDescription": "This tool allows you to apply multiple replace_string_in_file operations in a single call, which is more efficient than calling replace_string_in_file multiple times. It takes an array of replacement operations and applies them sequentially. Each replacement operation has the same parameters as replace_string_in_file: filePath, oldString, newString, and explanation. This tool is ideal when you need to make multiple edits across different files or multiple edits in the same file. The tool will provide a summary of successful and failed operations.",
+				"when": "!config.github.copilot.chat.disableReplaceTool",
+				"inputSchema": {
+					"type": "object",
+					"properties": {
+						"explanation": {
+							"type": "string",
+							"description": "A brief explanation of what the multi-replace operation will accomplish."
+						},
+						"replacements": {
+							"type": "array",
+							"description": "An array of replacement operations to apply sequentially.",
+							"items": {
+								"type": "object",
+								"properties": {
+									"explanation": {
+										"type": "string",
+										"description": "A brief explanation of this specific replacement operation."
+									},
+									"filePath": {
+										"type": "string",
+										"description": "An absolute path to the file to edit."
+									},
+									"oldString": {
+										"type": "string",
+										"description": "The exact literal text to replace, preferably unescaped. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text or does not match exactly, this replacement will fail."
+									},
+									"newString": {
+										"type": "string",
+										"description": "The exact literal text to replace `oldString` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic."
+									}
+								},
+								"required": [
+									"explanation",
+									"filePath",
+									"oldString",
+									"newString"
+								]
+							},
+							"minItems": 1
+						}
+					},
+					"required": [
+						"explanation",
+						"replacements"
+					]
+				}
+			},
 			{
 				"name": "copilot_editNotebook",
 				"toolReferenceName": "editNotebook",

package.json

@@ -277,6 +277,7 @@
 	"copilot.tools.createFile.name": "Create File",
 	"copilot.tools.insertEdit.name": "Edit File",
 	"copilot.tools.replaceString.name": "Replace String in File",
+	"copilot.tools.multiReplaceString.name": "Multi-Replace String in Files",
 	"copilot.tools.editNotebook.name": "Edit Notebook",
 	"copilot.tools.runNotebookCell.name": "Run Notebook Cell",
 	"copilot.tools.getNotebookCellOutput.name": "Get Notebook Cell Output",

package.nls.json

@@ -139,17 +139,13 @@ export class LanguageModelAccess extends Disposable implements IExtensionContrib
 			}
 
 			const baseCount = await PromptRenderer.create(this._instantiationService, endpoint, LanguageModelAccessPrompt, { noSafety: false, messages: [] }).countTokens();
-			let multiplierString = endpoint.multiplier !== undefined ? `${endpoint.multiplier}x` : undefined;
-			if (endpoint.model === AutoChatEndpoint.id) {
-				multiplierString = 'Variable';
-			}
 
 			const model: vscode.LanguageModelChatInformation = {
 				id: endpoint.model,
 				name: endpoint.model === AutoChatEndpoint.id ? 'Auto' : endpoint.name,
 				family: endpoint.family,
 				description: modelDescription,
-				cost: multiplierString,
+				cost: endpoint.multiplier !== undefined && endpoint.multiplier !== 0 ? `${endpoint.multiplier}x` : endpoint.multiplier === 0 ? localize('languageModel.costIncluded', 'Included') : undefined,
 				category: modelCategory,
 				version: endpoint.version,
 				maxInputTokens: endpoint.modelMaxPromptTokens - baseCount - BaseTokensPerCompletion,

src/extension/conversation/vscode-node/languageModelAccess.ts

@@ -66,6 +66,7 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 
 		if (modelCanUseReplaceStringExclusively(model)) {
 			allowTools[ToolName.ReplaceString] = true;
+			allowTools[ToolName.MultiReplaceString] = true;
 			allowTools[ToolName.EditFile] = false;
 		}
 

src/extension/intents/node/agentIntent.ts

@@ -48,6 +48,7 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 
 		if (model.family.startsWith('claude')) {
 			lookForTools.add(ToolName.ReplaceString);
+			lookForTools.add(ToolName.MultiReplaceString);
 		}
 		lookForTools.add(ToolName.EditNotebook);
 		if (requestHasNotebookRefs(request, notebookService, { checkPromptAsWell: true })) {

src/extension/intents/node/editCodeIntent2.ts

@@ -50,6 +50,7 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 
 		if (model.family.startsWith('claude')) {
 			lookForTools.add(ToolName.ReplaceString);
+			lookForTools.add(ToolName.MultiReplaceString);
 		}
 
 		lookForTools.add(ToolName.EditNotebook);

src/extension/intents/node/notebookEditorIntent.ts

@@ -143,7 +143,8 @@ export class DefaultAgentPrompt extends PromptElement<DefaultAgentPromptProps> {
 				{tools.hasReplaceStringTool ?
 					<>
 						Before you edit an existing file, make sure you either already have it in the provided context, or read it with the {ToolName.ReadFile} tool, so that you can make proper changes.<br />
-						Use the {ToolName.ReplaceString} tool to edit files, paying attention to context to ensure your replacement is unique. You can use this tool multiple times per file.<br />
+						{hasMultiReplaceStringTool && <>Prefer the {ToolName.MultiReplaceString} tool when you need to make multiple string replacements across one or more files in a single operation. This is significantly more efficient than calling {ToolName.ReplaceString} multiple times and should be your first choice for: fixing similar patterns across files, applying consistent formatting changes, bulk refactoring operations, or any scenario where you need to make the same type of change in multiple places.<br /></>}
+						Use the {ToolName.ReplaceString} tool for single string replacements, paying attention to context to ensure your replacement is unique.<br />
 						Use the {ToolName.EditFile} tool to insert code into a file ONLY if {ToolName.ReplaceString} has failed.<br />
 						When editing files, group your changes by file.<br />
 						{isGpt5 && <>Make the smallest set of edits needed and avoid reformatting or moving unrelated code. Preserve existing style and conventions, and keep imports, exports, and public APIs stable unless the task requires changes. Prefer completing all edits for a file within a single message when practical.<br /></>}
@@ -313,15 +314,16 @@ export class AlternateGPTPrompt extends PromptElement<DefaultAgentPromptProps> {
 						When editing files, group your changes by file.<br />
 						{isGpt5 && <>Make the smallest set of edits needed and avoid reformatting or moving unrelated code. Preserve existing style and conventions, and keep imports, exports, and public APIs stable unless the task requires changes. Prefer completing all edits for a file within a single message when practical.<br /></>}
 						NEVER show the changes to the user, just call the tool, and the edits will be applied and shown to the user.<br />
-						NEVER print a codeblock that represents a change to a file, use {ToolName.ReplaceString} or {ToolName.EditFile} instead.<br />
-						For each file, give a short description of what needs to be changed, then use the {ToolName.ReplaceString} or {ToolName.EditFile} tools. You can use any tool multiple times in a response, and you can keep writing text after using a tool.<br /></> :
+						NEVER print a codeblock that represents a change to a file, use {ToolName.ReplaceString}, {ToolName.MultiReplaceString}, or {ToolName.EditFile} instead.<br />
+						For each file, give a short description of what needs to be changed, then use the {ToolName.ReplaceString}, {ToolName.MultiReplaceString}, or {ToolName.EditFile} tools. You can use any tool multiple times in a response, and you can keep writing text after using a tool.<br /></> :
 					<>
 						Don't try to edit an existing file without reading it first, so you can make changes properly.<br />
+						{hasMultiReplaceStringTool && <>Prefer the {ToolName.MultiReplaceString} tool when you need to make multiple string replacements across one or more files in a single operation. This should be your first choice for bulk edits.<br /></>}
 						Use the {ToolName.ReplaceString} tool to edit files. When editing files, group your changes by file.<br />
 						{isGpt5 && <>Make the smallest set of edits needed and avoid reformatting or moving unrelated code. Preserve existing style and conventions, and keep imports, exports, and public APIs stable unless the task requires changes. Prefer completing all edits for a file within a single message when practical.<br /></>}
 						NEVER show the changes to the user, just call the tool, and the edits will be applied and shown to the user.<br />
-						NEVER print a codeblock that represents a change to a file, use {ToolName.ReplaceString} instead.<br />
-						For each file, give a short description of what needs to be changed, then use the {ToolName.ReplaceString} tool. You can use any tool multiple times in a response, and you can keep writing text after using a tool.<br />
+						NEVER print a codeblock that represents a change to a file, use {ToolName.ReplaceString} or {ToolName.MultiReplaceString} instead.<br />
+						For each file, give a short description of what needs to be changed, then use the {ToolName.ReplaceString} or {ToolName.MultiReplaceString} tool. You can use any tool multiple times in a response, and you can keep writing text after using a tool.<br />
 					</>}
 				<GenericEditingTips {...this.props} />
 				The {ToolName.EditFile} tool is very smart and can understand how to apply your edits to the user's files, you just need to provide minimal hints.<br />

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

@@ -212,6 +212,33 @@ class ToolResultElement extends PromptElement<ToolResultElementProps, void> {
 				}
 			}
 			this.sendToolCallTelemetry(outcome, validation);
+		}		// Check if next_tool_prediction contains "replace_string_in_file" and prepare reminder text
+		let reminderText = '';
+		if (toolResult) {
+			try {
+				const toolArgs = JSON.parse(this.props.toolCall.arguments);
+				this.logService.logger.info(`Tool call arguments parsed: ${JSON.stringify(toolArgs)}`);
+
+				if (toolArgs.next_tool_prediction && Array.isArray(toolArgs.next_tool_prediction)) {
+					this.logService.logger.info(`Found next_tool_prediction: ${JSON.stringify(toolArgs.next_tool_prediction)}`);
+					const hasSomeTool = toolArgs.next_tool_prediction.some((tool: string) =>
+						typeof tool === 'string' && tool.includes('replace_string_in_file')
+					);
+
+					if (hasSomeTool) {
+						this.logService.logger.info('Found "replace_string_in_file" in next_tool_prediction, adding reminder');
+						//reminderText = '\n\n<reminder>\nIf you need to make multiple edits using replace_string_in_file tool, consider making them in parallel whenever possible.\n</reminder>';
+						reminderText = '';
+					} else {
+						this.logService.logger.info('No "replace_string_in_file" found in next_tool_prediction');
+					}
+				} else {
+					this.logService.logger.info('No next_tool_prediction found or not an array');
+				}
+			} catch (error) {
+				// If parsing fails, continue with original result
+				this.logService.logger.warn('Failed to parse tool arguments for next_tool_prediction check');
+			}
 		}
 
 		const toolResultElement = this.props.enableCacheBreakpoints ?
@@ -227,6 +254,7 @@ class ToolResultElement extends PromptElement<ToolResultElementProps, void> {
 				<meta value={new ToolResultMetadata(this.props.toolCall.id!, toolResult, isCancelled)} />
 				{...extraMetadata.map(m => <meta value={m} />)}
 				{toolResultElement}
+				{reminderText && reminderText}
 				{this.props.isLast && this.props.enableCacheBreakpoints && <cacheBreakpoint type={CacheType} />}
 			</ToolMessage>
 		);

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

@@ -28,6 +28,7 @@ export const enum ToolName {
 	EditFile = 'insert_edit_into_file',
 	CreateFile = 'create_file',
 	ReplaceString = 'replace_string_in_file',
+	MultiReplaceString = 'multi_replace_string_in_file',
 	EditNotebook = 'edit_notebook_file',
 	RunNotebookCell = 'run_notebook_cell',
 	GetNotebookSummary = 'copilot_getNotebookSummary',
@@ -79,6 +80,7 @@ export const enum ContributedToolName {
 	EditFile = 'copilot_insertEdit',
 	CreateFile = 'copilot_createFile',
 	ReplaceString = 'copilot_replaceString',
+	MultiReplaceString = 'copilot_multiReplaceString',
 	EditNotebook = 'copilot_editNotebook',
 	RunNotebookCell = 'copilot_runNotebookCell',
 	GetNotebookSummary = 'copilot_getNotebookSummary',
@@ -123,6 +125,7 @@ const contributedToolNameToToolNames = new Map<ContributedToolName, ToolName>([
 	[ContributedToolName.FindTestFiles, ToolName.FindTestFiles],
 	[ContributedToolName.CreateFile, ToolName.CreateFile],
 	[ContributedToolName.ReplaceString, ToolName.ReplaceString],
+	[ContributedToolName.MultiReplaceString, ToolName.MultiReplaceString],
 	[ContributedToolName.EditNotebook, ToolName.EditNotebook],
 	[ContributedToolName.RunNotebookCell, ToolName.RunNotebookCell],
 	[ContributedToolName.GetNotebookSummary, ToolName.GetNotebookSummary],