Merge branch 'main' into codespace-ideal-invention-5rpqgg746xp24pww

Author: ivanm696

.devcontainer/devcontainer-lock.json

@@ -5,10 +5,10 @@
       "resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:14ac23fd59afab939e6562ba6a1f42a659a805e4c574a1be23b06f28eb3b0b71",
       "integrity": "sha256:14ac23fd59afab939e6562ba6a1f42a659a805e4c574a1be23b06f28eb3b0b71"
     },
-    "ghcr.io/devcontainers/features/rust:1": {
-      "version": "1.3.3",
-      "resolved": "ghcr.io/devcontainers/features/rust@sha256:2521a8eeb4911bfcb22557c8394870ea22eb790d8e52219ddc5182f62d388995",
-      "integrity": "sha256:2521a8eeb4911bfcb22557c8394870ea22eb790d8e52219ddc5182f62d388995"
+    "ghcr.io/devcontainers/features/rust:": {
+      "version": "1.5.0",
+      "resolved": "ghcr.io/devcontainers/features/rust@sha256:0c55e65f2e3df736e478f26ee4d5ed41bae6b54dac1318c443e31444c8ed283c",
+      "integrity": "sha256:0c55e65f2e3df736e478f26ee4d5ed41bae6b54dac1318c443e31444c8ed283c"
     }
   }
 }

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	},
 	"features": {
 		"ghcr.io/devcontainers/features/desktop-lite:": {},
-		"ghcr.io/devcontainers/features/rust:1": {}
+		"ghcr.io/devcontainers/features/rust:": {}
 	},
 	"containerEnv": {
 		"DISPLAY": "" // Allow the Dev Containers extension to set DISPLAY, post-create.sh will add it back in ~/.bashrc and ~/.zshrc if not set.

.eslint-plugin-local/code-no-declare-const-enum.ts

@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+/**
+ * Disallows `declare const enum` declarations. esbuild does not inline
+ * `declare const enum` values, leaving the enum identifier in the output
+ * which causes a ReferenceError at runtime.
+ *
+ * Use `const enum` (without `declare`) instead.
+ *
+ * See https://github.com/evanw/esbuild/issues/4394
+ */
+export default new class NoDeclareConstEnum implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noDeclareConstEnum: '"declare const enum" is not supported by esbuild. Use "const enum" instead. See https://github.com/evanw/esbuild/issues/4394',
+		},
+		schema: false,
+		fixable: 'code',
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			TSEnumDeclaration(node: any) {
+				if (node.const && node.declare) {
+					context.report({
+						node,
+						messageId: 'noDeclareConstEnum',
+						fix: (fixer) => {
+							// Remove "declare " from "declare const enum"
+							const sourceCode = context.sourceCode;
+							const text = sourceCode.getText(node);
+							const declareIndex = text.indexOf('declare');
+							if (declareIndex !== -1) {
+								return fixer.removeRange([
+									node.range[0] + declareIndex,
+									node.range[0] + declareIndex + 'declare '.length
+								]);
+							}
+							return null;
+						}
+					});
+				}
+			}
+		};
+	}
+};

.eslint-plugin-local/code-no-http-import.ts

@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { normalize } from 'path';
+import minimatch from 'minimatch';
+import { createImportRuleListener } from './utils.ts';
+
+const restrictedModules = new Set(['http', 'https']);
+
+const REPO_ROOT = normalize(`${import.meta.dirname}/..`);
+
+export default new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			notAllowed: 'Importing \'{{module}}\' is only allowed as a type import (`import type ...`) to prevent startup performance regressions as these modules are slow to load. Use dynamic `import(\'{{module}}\')` for runtime access.'
+		},
+		schema: {
+			type: 'array',
+			items: {
+				type: 'object',
+				properties: {
+					target: {
+						type: 'string',
+						description: 'A glob pattern for files to check'
+					}
+				},
+				additionalProperties: false,
+				required: ['target']
+			}
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const targets = (context.options as { target: string }[]).map(o => o.target);
+		if (targets.length > 0) {
+			const relativeFilename = normalize(context.getFilename()).substring(REPO_ROOT.length + 1).replace(/\\/g, '/');
+			const matched = targets.some(pattern => minimatch(relativeFilename, pattern));
+			if (!matched) {
+				return {}; // file is not covered by any target pattern
+			}
+		}
+
+		return createImportRuleListener((node, path) => {
+			if (!restrictedModules.has(path)) {
+				return;
+			}
+
+			const parent = node.parent;
+			if (!parent) {
+				return;
+			}
+
+			// Allow: import type { ... } from 'http'
+			// Allow: import type * as http from 'http'
+			if (parent.type === TSESTree.AST_NODE_TYPES.ImportDeclaration && parent.importKind === 'type') {
+				return;
+			}
+
+			// Allow: export type { ... } from 'http'
+			if ('exportKind' in parent && parent.exportKind === 'type') {
+				return;
+			}
+
+			context.report({
+				loc: parent.loc,
+				messageId: 'notAllowed',
+				data: {
+					module: path
+				}
+			});
+		});
+	}
+};

.eslint-plugin-local/code-no-native-private.ts

@@ -9,3 +9,5 @@ ThirdPartyNotices.txt eol=crlf
 *.sh eol=lf
 *.rtf -text
 **/*.json linguist-language=jsonc
+
+test/componentFixtures/.screenshots/**/*.png filter=lfs diff=lfs merge=lfs -text

.gitattributes

