tools: remove old experiments (#244)

Remove a trio of experiments that were successful and have been rolled
out (Claude exclusive string replace, apply_patch, and apply_patch's
indentation normalization).

Author: connor4312

src/extension/intents/node/agentIntent.ts

@@ -10,7 +10,7 @@ import { BudgetExceededError } from '@vscode/prompt-tsx/dist/base/materialized';
 import type * as vscode from 'vscode';
 import { ChatLocation, ChatResponse } from '../../../platform/chat/common/commonTypes';
 import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
-import { modelMightUseReplaceStringExclusively, modelSupportsApplyPatch, modelSupportsReplaceString } from '../../../platform/endpoint/common/chatModelCapabilities';
+import { modelCanUseReplaceStringExclusively, modelSupportsApplyPatch, modelSupportsReplaceString } from '../../../platform/endpoint/common/chatModelCapabilities';
 import { IEndpointProvider } from '../../../platform/endpoint/common/endpointProvider';
 import { IEnvService } from '../../../platform/env/common/envService';
 import { ILogService } from '../../../platform/log/common/logService';
@@ -57,16 +57,12 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 		const endpointProvider = accessor.get<IEndpointProvider>(IEndpointProvider);
 		const model = await endpointProvider.getChatEndpoint(request);
 
-		// Claude: replace_string AND insert_edits
-		// 4.1/o4-mini: apply_patch AND insert_edits
 		const allowTools: Record<string, boolean> = {};
-		const applyPatchConfigEnabled = configurationService.getExperimentBasedConfig<boolean>(ConfigKey.Internal.EnableApplyPatchTool, experimentationService); // (can't use extension exp config in package.json "when" clause)
-		const useApplyPatch = !!(modelSupportsApplyPatch(model) && applyPatchConfigEnabled && toolsService.getTool(ToolName.ApplyPatch));
 		allowTools[ToolName.EditFile] = true;
 		allowTools[ToolName.ReplaceString] = modelSupportsReplaceString(model) || !!(model.family.includes('gemini') && experimentationService.getTreatmentVariable<boolean>('vscode', 'copilotchat.geminiReplaceString'));
-		allowTools[ToolName.ApplyPatch] = useApplyPatch;
+		allowTools[ToolName.ApplyPatch] = modelSupportsApplyPatch(model) && !!toolsService.getTool(ToolName.ApplyPatch);
 
-		if (modelMightUseReplaceStringExclusively(model) && experimentationService.getTreatmentVariable<boolean>('vscode', 'copilotchat.claudeReplaceStringExclusively')) {
+		if (modelCanUseReplaceStringExclusively(model)) {
 			allowTools[ToolName.ReplaceString] = true;
 			allowTools[ToolName.EditFile] = false;
 		}

src/extension/tools/node/applyPatch/parser.ts

@@ -169,7 +169,7 @@ export class Parser {
 	patch: Patch = { actions: {} };
 	fuzz = 0;
 
-	constructor(currentFiles: Record<string, AbstractDocumentWithLanguageId | TextDocument>, lines: Array<string>, private readonly fixIndentationDuringMatch: boolean) {
+	constructor(currentFiles: Record<string, AbstractDocumentWithLanguageId | TextDocument>, lines: Array<string>) {
 		this.current_files = currentFiles;
 		this.lines = lines;
 		for (const [path, doc] of Object.entries(currentFiles)) {
@@ -416,10 +416,7 @@ export class Parser {
 				}
 
 				ch.insLines = ch.insLines.map(replace_explicit_tabs);
-
-				if (this.fixIndentationDuringMatch) {
-					ch.insLines = ch.insLines.map(ins => isFalsyOrWhitespace(ins) ? ins : additionalIndentation + transformIndentation(ins, srcIndentStyle, targetIndentStyle));
-				}
+				ch.insLines = ch.insLines.map(ins => isFalsyOrWhitespace(ins) ? ins : additionalIndentation + transformIndentation(ins, srcIndentStyle, targetIndentStyle));
 
 				if (match.fuzz & Fuzz.NormalizedExplicitTab) {
 					ch.delLines = ch.delLines.map(replace_explicit_tabs);
@@ -763,7 +760,6 @@ function peek_next_section(
 export function text_to_patch(
 	text: string,
 	orig: Record<string, AbstractDocumentWithLanguageId | TextDocument>,
-	fixIndentationDuringMatch = true,
 ): [Patch, number] {
 	const lines = text.trim().split("\n");
 	if (lines.length < 2) {
@@ -777,7 +773,7 @@ export function text_to_patch(
 	if (lines[lines.length - 1] !== patchSuffix) {
 		lines.push(patchSuffix);
 	}
-	const parser = new Parser(orig, lines, fixIndentationDuringMatch);
+	const parser = new Parser(orig, lines);
 	parser.index = 1;
 	parser.parse();
 	return [parser.patch, parser.fuzz];
@@ -921,13 +917,12 @@ export function apply_commit(
 export async function processPatch(
 	text: string,
 	openFn: (p: string) => Promise<AbstractDocumentWithLanguageId | TextDocument>,
-	fixIndentationDuringMatch: boolean,
 ): Promise<Commit> {
 	if (!text.startsWith(PATCH_PREFIX)) {
 		throw new InvalidPatchFormatError("Patch must start with *** Begin Patch\\n", 'patchMustStartWithBeginPatch');
 	}
 	const paths = identify_files_needed(text);
 	const orig = await load_files(paths, openFn);
-	const [patch, _fuzz] = text_to_patch(text, orig, fixIndentationDuringMatch);
+	const [patch, _fuzz] = text_to_patch(text, orig);
 	return patch_to_commit(patch, orig);
 }

src/extension/tools/node/applyPatchTool.tsx

@@ -47,7 +47,6 @@ import { ActionType, Commit, DiffError, FileChange, InvalidContextError, Invalid
 import { EditFileResult, IEditedFile } from './editFileToolResult';
 import { sendEditNotebookTelemetry } from './editNotebookTool';
 import { assertFileOkForTool, resolveToolInputPath } from './toolUtils';
-import { guessIndentation, normalizeIndentation } from '../../prompt/node/indentationGuesser';
 
 export const applyPatchWithNotebookSupportDescription: vscode.LanguageModelToolInformation = {
 	name: ToolName.ApplyPatch,
@@ -126,39 +125,10 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 		return trailingEmptyLines;
 	}
 
-
-	/**
-	 * Normalize the indentation of the content to match the original document's style
-	 * @param document The original document
-	 * @param content The content to normalize
-	 * @returns The normalized content
-	 */
-	private normalizeIndentationStyle(document: vscode.TextDocument, content: string): string {
-		// Detect the indentation style of the original document
-		const indentInfo = guessIndentation(document, 4, true);
-
-		// Split into lines, normalize each line, and then join back
-		const lines = content.split('\n');
-		const normalizedLines = lines.map(line => {
-			// Only process lines that have indentation
-			if (line.match(/^\s+/)) {
-				return normalizeIndentation(line, indentInfo.tabSize, indentInfo.insertSpaces);
-			}
-			return line;
-		});
-
-		return normalizedLines.join('\n');
-	}
-
-
-	private async generateUpdateTextDocumentEdit(file: string, change: FileChange, workspaceEdit: WorkspaceEdit, applyIndentationFix: boolean) {
+	private async generateUpdateTextDocumentEdit(file: string, change: FileChange, workspaceEdit: WorkspaceEdit) {
 		const uri = resolveToolInputPath(file, this.promptPathRepresentationService);
 		const textDocument = await this.workspaceService.openTextDocument(uri);
-		let newContent = removeLeadingFilepathComment(change.newContent ?? '', textDocument.languageId, file);
-
-		if (!applyIndentationFix) { // the 'old way' of normalizing the edit once it's created
-			newContent = this.normalizeIndentationStyle(textDocument, newContent);
-		}
+		const newContent = removeLeadingFilepathComment(change.newContent ?? '', textDocument.languageId, file);
 
 		const lines = newContent?.split('\n') ?? [];
 		let path = uri;
@@ -242,13 +212,11 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 			throw new Error('Missing patch text or stream');
 		}
 
-		const useIndentationFix = !!this.experimentationService.getTreatmentVariable<boolean>('vscode', 'copilotchat.applyPatchIndentationFix');
-
 		let commit: Commit | undefined;
 		let healed: string | undefined;
 		const docText: DocText = {};
 		try {
-			({ commit, healed } = await this.buildCommitWithHealing(options.input.input, docText, options.input.explanation, useIndentationFix, token));
+			({ commit, healed } = await this.buildCommitWithHealing(options.input.input, docText, options.input.explanation, token));
 		} catch (error) {
 			if (error instanceof HealedError) {
 				healed = error.healedPatch;
@@ -335,7 +303,7 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 							}
 						}
 						else {
-							path = await this.generateUpdateTextDocumentEdit(file, changes, workspaceEdit, useIndentationFix);
+							path = await this.generateUpdateTextDocumentEdit(file, changes, workspaceEdit);
 						}
 						resourceToOperation.set(path, ActionType.UPDATE);
 						break;
@@ -502,9 +470,9 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 		return patchEnd === -1 ? fetchResult.value.slice(patchStart) : fetchResult.value.slice(patchStart, patchEnd + PATCH_SUFFIX.length);
 	}
 
-	private async buildCommitWithHealing(patch: string, docText: DocText, explanation: string, useIndentationFix: boolean, token: CancellationToken): Promise<{ commit: Commit; healed?: string }> {
+	private async buildCommitWithHealing(patch: string, docText: DocText, explanation: string, token: CancellationToken): Promise<{ commit: Commit; healed?: string }> {
 		try {
-			return await this.buildCommit(patch, docText, useIndentationFix);
+			return await this.buildCommit(patch, docText);
 		} catch (error) {
 			if (!(error instanceof DiffError)) {
 				throw error;
@@ -519,7 +487,7 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 					throw error;
 				}
 
-				const { commit } = await this.buildCommit(healed, docText, useIndentationFix);
+				const { commit } = await this.buildCommit(healed, docText);
 				return { commit, healed };
 			} catch (healedError) {
 				success = false;
@@ -543,7 +511,7 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 		}
 	}
 
-	private async buildCommit(patch: string, docText: DocText, useIndentationFix: boolean): Promise<{ commit: Commit }> {
+	private async buildCommit(patch: string, docText: DocText): Promise<{ commit: Commit }> {
 		const commit = await processPatch(patch, async (uri) => {
 			const vscodeUri = resolveToolInputPath(uri, this.promptPathRepresentationService);
 			if (this.notebookService.hasSupportedNotebooks(vscodeUri)) {
@@ -556,7 +524,7 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 				docText[vscodeUri.toString()] = { text: textDocument.getText() };
 				return textDocument;
 			}
-		}, useIndentationFix);
+		});
 		return { commit };
 	}
 

src/extension/tools/node/test/applyPatch.spec.ts

@@ -119,7 +119,7 @@ plt.title('Correlation Heatmap')
 plt.show()
 </VSCode.Cell>`;
 
-		const patch = await processPatch(input, () => Promise.resolve(new StringTextDocumentWithLanguageId('xml', notebookContent)), true);
+		const patch = await processPatch(input, () => Promise.resolve(new StringTextDocumentWithLanguageId('xml', notebookContent)));
 		expect(patch).toBeDefined();
 	});
 
@@ -175,7 +175,7 @@ import sys
 #%% vscode.cell [id=d7161d69] [language=python]
 sys.executable`;
 
-		const patch = await processPatch(input, () => Promise.resolve(new StringTextDocumentWithLanguageId('xml', notebookContent)), true);
+		const patch = await processPatch(input, () => Promise.resolve(new StringTextDocumentWithLanguageId('xml', notebookContent)));
 		expect(patch).toBeDefined();
 	});
 
@@ -206,7 +206,7 @@ Hello
 #%% vscode.cell [id=05e875f9] [language=python]
 print(1)`;
 
-		const patch = await processPatch(input, () => Promise.resolve(new StringTextDocumentWithLanguageId('xml', notebookContent)), true);
+		const patch = await processPatch(input, () => Promise.resolve(new StringTextDocumentWithLanguageId('xml', notebookContent)));
 		expect(patch).toBeDefined();
 	});
 	it('Has same details as defined in package.json', async () => {

src/platform/endpoint/common/chatModelCapabilities.ts

@@ -37,9 +37,9 @@ export function modelSupportsReplaceString(model: LanguageModelChat | IChatEndpo
 }
 
 /**
- * Currently (@connor4312) running an experiment to see if we should use
- * replace string exclusively for these models.
+ * The model is capable of using replace_string_in_file exclusively,
+ * without needing insert_edit_into_file.
  */
-export function modelMightUseReplaceStringExclusively(model: LanguageModelChat | IChatEndpoint): boolean {
+export function modelCanUseReplaceStringExclusively(model: LanguageModelChat | IChatEndpoint): boolean {
 	return model.family.startsWith('claude') || model.family.startsWith('Anthropic');
 }