[pull] main from microsoft:main

.eslint-plugin-local/code-no-static-node-module-import.ts

@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TSESTree } from '@typescript-eslint/typescript-estree';
+import * as eslint from 'eslint';
+import { builtinModules } from 'module';
+import { join, normalize, relative } from 'path';
+import minimatch from 'minimatch';
+import { createImportRuleListener } from './utils.ts';
+
+const nodeBuiltins = new Set([
+	...builtinModules,
+	...builtinModules.map(m => `node:${m}`)
+]);
+
+const REPO_ROOT = normalize(join(import.meta.dirname, '../'));
+
+export default new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			staticImport: 'Static imports of \'{{module}}\' are not allowed here because they are loaded synchronously on startup. Use a dynamic `await import(...)` or `import type` instead.'
+		},
+		docs: {
+			description: 'Disallow static imports of node_modules packages to prevent synchronous loading on startup. Allows Node.js built-ins, electron, relative imports, and whitelisted file paths.'
+		},
+		schema: {
+			type: 'array',
+			items: {
+				type: 'string'
+			}
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const allowedPaths = context.options as string[];
+		const filePath = normalize(relative(REPO_ROOT, normalize(context.getFilename()))).replace(/\\/g, '/');
+
+		// Skip whitelisted files
+		if (allowedPaths.some(pattern => filePath === pattern || minimatch(filePath, pattern))) {
+			return {};
+		}
+
+		return createImportRuleListener((node, value) => {
+			// Allow `import type` and `export type` declarations
+			if (node.parent?.type === TSESTree.AST_NODE_TYPES.ImportDeclaration && node.parent.importKind === 'type') {
+				return;
+			}
+			if (node.parent && 'exportKind' in node.parent && node.parent.exportKind === 'type') {
+				return;
+			}
+
+			// Allow relative imports
+			if (value.startsWith('.')) {
+				return;
+			}
+
+			// Allow Node.js built-in modules
+			if (nodeBuiltins.has(value)) {
+				return;
+			}
+
+			// Allow electron
+			if (value === 'electron') {
+				return;
+			}
+
+			context.report({
+				loc: node.parent!.loc,
+				messageId: 'staticImport',
+				data: {
+					module: value
+				}
+			});
+		});
+	}
+};

.github/prompts/fix-error.prompt.md

@@ -30,8 +30,8 @@ After the fix is validated (compilation clean, tests pass):
    - Steps a user can follow to manually validate the fix.
    - How the fix addresses the issue, with a brief note per changed file.
 5. **Monitor the PR** for Copilot review comments. Wait 1-2 minutes after each push for Copilot to leave its review, then check for new comments. Evaluate each comment:
-   - If valid, apply the fix, amend the commit, and force-push.
+   - If valid, apply the fix in a new commit, push, and **resolve the comment thread**.
    - If not applicable, leave a reply explaining why.
    - After addressing comments, update the PR description if the changes affect the summary, code flow explanation, or per-file notes.
-6. **Repeat monitoring** after each force-push: wait 1-2 minutes, check for new Copilot comments, and address them. Continue this loop until no new comments appear.
+6. **Repeat monitoring** after each push: wait 1-2 minutes, check for new Copilot comments, and address them. Continue this loop until no new comments appear.
 7. **Re-run tests** after addressing review comments to confirm nothing regressed.

.vscode/settings.json

@@ -12,7 +12,6 @@
 	"chat.tools.edits.autoApprove": {
 		".github/skills/azure-pipelines/azure-pipeline.ts": false
 	},
-	"chat.viewSessions.enabled": true,
 	"chat.editing.explainChanges.enabled": true,
 	// --- Editor ---
 	"editor.insertSpaces": false,

.vscode/tasks.json

@@ -240,7 +240,7 @@
 			"problemMatcher": []
 		},
 		{
-			"label": "Run and Compile Dev Sessions",
+			"label": "Run and Compile Sessions - OSS",
 			"type": "shell",
 			"command": "npm run transpile-client && ./scripts/code.sh",
 			"windows": {
@@ -252,6 +252,16 @@
 			"inSessions": true,
 			"problemMatcher": []
 		},
+		{
+			"label": "Run and Compile Code - OSS",
+			"type": "shell",
+			"command": "npm run transpile-client && ./scripts/code.sh",
+			"windows": {
+				"command": "npm run transpile-client && .\\scripts\\code.bat"
+			},
+			"inSessions": true,
+			"problemMatcher": []
+		},
 		{
 			"type": "npm",
 			"script": "electron",

eslint.config.js

@@ -1042,6 +1042,33 @@ export default tseslint.config(
 			]
 		}
 	},
