Merge pull request #316065 from microsoft/robo/cherry_pick_msrc_1_119

chore: cherry pick 1.119.1 fixes

Author: deepak1556

extensions/copilot/package-lock.json

@@ -2,7 +2,7 @@
 	"name": "copilot-chat",
 	"displayName": "GitHub Copilot Chat",
 	"description": "AI chat features powered by Copilot",
-	"version": "0.47.0",
+	"version": "0.47.1",
 	"build": "1",
 	"internalAIKey": "1058ec22-3c95-4951-8443-f26c1f325911",
 	"completionsCoreVersion": "1.378.1799",
@@ -23,7 +23,7 @@
 	"icon": "assets/copilot.png",
 	"pricing": "Trial",
 	"engines": {
-		"vscode": "^1.119.0",
+		"vscode": "^1.119.1",
 		"npm": ">=9.0.0",
 		"node": ">=22.14.0"
 	},

extensions/copilot/package.json

@@ -551,7 +551,14 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 		}
 
 		const patchEnd = fetchResult.value.indexOf(PATCH_SUFFIX, patchStart);
-		return patchEnd === -1 ? fetchResult.value.slice(patchStart) : fetchResult.value.slice(patchStart, patchEnd + PATCH_SUFFIX.length);
+		const healed = patchEnd === -1 ? fetchResult.value.slice(patchStart) : fetchResult.value.slice(patchStart, patchEnd + PATCH_SUFFIX.length);
+
+		// Reject the healed patch if it doesn't affect exactly the same set of files as the original.
+		if (!healedPatchAffectsSameFiles(patch, healed)) {
+			return undefined;
+		}
+
+		return healed;
 	}
 
 	private async buildCommitWithHealing(model: vscode.LanguageModelChat | undefined, patch: string, docText: DocText, explanation: string, token: CancellationToken): Promise<{ commit: Commit; healed?: string }> {
@@ -748,6 +755,25 @@ class HealedError extends Error {
 	}
 }
 