@@ -26,6 +26,7 @@ src/vs/base/browser/ui/tree/** @joaomoreno @benibenj
 # Platform
 src/vs/platform/auxiliaryWindow/** @bpasero
 src/vs/platform/backup/** @bpasero
+src/vs/platform/browserView/** @kycutler @jruales
 src/vs/platform/dialogs/** @bpasero
 src/vs/platform/editor/** @bpasero
 src/vs/platform/environment/** @bpasero
@@ -65,7 +66,7 @@ src/vs/code/** @bpasero @deepak1556
 src/vs/workbench/services/activity/** @bpasero
 src/vs/workbench/services/authentication/** @TylerLeonhardt
 src/vs/workbench/services/auxiliaryWindow/** @bpasero
-src/vs/workbench/services/chat/** @bpasero
+src/vs/workbench/services/browserView/** @kycutler @jruales
 src/vs/workbench/services/contextmenu/** @bpasero
 src/vs/workbench/services/dialogs/** @alexr00 @bpasero
 src/vs/workbench/services/editor/** @bpasero
@@ -98,17 +99,9 @@ src/vs/workbench/electron-browser/** @bpasero
 
 # Workbench Contributions
 src/vs/workbench/contrib/authentication/** @TylerLeonhardt
+src/vs/workbench/contrib/browserView/** @kycutler @jruales
 src/vs/workbench/contrib/files/** @bpasero
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @roblourens
-src/vs/workbench/contrib/chat/browser/chatSetup/** @bpasero
-src/vs/workbench/contrib/chat/browser/chatStatus/** @bpasero
-src/vs/workbench/contrib/chat/browser/chatViewPane.ts @bpasero
-src/vs/workbench/contrib/chat/browser/media/chatViewPane.css @bpasero
-src/vs/workbench/contrib/chat/browser/chatViewTitleControl.ts @bpasero
-src/vs/workbench/contrib/chat/browser/media/chatViewTitleControl.css @bpasero
-src/vs/workbench/contrib/chat/browser/chatManagement/chatUsageWidget.ts @bpasero
-src/vs/workbench/contrib/chat/browser/chatManagement/media/chatUsageWidget.css @bpasero
-src/vs/workbench/contrib/chat/browser/agentSessions/** @bpasero
 src/vs/workbench/contrib/localization/** @TylerLeonhardt
 src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts @TylerLeonhardt
 src/vs/workbench/contrib/scm/** @lszomoru

.github/CODENOTIFY

@@ -17,3 +17,4 @@ build/lib/policies/policyData.jsonc @joshspicer @rebornix @joaomoreno @pwang347
 # Ensure the API team is aware of changes to the vscode-dts file
 # this is only about the final API, not about proposed API changes
 src/vscode-dts/vscode.d.ts @jrieken @mjbvz @alexr00
+src/vs/workbench/services/extensions/common/extensionPoints.json @jrieken @mjbvz @alexr00

.github/CODEOWNERS

@@ -1,8 +1,7 @@
 ---
 name: Data
 description: Answer telemetry questions with data queries using Kusto Query Language (KQL)
-tools:
-  ['vscode/extensions', 'execute/runInTerminal', 'read/readFile', 'search', 'web/githubRepo', 'azure-mcp/kusto_query', 'todo']
+tools: [vscode/extensions, execute/runInTerminal, read/readFile, search, azure-mcp/kusto_query, todo, ms-vscode.kusto-client/kusto, ms-vscode.kusto-client/kustoQueryExecution]
 ---
 
 # Role and Objective
@@ -14,7 +13,9 @@ You are a Azure Data Explorer data analyst with expert knowledge in Kusto Query
 1. Read `vscode-telemetry-docs/.github/copilot-instructions.md` to understand how to access VS Code's telemetry
 	- If the `vscode-telemetry-docs` folder doesn't exist (just check your workspace_info, no extra tool call needed), run `npm run mixin-telemetry-docs` to clone the telemetry documentation.
 2. Analyze data using kusto queries: Don't just describe what could be queried - actually execute Kusto queries to provide real data and insights:
-   - If the `kusto_query` tool doesn't exist (just check your provided tools, no need to run it!), install the `ms-azuretools.vscode-azure-mcp-server` VS Code extension
+   - You need either the **Kusto Explorer** extension (`ms-vscode.kusto-client`) or the **Azure MCP** extension (`ms-azuretools.vscode-azure-mcp-server`) installed to run queries.
+   - **Prefer Kusto Explorer** (`kusto_runQuery` / `kusto_checkQueryExecution` tools) over Azure MCP (`kusto_query` tool) when both are available.
+   - If neither tool is available (just check your provided tools, no need to run them!), install the Kusto Explorer extension (`ms-vscode.kusto-client`). If that is not an option, fall back to installing the Azure MCP extension (`ms-azuretools.vscode-azure-mcp-server`).
 	- Use the appropriate Kusto cluster and database for the data type
    - Always include proper time filtering to limit data volume
    - Default to a rolling 28-day window if no specific timeframe is requested
@@ -41,3 +42,7 @@ Your response should include:
 - Interpretation and analysis of the results
 - References to specific documentation files when applicable
 - Additional context or insights from the telemetry data
+
+# Troubleshooting
+
+If the connection to the Kusto cluster is timing out consistently, stop and ask the user to check whether they are connected to Azure VPN.

.github/agents/data.md

@@ -140,6 +140,8 @@ function f(x: number, y: string): void { }
 - 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.
+- Use `IEditorService` to open editors instead of `IEditorGroupsService.activeGroup.openEditor` to ensure that the editor opening logic is properly followed and to avoid bypassing important features such as `revealIfOpened` or `preserveFocus`.
+- Avoid using `bind()`, `call()` and `apply()` solely to control `this` or partially apply arguments; prefer arrow functions or closures to capture the necessary context, and use these methods only when required by an API or interoperability.
 
 ## 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.