Merge branch 'main' into dev/vrbhardw/reasoningEffort

Author: vritant24

package-lock.json

@@ -740,6 +740,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",
@@ -3691,7 +3743,6 @@
 		"@anthropic-ai/sdk": "^0.56.0",
 		"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
 		"@microsoft/tiktokenizer": "^1.0.10",
-		"@roamhq/mac-ca": "^1.0.7",
 		"@vscode/copilot-api": "^0.1.4",
 		"@vscode/extension-telemetry": "^1.0.0",
 		"@vscode/l10n": "^0.0.18",

package.json

@@ -271,6 +271,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

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, CodeAction, CodeActionKind, commands, Diagnostic, DiagnosticSeverity, EndOfLine, languages, NotebookDocument, Range, TextDocument, TextDocumentChangeEvent, TextDocumentContentChangeEvent, TextEditor, Uri, window, workspace } from 'vscode';
+import { CancellationToken, CodeAction, CodeActionKind, commands, Diagnostic, DiagnosticSeverity, EndOfLine, languages, NotebookCell, NotebookCellKind, NotebookDocument, Range, TextDocument, TextDocumentChangeEvent, TextDocumentContentChangeEvent, TextEditor, Uri, window, workspace } from 'vscode';
 import { ConfigKey, IConfigurationService } from '../../../../platform/configuration/common/configurationService';
 import { IIgnoreService } from '../../../../platform/ignore/common/ignoreService';
 import { CodeActionData } from '../../../../platform/inlineEdits/common/dataTypes/codeActionData';
@@ -34,6 +34,17 @@ import { OffsetRange } from '../../../../util/vs/editor/common/core/ranges/offse
 import { StringText } from '../../../../util/vs/editor/common/core/text/abstractText';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
 import { toInternalTextEdit } from '../utils/translations';
+import { ResourceSet } from '../../../../util/vs/base/common/map';
+import { Lazy } from '../../../../util/vs/base/common/lazy';
+
+function trackMarkdownCells(cells: NotebookCell[], resources: ResourceSet): void {
+	cells.forEach(c => {
+		if (c.kind === NotebookCellKind.Markup) {
+			resources.add(c.document.uri);
+		}
+	});
+}
+
 
 export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable {
 	private readonly _openDocuments = observableValue<readonly IVSCodeObservableDocument[], { added: readonly IVSCodeObservableDocument[]; removed: readonly IVSCodeObservableDocument[] }>(this, []);
@@ -43,6 +54,13 @@ export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable
 	private get useAlternativeNotebookFormat(): boolean {
 		return this._configurationService.getExperimentBasedConfig(ConfigKey.Internal.UseAlternativeNESNotebookFormat, this._experimentationService);
 	}
+	private readonly markdownNotebookCells = new Lazy<ResourceSet>(() => {
+		const markdownCellUris = new ResourceSet();
+		workspace.notebookDocuments.forEach(doc => trackMarkdownCells(doc.getCells(), markdownCellUris));
+		return markdownCellUris;
+	}
+
+	);
 	constructor(
 		@IWorkspaceService private readonly _workspaceService: IWorkspaceService,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
@@ -97,6 +115,10 @@ export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable
 			}
 		}));
 
+		if (this.useAlternativeNotebookFormat) {
+			this._store.add(workspace.onDidOpenNotebookDocument(e => trackMarkdownCells(e.getCells(), this.markdownNotebookCells.value)));
+		}
+
 		this._store.add(workspace.onDidChangeNotebookDocument(e => {
 			const doc = this._getDocumentByDocumentAndUpdateShouldTrack(e.notebook.uri);
 			if (!doc || !e.contentChanges.length || doc instanceof VSCodeObservableTextDocument) {
@@ -112,6 +134,13 @@ export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable
 				doc.value.set(stringValueFromDoc(doc.altNotebook), tx, editWithReason);
 				doc.version.set(doc.notebook.version, tx);
 			});
+
+			if (this.useAlternativeNotebookFormat) {
+				e.contentChanges.map(c => c.removedCells).flat().forEach(c => {
+					this.markdownNotebookCells.value.delete(c.document.uri);
+				});
+				trackMarkdownCells(e.contentChanges.map(c => c.addedCells).flat(), this.markdownNotebookCells.value);
+			}
 		}));
 
 		this._store.add(window.onDidChangeTextEditorSelection(e => {
@@ -166,7 +195,7 @@ export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable
 	});
 
 	private getTextDocuments() {
-		return getTextDocuments(this.useAlternativeNotebookFormat);
+		return getTextDocuments(this.useAlternativeNotebookFormat, this.markdownNotebookCells.value);
 	}
 	private readonly _vscodeTextDocuments: IObservable<readonly TextDocument[]> = this.getTextDocuments();
 	private readonly _textDocsWithShouldTrackFlag = mapObservableArrayCached(this, this._vscodeTextDocuments, (doc, store) => {
@@ -335,7 +364,8 @@ export class VSCodeWorkspace extends ObservableWorkspace implements IDisposable
 		const notebookDocs = this._notebookDocsWithShouldTrackFlag.read(reader);
 		notebookDocs.forEach(d => {
 			map.set(d.doc.uri.toString(), d);
-			d.doc.getCells().forEach(cell => map.set(cell.document.uri.toString(), d));
+			// Markdown cells will be treated as standalone text documents (old behaviour).
+			d.doc.getCells().filter(cell => cell.kind === NotebookCellKind.Code).forEach(cell => map.set(cell.document.uri.toString(), d));
 		});
 		return map;
 	});
@@ -609,7 +639,7 @@ class VSCodeObservableNotebookDocument extends AbstractVSCodeObservableDocument
 	}
 }
 
