Merge branch 'main' of https://github.com/microsoft/vscode into copilot/fix-agent-sessions-welcome-gating

Author: osortega

.github/commands.json

@@ -513,7 +513,7 @@
 		"action": "updateLabels",
 		"addLabel": "verification-steps-needed",
 		"removeLabel": "~verification-steps-needed",
-		"comment": "Friendly ping! Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue."
+		"comment": "Friendly ping for the VS Code team member who owns this issue- Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue."
 	},
 	{
 		"type": "label",

.github/copilot-instructions.md

@@ -139,6 +139,7 @@ function f(x: number, y: string): void { }
 - When adding tooltips to UI elements, prefer the use of IHoverService service.
 - Do not duplicate code. Always look for existing utility functions, helpers, or patterns in the codebase before implementing new functionality. Reuse and extend existing code whenever possible.
 - You MUST deal with disposables by registering them immediately after creation for later disposal. Use helpers such as `DisposableStore`, `MutableDisposable` or `DisposableMap`. Do NOT register a disposable to the containing class if the object is created within a method that is called repeadedly to avoid leaks. Instead, return a `IDisposable` from such method and let the caller register it.
+- You MUST NOT use storage keys of another component only to make changes to that component. You MUST come up with proper API to change another component.
 
 ## Learnings
 - Minimize the amount of assertions in tests. Prefer one snapshot-style `assert.deepStrictEqual` over multiple precise assertions, as they are much more difficult to understand and to update.

.vscode/notebooks/my-endgame.github-issues

@@ -12,7 +12,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dineshc-msft -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya -author:bryanchen-d -author:cwebster-99"
+    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dineshc-msft -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya -author:bryanchen-d -author:cwebster-99 -author:rwoll -author:lostintangent -author:jukasper -author:zhichli"
   },
   {
     "kind": 1,

build/azure-pipelines/common/sanity-tests.yml

@@ -49,14 +49,13 @@ jobs:
           versionFilePath: .nvmrc
         displayName: Install Node.js
 
-      - bash: |
-          npm config set registry "$(NPM_REGISTRY)"
-          echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
+      - script: npm config set registry "$(NPM_REGISTRY)" --location=project
+        workingDirectory: $(TEST_DIR)
         displayName: Configure NPM Registry
 
       - task: npmAuthenticate@0
         inputs:
-          workingFile: $(NPMRC_PATH)
+          workingFile: $(TEST_DIR)/.npmrc
         displayName: Authenticate with NPM Registry
 
       - script: npm ci

build/azure-pipelines/product-sanity-tests.yml

@@ -89,10 +89,9 @@ extends:
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
               name: windows_arm64
-              displayName: Windows arm64 (no runtime)
-              poolName: 1es-windows-2022-x64
+              displayName: Windows arm64
+              poolName: 1es-windows-2022-arm64
               os: windows
-              args: --no-detection --grep "win32-arm64"
 
           # Alpine 3.22
           - template: build/azure-pipelines/common/sanity-tests.yml@self

build/npm/gyp/package-lock.json

@@ -102,6 +102,10 @@
             "markup": {
               "type": "string",
               "description": "The mermaid diagram markup to render as a Mermaid diagram. This should only be the markup of the diagram. Do not include a wrapping code block."
+            },
+            "title": {
+              "type": "string",
+              "description": "A short title that describes the diagram."
             }
           }
         }

extensions/mermaid-chat-features/package.json

