Merge branch 'main' into copilot/fix-254721

Author: Tyriar

.config/guardian/.gdnbaselines

@@ -296,21 +296,6 @@
       "expirationDate": "2025-11-19 21:48:17Z",
       "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
     },
-    "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
-      "signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
-      "alternativeSignatures": [
-        "07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
-      ],
-      "target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2008",
-      "createdDate": "2025-06-02 21:46:49Z",
-      "expirationDate": "2025-11-19 21:48:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
-    },
     "1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef": {
       "signature": "1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef",
       "alternativeSignatures": [
@@ -326,21 +311,6 @@
       "expirationDate": "2025-11-19 21:48:17Z",
       "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
     },
-    "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
-      "signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
-      "alternativeSignatures": [
-        "4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
-      ],
-      "target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2008",
-      "createdDate": "2025-06-02 21:46:49Z",
-      "expirationDate": "2025-11-19 21:48:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
-    },
     "21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101": {
       "signature": "21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101",
       "alternativeSignatures": [
@@ -416,21 +386,6 @@
       "expirationDate": "2025-11-19 21:48:17Z",
       "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
     },
-    "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
-      "signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
-      "alternativeSignatures": [
-        "b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
-      ],
-      "target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2008",
-      "createdDate": "2025-06-02 21:46:49Z",
-      "expirationDate": "2025-11-19 21:48:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
-    },
     "d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000": {
       "signature": "d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000",
       "alternativeSignatures": [
@@ -462,4 +417,4 @@
       "justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
     }
   }
-}
+}

.eslint-plugin-local/index.js

@@ -2,12 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+// @ts-check
 const glob = require('glob');
 const path = require('path');
 
 require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
 
 // Re-export all .ts files as rules
