Merge branch 'main' into 243202

Author: notoriousmango

.eslint-plugin-local/code-import-patterns.ts

@@ -18,7 +18,7 @@ interface ConditionalPattern {
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
@@ -80,7 +80,7 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
@@ -98,7 +98,7 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'common', deps: orSegment(['common']) },
 			{ layer: 'worker', deps: orSegment(['common', 'worker']) },
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
-			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
+			{ layer: 'electron-browser', deps: orSegment(['common', 'browser', 'electron-browser']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
 			{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
 			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },

.github/chatmodes/learn.chatmode.md

@@ -0,0 +1,7 @@
+---
+description: 'Save learnings from conversation'
+tools: ['codebase', 'editFiles', 'githubRepo', 'runCommands', 'search', 'searchResults', 'usages']
+---
+Please take a moment and deeply reflect on all the steps you took and think if there would have been a piece of information which would have allowed you to work faster (take less steps).
+
+The file .vscode/project.instructions.md has been already provided to you. Edit the file such that it would contain information which would have made you work faster. Please don't make this too specific to this task, but rather something that is generic but useful enought to ensure speed-ups in the future for other tasks.

.github/chatmodes/plan.chatmode.md

@@ -0,0 +1,5 @@
+---
+description: 'Plan the solution for a problem.'
+tools: ['codebase', 'findTestFiles', 'githubRepo', 'search', 'searchResults', 'usages']
+---
+I need your help with the following problem. Please take a look, understand the request in depth, and if the request makes sense, research it, understand the existing code, then suggest a clear plan with steps to take to address the request.

.github/commands.json

@@ -538,5 +538,62 @@
 		"addLabel": "info-needed",
 		"removeLabel": "~confirmation-needed",
 		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
+	},
+		{
+		"type": "label",
+		"name": "~chat-rate-limiting",
+		"removeLabel": "~chat-rate-limiting",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2627. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-request-failed",
+		"removeLabel": "~chat-request-failed",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/4332. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-rai-content-filters",
+		"removeLabel": "~chat-rai-content-filters",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2625. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-public-code-blocking",
+		"removeLabel": "~chat-public-code-blocking",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2626. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-lm-unavailable",
+		"removeLabel": "~chat-lm-unavailable",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2116. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-authentication",
+		"removeLabel": "~chat-authentication",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode-copilot-release/issues/11078, if the bug you are experiencing is not there, please comment on this closed issue thread so we can re-open it.",
+		"assign": ["TylerLeonhardt"]
+	},
+	{
+		"type": "label",
+		"name": "~chat-no-response-returned",
+		"removeLabel": "~chat-no-response-returned",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode-copilot-release/issues/7034. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
 	}
 ]

.npmrc

@@ -1,7 +1,8 @@
 disturl="https://electronjs.org/headers"
 target="35.5.1"
-ms_build_id="11708675"
+ms_build_id="11727614"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
 timeout=180000
+npm_config_node_gyp="node build/npm/gyp/node_modules/node-gyp/bin/node-gyp.js"

.vscode/launch.json

@@ -254,6 +254,7 @@
 				"VSCODE_SKIP_PRELAUNCH": "1",
 			},
 			"cleanUp": "wholeBrowser",
+			"killBehavior": "polite",
 			"runtimeArgs": [
 				"--inspect-brk=5875",
 				"--no-cached-data",

.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"May 2025\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"June 2025\""
   },
   {
     "kind": 1,

.vscode/project.instructions.md

@@ -0,0 +1,61 @@
+---
+applyTo: '**'
+---
+
+# VS Code Copilot Development Guide
+
+This file contains key information to help AI assistants work more efficiently with the VS Code codebase.
+
+## Quick Reference for Common Issues
+
+### Build & Test Workflow
+1. **Compile**: `npm run compile` (required before testing code changes)
+2. **Run specific tests**: `./scripts/test.sh --grep "pattern"`
+3. **Test file location**: `out/` directory contains compiled JavaScript
+4. **Extension compilation**: Extensions compile separately and take significant time
+
+### Code Architecture Patterns
+
+#### Testing Strategy
+- Unit tests in `src/vs/*/test/` directories
+- Integration tests in `test/` directory
+- Use `npm run compile` before running node-based tests
+
+## Common Gotchas
+
+### Module Loading
+- Use compiled files from `out/` directory when testing with node
+- Import paths: `const { Class } = require('../out/vs/path/to/module.js')`
+- ES modules require `.mjs` extension or package.json type modification
+
+### Test Location
+- 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
+
+## Investigation Shortcuts
+
+### 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
+
+### Build Optimization
+- Compilation takes ~2 minutes - do this once at start
+- Extensions compile separately - skip if not needed
+- Use incremental compilation for faster iteration
+
+## File Structure Quick Reference
+
+```
+src/vs/
+├── base/common/           # Core utilities (color.ts, etc.)
+├── editor/contrib/        # Editor features
+├── platform/             # Platform services
+└── workbench/            # Main UI components
+
+test/                     # Integration tests
+out/                     # Compiled output
+scripts/                 # Build and test scripts
+```

.vscode/settings.json

@@ -181,5 +181,9 @@
 		"*": "error",
 		"ts": "warning",
 		"eslint": "warning"
+	},
+	"chat.instructionsFilesLocations": {
+		".github/instructions": true,
+		".vscode": true
 	}
 }

build/.cachesalt

@@ -1 +1 @@
-2025-05-14T16:33:46.494Z
+2025-06-09T07:16:15.626Z