+/**
+ * Returns true if the healed patch affects exactly the same set of files as
+ * the original patch. Used to reject heals that hallucinated additional files
+ * or dropped files that the model was originally trying to edit.
+ */
+export function healedPatchAffectsSameFiles(original: string, healed: string): boolean {
+	const originalFiles = new Set(identify_files_affected(original));
+	const healedFiles = new Set(identify_files_affected(healed));
+	if (originalFiles.size !== healedFiles.size) {
+		return false;
+	}
+	for (const f of originalFiles) {
+		if (!healedFiles.has(f)) {
+			return false;
+		}
+	}
+	return true;
+}
+
 ToolRegistry.registerTool(ApplyPatchTool);
 
 const applyPatchExample = `*** Begin Patch

extensions/copilot/src/extension/tools/node/applyPatchTool.tsx

@@ -20,7 +20,7 @@ import { ChatResponseTextEditPart } from '../../../../../vscodeTypes';
 import { ChatVariablesCollection } from '../../../../prompt/common/chatVariablesCollection';
 import { WorkingCopyOriginalDocument } from '../../../../prompts/node/inline/workingCopies';
 import { createExtensionUnitTestingServices } from '../../../../test/node/services';
-import { ApplyPatchTool, IApplyPatchToolParams } from '../../../node/applyPatchTool';
+import { ApplyPatchTool, healedPatchAffectsSameFiles, IApplyPatchToolParams } from '../../../node/applyPatchTool';
 
 
 suite('ApplyPatch Tool', () => {
@@ -87,4 +87,38 @@ suite('ApplyPatch Tool', () => {
 		await expect(workingCopyDocument.text).toMatchFileSnapshot('fixtures/4302.ts.txt.expected');
 
 	});
+
+	suite('healedPatchAffectsSameFiles', () => {
+		const makePatch = (lines: string[]) => ['*** Begin Patch', ...lines, '*** End Patch'].join('\n');
+
+		it('accepts a heal touching the same single file', () => {
+			const original = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y']);
+			const healed = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y2']);
+			expect(healedPatchAffectsSameFiles(original, healed)).toBe(true);
+		});
+
+		it('accepts a heal touching the same set of multiple files in any order', () => {
+			const original = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y', '*** Delete File: /b.ts']);
+			const healed = makePatch(['*** Delete File: /b.ts', '*** Update File: /a.ts', '@@', '-x', '+z']);
+			expect(healedPatchAffectsSameFiles(original, healed)).toBe(true);
+		});
+
+		it('rejects a heal that adds a new file', () => {
+			const original = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y']);
+			const healed = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y', '*** Add File: /b.ts', '+hello']);
+			expect(healedPatchAffectsSameFiles(original, healed)).toBe(false);
+		});
+
+		it('rejects a heal that drops a file', () => {
+			const original = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y', '*** Delete File: /b.ts']);
+			const healed = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y']);
+			expect(healedPatchAffectsSameFiles(original, healed)).toBe(false);
+		});
+
+		it('rejects a heal that targets a different file', () => {
+			const original = makePatch(['*** Update File: /a.ts', '@@', '-x', '+y']);
+			const healed = makePatch(['*** Update File: /c.ts', '@@', '-x', '+y']);
+			expect(healedPatchAffectsSameFiles(original, healed)).toBe(false);
+		});
+	});
 });

extensions/copilot/src/extension/tools/test/node/applyPatch/applyPatch.spec.tsx

@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.119.0",
+  "version": "1.119.1",
   "distro": "ede7ca120c03b0100ffe7da26fb44af20a0fd252",
   "author": {
     "name": "Microsoft Corporation"

package-lock.json

@@ -39,7 +39,7 @@ export class WebviewProtocolProvider implements IDisposable {
 				const url = FileAccess.asFileUri(relativeResourcePath);
 
 				const content = await this._fileService.readFile(url);
-				return new Response(content.value.buffer.buffer as ArrayBuffer, {
+				return new Response(content.value.buffer as ArrayBufferView<ArrayBuffer>, {
 					headers: {
 						'Content-Type': entry.mime,
 						...COI.getHeadersFromQuery(request.url),

package.json

@@ -737,13 +737,44 @@ export class McpServerEditor extends EditorPane {
 				const argsValue = append(argsSection, $('code.config-value'));
 				argsValue.textContent = config.args.join(' ');
 			}
+
+			// Environment variables (if present)
+			if (config.env && Object.keys(config.env).length > 0) {
+				const envSection = append(container, $('.config-section'));
+				const envLabel = append(envSection, $('.config-label'));
+				envLabel.textContent = localize('environment', "Environment:");
+				const envValue = append(envSection, $('.config-value'));
+				for (const [key, value] of Object.entries(config.env)) {
+					append(envValue, $('code.env-entry', undefined, `${key}=${value ?? ''}`));
+				}
+			}
+
+			// Env file (if present)
+			if (config.envFile) {
+				const envFileSection = append(container, $('.config-section'));
+				const envFileLabel = append(envFileSection, $('.config-label'));
+				envFileLabel.textContent = localize('envFile', "Environment File:");
+				const envFileValue = append(envFileSection, $('code.config-value'));
+				envFileValue.textContent = config.envFile;
+			}
 		} else if (config.type === McpServerType.REMOTE) {
 			// URL
 			const urlSection = append(container, $('.config-section'));
 			const urlLabel = append(urlSection, $('.config-label'));
 			urlLabel.textContent = localize('url', "URL:");
 			const urlValue = append(urlSection, $('code.config-value'));
 			urlValue.textContent = config.url;
+
+			// Headers (if present)
+			if (config.headers && Object.keys(config.headers).length > 0) {
+				const headersSection = append(container, $('.config-section'));
+				const headersLabel = append(headersSection, $('.config-label'));
+				headersLabel.textContent = localize('headers', "Headers:");
+				const headersValue = append(headersSection, $('.config-value'));
+				for (const [key, value] of Object.entries(config.headers)) {
+					append(headersValue, $('code.env-entry', undefined, `${key}: ${value ?? ''}`));
+				}
+			}
 		}
 	}
 

src/vs/platform/webview/electron-main/webviewProtocolProvider.ts

@@ -25,6 +25,10 @@
 		word-break: break-all;
 	}
 
+	.config-value .env-entry {
+		display: block;
+	}
+
 	.no-config {
 		color: var(--vscode-descriptionForeground);
 		font-style: italic;