@@ -28,15 +28,17 @@ class MermaidChatOutputRenderer implements vscode.ChatOutputRenderer {
 
 	async renderChatOutput({ value }: vscode.ChatOutputDataItem, chatOutputWebview: vscode.ChatOutputWebview, _ctx: unknown, _token: vscode.CancellationToken): Promise<void> {
 		const webview = chatOutputWebview.webview;
-		const mermaidSource = new TextDecoder().decode(value);
+		const decoded = decodeMermaidData(value);
+		const mermaidSource = decoded.source;
+		const title = decoded.title;
 
 		// Generate unique ID for this webview
 		const webviewId = generateUuid();
 
 		const disposables: vscode.Disposable[] = [];
 
 		// Register and set as active
-		disposables.push(this._webviewManager.registerWebview(webviewId, webview, mermaidSource, 'chat'));
+		disposables.push(this._webviewManager.registerWebview(webviewId, webview, mermaidSource, title, 'chat'));
 
 		// Listen for messages from the webview
 		disposables.push(webview.onDidReceiveMessage(message => {
@@ -135,17 +137,18 @@ export function registerChatSupport(
 		vscode.commands.registerCommand('_mermaid-chat.openInEditor', (ctx?: { mermaidWebviewId?: string }) => {
 			const webviewInfo = ctx?.mermaidWebviewId ? webviewManager.getWebview(ctx.mermaidWebviewId) : webviewManager.activeWebview;
 			if (webviewInfo) {
-				editorManager.openPreview(webviewInfo.mermaidSource);
+				editorManager.openPreview(webviewInfo.mermaidSource, webviewInfo.title);
 			}
 		})
 	);
 
 	// Register lm tools
 	disposables.push(
-		vscode.lm.registerTool<{ markup: string }>('renderMermaidDiagram', {
+		vscode.lm.registerTool<{ markup: string; title?: string }>('renderMermaidDiagram', {
 			invoke: async (options, _token) => {
 				const sourceCode = options.input.markup;
-				return writeMermaidToolOutput(sourceCode);
+				const title = options.input.title;
+				return writeMermaidToolOutput(sourceCode, title);
 			},
 		})
 	);
@@ -159,19 +162,52 @@ export function registerChatSupport(
 	return vscode.Disposable.from(...disposables);
 }
 
-function writeMermaidToolOutput(sourceCode: string): vscode.LanguageModelToolResult {
-	// Expose the source code as a tool result for the LM
+function writeMermaidToolOutput(sourceCode: string, title: string | undefined): vscode.LanguageModelToolResult {
+	// Expose the source code as a markdown mermaid code block
+	const fence = getFenceForContent(sourceCode);
 	const result = new vscode.LanguageModelToolResult([
-		new vscode.LanguageModelTextPart(sourceCode)
+		new vscode.LanguageModelTextPart(`${fence}mermaid\n${sourceCode}\n${fence}`)
 	]);
 
 	// And store custom data in the tool result details to indicate that a custom renderer should be used for it.
-	// In this case we just store the source code as binary data.
+	// Encode source and optional title as JSON.
+	const data = JSON.stringify({ source: sourceCode, title });
 	// Add cast to use proposed API
 	(result as vscode.ExtendedLanguageModelToolResult2).toolResultDetails2 = {
 		mime,
-		value: new TextEncoder().encode(sourceCode),
+		value: new TextEncoder().encode(data),
 	};
 
 	return result;
 }
+
+function getFenceForContent(content: string): string {
+	const backtickMatch = content.matchAll(/`+/g);
+	if (!backtickMatch) {
+		return '```';
+	}
+
+	const maxBackticks = Math.max(...Array.from(backtickMatch, s => s[0].length));
+	return '`'.repeat(Math.max(3, maxBackticks + 1));
+}
+
+interface MermaidData {
+	readonly title: string | undefined;
+	readonly source: string;
+}
+
+function decodeMermaidData(value: Uint8Array): MermaidData {
+	const text = new TextDecoder().decode(value);
+
+	// Try to parse as JSON (new format with title), fall back to plain text (legacy format)
+	try {
+		const parsed = JSON.parse(text);
+		if (typeof parsed === 'object' && typeof parsed.source === 'string') {
+			return { title: parsed.title, source: parsed.source };
+		}
+	} catch {
+		// Not JSON, treat as legacy plain text format
+	}
+
+	return { title: undefined, source: text };
+}

extensions/mermaid-chat-features/src/chatOutputRenderer.ts

@@ -36,7 +36,7 @@ export class MermaidEditorManager extends Disposable implements vscode.WebviewPa
 	 *
 	 * If a preview already exists for this diagram, it will be revealed instead of creating a new one.
 	 */
-	public openPreview(mermaidSource: string): void {
+	public openPreview(mermaidSource: string, title?: string): void {
 		const webviewId = getWebviewId(mermaidSource);
 		const existingPreview = this._previews.get(webviewId);
 		if (existingPreview) {
@@ -47,6 +47,7 @@ export class MermaidEditorManager extends Disposable implements vscode.WebviewPa
 		const preview = MermaidPreview.create(
 			webviewId,
 			mermaidSource,
+			title,
 			this._extensionUri,
 			this._webviewManager,
 			vscode.ViewColumn.Active);
@@ -126,13 +127,14 @@ class MermaidPreview extends Disposable {
 	public static create(
 		diagramId: string,
 		mermaidSource: string,
+		title: string | undefined,
 		extensionUri: vscode.Uri,
 		webviewManager: MermaidWebviewManager,
 		viewColumn: vscode.ViewColumn
 	): MermaidPreview {
 		const webviewPanel = vscode.window.createWebviewPanel(
 			mermaidEditorViewType,
-			'', // Filled in later
+			title ?? vscode.l10n.t('Mermaid Diagram'),
 			viewColumn,
 			{
 				retainContextWhenHidden: false,
@@ -161,7 +163,6 @@ class MermaidPreview extends Disposable {
 	) {
 		super();
 
-		this._webviewPanel.title = vscode.l10n.t('Mermaid Diagram'); // TODO: Can we generate a better title from the content?
 		this._webviewPanel.iconPath = new vscode.ThemeIcon('graph');
 
 		this._webviewPanel.webview.options = {
@@ -174,7 +175,7 @@ class MermaidPreview extends Disposable {
 		this._webviewPanel.webview.html = this._getHtml();
 
 		// Register with the webview manager
-		this._register(this._webviewManager.registerWebview(this.diagramId, this._webviewPanel.webview, this._mermaidSource, 'editor'));
+		this._register(this._webviewManager.registerWebview(this.diagramId, this._webviewPanel.webview, this._mermaidSource, undefined, 'editor'));
 
 		this._register(this._webviewPanel.onDidChangeViewState(e => {
 			if (e.webviewPanel.active) {

extensions/mermaid-chat-features/src/editorManager.ts

@@ -8,6 +8,7 @@ export interface MermaidWebviewInfo {
 	readonly id: string;
 	readonly webview: vscode.Webview;
 	readonly mermaidSource: string;
+	readonly title: string | undefined;
 	readonly type: 'chat' | 'editor';
 }
 
@@ -27,7 +28,7 @@ export class MermaidWebviewManager {
 		return this._activeWebviewId ? this._webviews.get(this._activeWebviewId) : undefined;
 	}
 
-	public registerWebview(id: string, webview: vscode.Webview, mermaidSource: string, type: 'chat' | 'editor'): vscode.Disposable {
+	public registerWebview(id: string, webview: vscode.Webview, mermaidSource: string, title: string | undefined, type: 'chat' | 'editor'): vscode.Disposable {
 		if (this._webviews.has(id)) {
 			throw new Error(`Webview with id ${id} is already registered.`);
 		}
@@ -36,6 +37,7 @@ export class MermaidWebviewManager {
 			id,
 			webview,
 			mermaidSource,
+			title,
 			type
 		};
 		this._webviews.set(id, info);