+/** @type {Record<string, import('@typescript-eslint/utils/dist/ts-eslint').LooseRuleDefinition>} */
 const rules = {};
 glob.sync(`${__dirname}/*.ts`).forEach((file) => {
 	rules[path.basename(file, '.ts')] = require(file);

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,12 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
 ---
+
 <!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
 <!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
 <!-- 🕮 Read our guide about submitting issues: https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions -->
@@ -19,4 +24,4 @@ Does this issue occur when all extensions are disabled?: Yes/No
 Steps to Reproduce:
 
 1. 
-2. 
+2.

.github/ISSUE_TEMPLATE/copilot_bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Copilot Bug report
+about: Create a report to help us improve Copilot's chat interface in VS Code
+title: ''
+labels: chat-ext-issue
+assignees: ''
+
+---
+
+<!-- Please search existing issues to avoid creating duplicates -->
+<!-- Please attach logs to help us diagnose your issue -->
+
+- Copilot Chat Extension Version:
+- VS Code Version:
+- OS Version:
+- Feature (e.g. agent/edit/ask mode):
+- Selected model (e.g. GPT 4.1, Claude 3.7 Sonnet):
+- Logs:
+
+Steps to Reproduce:
+
+1.
+2.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
 ---
 

.github/chatmodes/learn.chatmode.md

@@ -54,8 +54,8 @@
 		"editor-hover": {"assign": ["aiday-mar"]},
 		"editor-indent-detection": {"assign": ["alexdima"]},
 		"editor-indent-guides": {"assign": ["hediet"]},
-		"editor-input": {"assign": ["alexdima"]},
-		"editor-input-IME": {"assign": ["alexdima"]},
+		"editor-input": {"assign": ["aiday-mar"]},
+		"editor-input-IME": {"assign": ["aiday-mar"]},
 		"editor-insets": {"assign": ["jrieken"]},
 		"editor-minimap": {"assign": ["alexdima"]},
 		"editor-multicursor": {"assign": ["alexdima"]},
@@ -75,7 +75,7 @@
 		"emmet": {"assign": ["rzhao271"]},
 		"emmet-parse": {"assign": ["rzhao271"]},
 		"error-list": {"assign": ["sandy081"]},
-		"extension-activation": {"assign": ["joyceerhl", "alexdima"]},
+		"extension-activation": {"assign": ["alexdima"]},
 		"extension-host": {"assign": ["alexdima"]},
 		"extension-prerelease": {"assign": ["sandy081"]},
 		"extension-recommendations": {"assign": ["sandy081"]},
@@ -263,7 +263,7 @@
 		"user-profiles": {"assign": ["sandy081"]},
 		"ux": {"assign": ["daviddossett"]},
 		"variable-resolving": {"assign": ["alexr00"]},
-		"VIM": {"assign": ["alexdima", "rebornix"]},
+		"VIM": {"assign": ["rebornix"]},
 		"virtual-workspaces": {"assign": []},
 		"vscode.dev": {"assign": []},
 		"vscode-build": {"assign": []},

.github/chatmodes/plan.chatmode.md

@@ -1,57 +1,116 @@
-# Coding Guidelines
-
-## Introduction
-
-These are VS Code coding guidelines. Please also review our [Source Code Organisation](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) page.
-
-## Indentation
+# VS Code Copilot Instructions
+
+## Project Overview
+
+Visual Studio Code is built with a layered architecture using TypeScript, web APIs and Electron, combining web technologies with native app capabilities. The codebase is organized into key architectural layers:
+
+### Root Folders
+- `src/`: Main TypeScript source code with unit tests in `src/vs/*/test/` folders
+- `build/`: Build scripts and CI/CD tools
+- `extensions/`: Built-in extensions that ship with VS Code
+- `test/`: Integration tests and test infrastructure
+- `scripts/`: Development and build scripts
+- `resources/`: Static resources (icons, themes, etc.)
+- `out/`: Compiled JavaScript output (generated during build)
+
+### Core Architecture (`src/` folder)
+- `src/vs/base/` - Foundation utilities and cross-platform abstractions
+- `src/vs/platform/` - Platform services and dependency injection infrastructure
+- `src/vs/editor/` - Text editor implementation with language services, syntax highlighting, and editing features
+- `src/vs/workbench/` - Main application workbench for web and desktop
+  - `workbench/browser/` - Core workbench UI components (parts, layout, actions)
+  - `workbench/services/` - Service implementations
+  - `workbench/contrib/` - Feature contributions (git, debug, search, terminal, etc.)
+  - `workbench/api/` - Extension host and VS Code API implementation
+- `src/vs/code/` - Electron main process specific implementation
+- `src/vs/server/` - Server specific implementation
+
+The core architecture follows these principles:
+- **Layered architecture** - from `base`, `platform`, `editor`, to `workbench`
+- **Dependency injection** - Services are injected through constructor parameters
+- **Contribution model** - Features contribute to registries and extension points
+- **Cross-platform compatibility** - Abstractions separate platform-specific code
+
+### Built-in Extensions (`extensions/` folder)
+The `extensions/` directory contains first-party extensions that ship with VS Code:
+- **Language support** - `typescript-language-features/`, `html-language-features/`, `css-language-features/`, etc.
+- **Core features** - `git/`, `debug-auto-launch/`, `emmet/`, `markdown-language-features/`
+- **Themes** - `theme-*` folders for default color themes
+- **Development tools** - `extension-editing/`, `vscode-api-tests/`
+
+Each extension follows the standard VS Code extension structure with `package.json`, TypeScript sources, and contribution points to extend the workbench through the Extension API.
+
+### Finding Related Code
+1. **Semantic search first**: Use file search for general concepts
+2. **Grep for exact strings**: Use grep for error messages or specific function names
+3. **Follow imports**: Check what files import the problematic module
+4. **Check test files**: Often reveal usage patterns and expected behavior
+
+## Coding Guidelines
+
+### Indentation
 
 We use tabs, not spaces.
 
-## Naming Conventions
+### Naming Conventions
+
+- Use PascalCase for `type` names
+- Use PascalCase for `enum` values
+- Use camelCase for `function` and `method` names
+- Use camelCase for `property` names and `local variables`
+- Use whole words in names when possible
 
-* Use PascalCase for `type` names
-* Use PascalCase for `enum` values
-* Use camelCase for `function` and `method` names
-* Use camelCase for `property` names and `local variables`
-* Use whole words in names when possible
+### Types
 
-## Types
+- Do not export `types` or `functions` unless you need to share it across multiple components
+- Do not introduce new `types` or `values` to the global namespace
 
-* Do not export `types` or `functions` unless you need to share it across multiple components
-* Do not introduce new `types` or `values` to the global namespace
+### Comments
 
-## Comments
+- Use JSDoc style comments for `functions`, `interfaces`, `enums`, and `classes`
 
-* When there are comments for `functions`, `interfaces`, `enums`, and `classes` use JSDoc style comments
+### Strings
 
-## Strings
+- Use "double quotes" for strings shown to the user that need to be externalized (localized)
+- Use 'single quotes' otherwise
+- All strings visible to the user need to be externalized
 
-* Use "double quotes" for strings shown to the user that need to be externalized (localized)
-* Use 'single quotes' otherwise
-* All strings visible to the user need to be externalized
+### UI labels
+- Use title-style capitalization for command labels, buttons and menu items (each word is capitalized).
+- Don't capitalize prepositions of four or fewer letters unless it's the first or last word (e.g. "in", "with", "for").
 
-## Style
+### Style
 
-* Use arrow functions `=>` over anonymous function expressions
-* Only surround arrow function parameters when necessary. For example, `(x) => x + x` is wrong but the following are correct:
+- Use arrow functions `=>` over anonymous function expressions
+- Only surround arrow function parameters when necessary. For example, `(x) => x + x` is wrong but the following are correct:
 
-```javascript
+```typescript
 x => x + x
 (x, y) => x + y
 <T>(x: T, y: T) => x === y
 ```
 
-* Always surround loop and conditional bodies with curly braces
-* Open curly braces always go on the same line as whatever necessitates them
-* Parenthesized constructs should have no surrounding whitespace. A single space follows commas, colons, and semicolons in those constructs. For example:
+- Always surround loop and conditional bodies with curly braces
+- Open curly braces always go on the same line as whatever necessitates them
+- Parenthesized constructs should have no surrounding whitespace. A single space follows commas, colons, and semicolons in those constructs. For example:
 
-```javascript
+```typescript
 for (let i = 0, n = str.length; i < 10; i++) {
     if (x < 10) {
         foo();
     }
 }
-
 function f(x: number, y: string): void { }
 ```
+
+- Whenever possible, use in top-level scopes `export function x(…) {…}` instead of `export const x = (…) => {…}`. One advantage of using the `function` keyword is that the stack-trace shows a good name when debugging.
+
+### Code Quality
+
+- All files must include Microsoft copyright header
+- Prefer `async` and `await` over `Promise` and `then` calls
+- All user facing messages must be localized using the applicable localization framework (for example `nls.localize()` method)
+- Don't add tests to the wrong test suite (e.g., adding to end of file instead of inside relevant suite)
+- Look for existing test patterns before creating new structures
+- Use `describe` and `test` consistently with existing patterns
+- If you create any temporary new files, scripts, or helper files for iteration, clean up these files by removing them at the end of the task

.github/classifier.json

@@ -0,0 +1,28 @@
+---
+applyTo: '**/*.ts'
+---
+
+# VS Code Copilot Development Instructions for TypeScript
+
+You MUST check compilation output before running ANY script or declaring work complete!
+
+1. **ALWAYS** check the "Core - Build" task output for compilation errors
+2. **ALWAYS** check the "Ext - Build" task output for compilation errors
+3. **NEVER** run tests if there are compilation errors
+3. **NEVER** use `npm run compile` to compile TypeScript files, always check task output
+4. **FIX** all compilation errors before moving forward
+
+## TypeScript compilation steps
+
+Typescript compilation errors can be found by running the "Core - Build" and "Ext - Build" tasks:
+- **Core - Build**: Compiles the main VS Code TypeScript sources
+- **Ext - Build**: Compiles the built-in extensions
+- These background tasks may already be running from previous development sessions
+- If not already running, start them to get real-time compilation feedback
+- The tasks provide incremental compilation, so they will automatically recompile when files change
+
+## TypeScript validation steps
+- Use `scripts/test.sh` (or `scripts\test.bat` on Windows) for unit tests (add `--grep <pattern>` to filter tests)
+- Use `scripts/test-integration.sh` (or `scripts\test-integration.bat` on Windows) for integration tests
+- Use `npm run valid-layers-check` to check for layering issues
+