+	// electron-main layer: prevent static imports of heavy node_modules
+	// that would be synchronously loaded on startup
+	{
+		files: [
+			'src/vs/code/electron-main/**/*.ts',
+			'src/vs/code/node/**/*.ts',
+			'src/vs/platform/*/electron-main/**/*.ts',
+			'src/vs/platform/*/node/**/*.ts',
+		],
+		languageOptions: {
+			parser: tseslint.parser,
+		},
+		plugins: {
+			'local': pluginLocal,
+		},
+		rules: {
+			'local/code-no-static-node-module-import': [
+				'error',
+				// Files that run in separate processes, not on the electron-main startup path
+				'src/vs/platform/agentHost/node/copilot/**/*.ts',
+				'src/vs/platform/files/node/watcher/**/*.ts',
+				'src/vs/platform/terminal/node/**/*.ts',
+				// Files that use small, safe modules
+				'src/vs/platform/environment/node/argv.ts',
+			]
+		}
+	},
 	// browser/electron-browser layer
 	{
 		files: [

extensions/json-language-features/server/src/jsonServer.ts

@@ -11,7 +11,7 @@ import {
 
 import { runSafe, runSafeAsync } from './utils/runner';
 import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
-import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions } from 'vscode-json-languageservice';
+import { TextDocument, JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration, ClientCapabilities, Range, Position, SortOptions, SeverityLevel } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
 import { Utils, URI } from 'vscode-uri';
 import * as l10n from '@vscode/l10n';
@@ -216,7 +216,13 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			schemas?: JSONSchemaSettings[];
 			format?: { enable?: boolean };
 			keepLines?: { enable?: boolean };
-			validate?: { enable?: boolean };
+			validate?: {
+				enable?: boolean;
+				comments?: SeverityLevel;
+				trailingCommas?: SeverityLevel;
+				schemaValidation?: SeverityLevel;
+				schemaRequest?: SeverityLevel;
+			};
 			resultLimit?: number;
 			jsonFoldingLimit?: number;
 			jsoncFoldingLimit?: number;
@@ -242,6 +248,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 	let schemaAssociations: ISchemaAssociations | SchemaConfiguration[] | undefined = undefined;
 	let formatterRegistrations: Thenable<Disposable>[] | null = null;
 	let validateEnabled = true;
+	let commentsSeverity: SeverityLevel | undefined = undefined;
+	let trailingCommasSeverity: SeverityLevel | undefined = undefined;
+	let schemaValidationSeverity: SeverityLevel | undefined = undefined;
+	let schemaRequestSeverity: SeverityLevel | undefined = undefined;
 	let keepLinesEnabled = false;
 
 	// The settings have changed. Is sent on server activation as well.
@@ -250,6 +260,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		runtime.configureHttpRequests?.(settings?.http?.proxy, !!settings.http?.proxyStrictSSL);
 		jsonConfigurationSettings = settings.json?.schemas;
 		validateEnabled = !!settings.json?.validate?.enable;
+		commentsSeverity = settings.json?.validate?.comments;
+		trailingCommasSeverity = settings.json?.validate?.trailingCommas;
+		schemaValidationSeverity = settings.json?.validate?.schemaValidation;
+		schemaRequestSeverity = settings.json?.validate?.schemaRequest;
 		keepLinesEnabled = settings.json?.keepLines?.enable || false;
 		updateConfiguration();
 
@@ -388,7 +402,12 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			return []; // ignore empty documents
 		}
 		const jsonDocument = getJSONDocument(textDocument);
-		const documentSettings: DocumentLanguageSettings = textDocument.languageId === 'jsonc' ? { comments: 'ignore', trailingCommas: 'warning' } : { comments: 'error', trailingCommas: 'error' };
+		const documentSettings: DocumentLanguageSettings = {
+			comments: commentsSeverity ?? (textDocument.languageId === 'jsonc' ? 'ignore' : 'error'),
+			trailingCommas: trailingCommasSeverity ?? (textDocument.languageId === 'jsonc' ? 'warning' : 'error'),
+			schemaValidation: schemaValidationSeverity,
+			schemaRequest: schemaRequestSeverity
+		};
 		return await languageService.doValidation(textDocument, jsonDocument, documentSettings);
 	}
 

extensions/theme-defaults/themes/2026-dark.json

@@ -57,7 +57,7 @@
 		"list.activeSelectionForeground": "#ededed",
 		"list.inactiveSelectionBackground": "#2C2D2E",
 		"list.inactiveSelectionForeground": "#ededed",
-		"list.hoverBackground": "#262728",
+		"list.hoverBackground": "#FFFFFF0D",
 		"list.hoverForeground": "#bfbfbf",
 		"list.dropBackground": "#3994BC1A",
 		"toolbar.hoverBackground": "#FFFFFF18",

src/vs/base/common/event.ts

@@ -1071,19 +1071,33 @@ class Stacktrace {
 
 // error that is logged when going over the configured listener threshold
 export class ListenerLeakError extends Error {
-	constructor(message: string, stack: string) {
-		super(message);
+	/**
+	 * The detailed message including listener count and most frequent stack.
+	 * Available locally for debugging but intentionally not used as the error
+	 * `message` so that all leak errors group under the same title in telemetry.
+	 */
+	readonly details: string;
+	constructor(details: string, stack: string) {
+		super('potential listener LEAK detected');
 		this.name = 'ListenerLeakError';
+		this.details = details;
 		this.stack = stack;
 	}
 }
 
 // SEVERE error that is logged when having gone way over the configured listener
 // threshold so that the emitter refuses to accept more listeners
 export class ListenerRefusalError extends Error {
-	constructor(message: string, stack: string) {
-		super(message);
+	/**
+	 * The detailed message including listener count and most frequent stack.
+	 * Available locally for debugging but intentionally not used as the error
+	 * `message` so that all refusal errors group under the same title in telemetry.
+	 */
+	readonly details: string;
+	constructor(details: string, stack: string) {
+		super('potential listener LEAK detected (REFUSED to add)');
 		this.name = 'ListenerRefusalError';
+		this.details = details;
 		this.stack = stack;
 	}
 }