-function getTextDocuments(excludeNotebookCells: boolean): IObservable<readonly TextDocument[]> {
+function getTextDocuments(excludeNotebookCells: boolean, markdownCellUris: ResourceSet): IObservable<readonly TextDocument[]> {
 	return observableFromEvent(undefined, e => {
 		const d1 = workspace.onDidOpenTextDocument(e);
 		const d2 = workspace.onDidCloseTextDocument(e);
@@ -619,7 +649,9 @@ function getTextDocuments(excludeNotebookCells: boolean): IObservable<readonly T
 				d2.dispose();
 			}
 		};
-	}, () => excludeNotebookCells ? workspace.textDocuments.filter(doc => doc.uri.scheme !== Schemas.vscodeNotebookCell) : workspace.textDocuments);
+		// If we're meant to exclude notebook cells, we will still include the markdown cells as separate documents.
+		// Thats because markdown cells will be treated as standalone text documents in the editor.
+	}, () => excludeNotebookCells ? workspace.textDocuments.filter(doc => doc.uri.scheme !== Schemas.vscodeNotebookCell || markdownCellUris.has(doc.uri)) : workspace.textDocuments);
 }
 
 function getNotebookDocuments(): IObservable<readonly NotebookDocument[]> {

src/extension/inlineEdits/vscode-node/parts/vscodeWorkspace.ts

@@ -61,14 +61,20 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 
 		const allowTools: Record<string, boolean> = {};
 		allowTools[ToolName.EditFile] = true;
-		allowTools[ToolName.ReplaceString] = modelSupportsReplaceString(model) || !!(model.family.includes('gemini') && configurationService.getExperimentBasedConfig(ConfigKey.Internal.GeminiReplaceString, experimentationService));
+		allowTools[ToolName.ReplaceString] = modelSupportsReplaceString(model);
 		allowTools[ToolName.ApplyPatch] = await modelSupportsApplyPatch(model) && !!toolsService.getTool(ToolName.ApplyPatch);
 
 		if (modelCanUseReplaceStringExclusively(model)) {
 			allowTools[ToolName.ReplaceString] = true;
 			allowTools[ToolName.EditFile] = false;
 		}
 
+		if (allowTools[ToolName.ReplaceString]) {
+			if (configurationService.getExperimentBasedConfig(ConfigKey.Internal.MultiReplaceString, experimentationService)) {
+				allowTools[ToolName.MultiReplaceString] = true;
+			}
+		}
+
 		allowTools[ToolName.RunTests] = await testService.hasAnyTests();
 		allowTools[ToolName.CoreRunTask] = !!(configurationService.getConfig(ConfigKey.AgentCanRunTasks) && tasksService.getTasks().length);
 

src/extension/intents/node/agentIntent.ts

@@ -6,6 +6,7 @@
 import type * as vscode from 'vscode';
 import { ChatLocation } from '../../../platform/chat/common/commonTypes';
 import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
+import { 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';
@@ -40,14 +41,18 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 		const experimentalService = accessor.get<IExperimentationService>(IExperimentationService);
 		const model = await endpointProvider.getChatEndpoint(request);
 		const lookForTools = new Set<string>([ToolName.EditFile]);
+		const experimentationService = accessor.get<IExperimentationService>(IExperimentationService);
 
 
 		if (configurationService.getExperimentBasedConfig(ConfigKey.EditsCodeNewNotebookAgentEnabled, experimentalService) !== false && requestHasNotebookRefs(request, notebookService, { checkPromptAsWell: true })) {
 			lookForTools.add(ToolName.CreateNewJupyterNotebook);
 		}
 
-		if (model.family.startsWith('claude')) {
+		if (modelSupportsReplaceString(model)) {
 			lookForTools.add(ToolName.ReplaceString);
+			if (configurationService.getExperimentBasedConfig(ConfigKey.Internal.MultiReplaceString, experimentationService)) {
+				lookForTools.add(ToolName.MultiReplaceString);
+			}
 		}
 		lookForTools.add(ToolName.EditNotebook);
 		if (requestHasNotebookRefs(request, notebookService, { checkPromptAsWell: true })) {

src/extension/intents/node/editCodeIntent2.ts

@@ -33,6 +33,7 @@ import { IToolsService } from '../../tools/common/toolsService';
 import { EditCodeIntent, EditCodeIntentOptions } from './editCodeIntent';
 import { EditCode2IntentInvocation } from './editCodeIntent2';
 import { getRequestedToolCallIterationLimit } from './toolCallingLoop';
+import { modelSupportsReplaceString } from '../../../platform/endpoint/common/chatModelCapabilities';
 
 const getTools = (instaService: IInstantiationService, request: vscode.ChatRequest): Promise<vscode.LanguageModelToolInformation[]> =>
 	instaService.invokeFunction(async accessor => {
@@ -43,13 +44,17 @@ const getTools = (instaService: IInstantiationService, request: vscode.ChatReque
 		const experimentalService = accessor.get<IExperimentationService>(IExperimentationService);
 		const model = await endpointProvider.getChatEndpoint(request);
 		const lookForTools = new Set<string>([ToolName.EditFile]);
+		const experimentationService = accessor.get<IExperimentationService>(IExperimentationService);
 
 		if (configurationService.getExperimentBasedConfig(ConfigKey.EditsCodeNewNotebookAgentEnabled, experimentalService) !== false && requestHasNotebookRefs(request, notebookService, { checkPromptAsWell: true })) {
 			lookForTools.add(ToolName.CreateNewJupyterNotebook);
 		}
 
-		if (model.family.startsWith('claude')) {
+		if (modelSupportsReplaceString(model)) {
 			lookForTools.add(ToolName.ReplaceString);
+			if (configurationService.getExperimentBasedConfig(ConfigKey.Internal.MultiReplaceString, experimentationService)) {
+				lookForTools.add(ToolName.MultiReplaceString);
+			}
 		}
 
 		lookForTools.add(ToolName.EditNotebook);

src/extension/intents/node/notebookEditorIntent.ts

@@ -34,6 +34,7 @@ import { SyncDescriptor } from '../../../util/vs/platform/instantiation/common/d
 import { FetcherService } from '../../../platform/networking/vscode-node/fetcherServiceImpl';
 import { CAPIClientImpl } from '../../../platform/endpoint/node/capiClientImpl';
 import { shuffle } from '../../../util/vs/base/common/arrays';
+import { EXTENSION_ID } from '../../common/constants';
 
 export interface ProxyAgentLog {
 	trace(message: string, ...args: any[]): void;
@@ -342,7 +343,7 @@ function getProxyEnvVariables() {
 	return res.length ? `\n\nEnvironment Variables:${res.join('')}` : '';
 }
 
-export function collectFetcherTelemetry(accessor: ServicesAccessor): void {
+export function collectFetcherTelemetry(accessor: ServicesAccessor, error: any): void {
 	const extensionContext = accessor.get(IVSCodeExtensionContext);
 	const fetcherService = accessor.get(IFetcherService);
 	const envService = accessor.get(IEnvService);
@@ -357,7 +358,6 @@ export function collectFetcherTelemetry(accessor: ServicesAccessor): void {
 		return;
 	}
 
-	const currentUserAgentLibrary = fetcherService.getUserAgentLibrary();
 	if (!configurationService.getExperimentBasedConfig(ConfigKey.Internal.DebugCollectFetcherTelemetry, expService)) {
 		return;
 	}
@@ -383,7 +383,13 @@ export function collectFetcherTelemetry(accessor: ServicesAccessor): void {
 		}
 		logService.debug(`Refetch model metadata: This window won.`);
 
-		const userAgentLibraryUpdate = (original: string) => `${vscode.env.remoteName || 'local'}-on-${process.platform}-after-${currentUserAgentLibrary}-using-${original}`;
+		const ext = vscode.extensions.getExtension(EXTENSION_ID);
+		const extKind = (ext ? ext.extensionKind === vscode.ExtensionKind.UI : !vscode.env.remoteName) ? 'local' : 'remote';
+		const remoteName = vscode.env.remoteName || 'none';
+		const platform = process.platform;
+		const originalLibrary = fetcherService.getUserAgentLibrary();
+		const originalError = error ? (error.message || 'unknown') : 'none';
+		const userAgentLibraryUpdate = (library: string) => JSON.stringify({ extKind, remoteName, platform, library, originalLibrary, originalError });
 		const fetchers = [
 			ElectronFetcher.create(envService, userAgentLibraryUpdate),
 			new NodeFetchFetcher(envService, userAgentLibraryUpdate),

src/extension/log/vscode-node/loggingActions.ts

@@ -10,7 +10,7 @@ import { ITestingServicesAccessor, TestingServiceCollection } from '../../../../
 import { createExtensionUnitTestingServices } from '../../../test/node/services';
 import { NuGetMcpSetup } from '../../vscode-node/nuget';
 
-describe('get nuget MCP server info', { timeout: 30_000 }, () => {
+describe.skip('get nuget MCP server info', { timeout: 30_000 }, () => {
 	let testingServiceCollection: TestingServiceCollection = createExtensionUnitTestingServices();
 	let accessor: ITestingServicesAccessor = testingServiceCollection.createTestingAccessor();
 	let logService: ILogService = accessor.get(ILogService);
@@ -94,4 +94,4 @@ describe('get nuget MCP server info', { timeout: 30_000 }, () => {
 			expect.fail();
 		}
 	});
-});
+});