Merge remote-tracking branch 'origin/model-selection' into autocomplete-readd

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -1,21 +0,0 @@
-## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
-
-pipelines:
-  111:
-    retail:
-      source:
-        credscan:
-          lastModifiedDate: 2024-09-10
-        eslint:
-          lastModifiedDate: 2024-09-10
-        psscriptanalyzer:
-          lastModifiedDate: 2024-09-10
-        armory:
-          lastModifiedDate: 2024-09-10
-      binary:
-        credscan:
-          lastModifiedDate: 2025-02-04
-        binskim:
-          lastModifiedDate: 2025-02-04
-        spotbugs:
-          lastModifiedDate: 2025-02-04

.config/guardian/.gdnbaselines

@@ -1,255 +0,0 @@
-{
-  "properties": {
-    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
-  },
-  "version": "1.0.0",
-  "baselines": {
-    "default": {
-      "name": "default",
-      "createdDate": "2025-01-28 06:29:05Z",
-      "lastUpdatedDate": "2025-01-28 06:29:05Z"
-    }
-  },
-  "results": {
-    "ea3b2bf4f5b3d0bd8a6ad35cc61e49f2a1596660fd66d17d740e4806e7ed7dcc": {
-      "signature": "ea3b2bf4f5b3d0bd8a6ad35cc61e49f2a1596660fd66d17d740e4806e7ed7dcc",
-      "alternativeSignatures": [
-        "ff528c0b5a010ae7b5e9178b004a8b816a429a28ba98ce8336466b490a09dcef"
-      ],
-      "target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-01-30 19:19:49Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "12babbc85192ed1c8d927693da788537c1eef199bbecbe226f940a2d0e97637c": {
-      "signature": "12babbc85192ed1c8d927693da788537c1eef199bbecbe226f940a2d0e97637c",
-      "alternativeSignatures": [
-        "35b0519e201e56fb87fc6fb085e6fb1df5b89715142bb9086a5b2006e0fd4ced"
-      ],
-      "target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-01-30 19:19:49Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "49163bd1dc9d965d3baced1694dc8c43305b8bf96e884f478d8e4bd124454ba0": {
-      "signature": "49163bd1dc9d965d3baced1694dc8c43305b8bf96e884f478d8e4bd124454ba0",
-      "alternativeSignatures": [
-        "aa80bcf44aa8ddd20fb9802e9032c1257048b973896a944ded70bb195f060b2a"
-      ],
-      "target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-01-30 19:21:17Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "c405af02e021c3a473d4e45ec4daa658db1527ea7430c6be968d182e7b50fbd1": {
-      "signature": "c405af02e021c3a473d4e45ec4daa658db1527ea7430c6be968d182e7b50fbd1",
-      "alternativeSignatures": [
-        "619d2a1a77f55b4181493b8cfdf09be5261e539115752af2e4938f5ac04af132"
-      ],
-      "target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-01-30 19:21:17Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "71b8515b2eb51cfd5eace11cedb15189d51ce9e479095a5938334416088cbc03": {
-      "signature": "71b8515b2eb51cfd5eace11cedb15189d51ce9e479095a5938334416088cbc03",
-      "alternativeSignatures": [
-        "b34279fc5fec828b8dcd9ca873804e85d7d9cd78554ec109d2dd493351a7a244"
-      ],
-      "target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-01-30 19:51:51Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "9238de77a5320039def14694d1b6f501cc2288f13c9c688d2e0501fc5a56ee61": {
-      "signature": "9238de77a5320039def14694d1b6f501cc2288f13c9c688d2e0501fc5a56ee61",
-      "alternativeSignatures": [
-        "1d17616a549e9f36d814c4e802d651b1af453ce0a23d4478eef39be81adcc16b"
-      ],
-      "target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-01-30 19:51:51Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "bad8b698b48c1da9ece953903581c66bf98bc829ae1a6adcd3b5c2056a6fcd01": {
-      "signature": "bad8b698b48c1da9ece953903581c66bf98bc829ae1a6adcd3b5c2056a6fcd01",
-      "alternativeSignatures": [
-        "057376d31b97e8ce3ecf6a180a553b932d7e5be6e2b07a08027d5dfabe35e82c"
-      ],
-      "target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-01-30 19:53:13Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "cc7c248b0fd4c105e9a393ae232bf0d314ec50e65357a5e7e7d68f6f10c77077": {
-      "signature": "cc7c248b0fd4c105e9a393ae232bf0d314ec50e65357a5e7e7d68f6f10c77077",
-      "alternativeSignatures": [
-        "f3867098aff3368682df9926e85a35ec05cf905f27d0c157430021c3169f899d"
-      ],
-      "target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.97.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-01-30 19:53:13Z",
-      "expirationDate": "2025-07-19 21:12:48Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-01-30 21:12:48Z"
-    },
-    "8c53250a171412b84dedcbb22cdab9ec365d9b52d74b09c070097fff45372de0": {
-      "signature": "8c53250a171412b84dedcbb22cdab9ec365d9b52d74b09c070097fff45372de0",
-      "alternativeSignatures": [
-        "314267784b0ea867006e00b809a93498fae3264e42d1a3a7745ab13180a5b6ef"
-      ],
-      "target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-02-04 06:16:33Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "a6a58d971da858f4af219672cef73ffd0aacc47f1e2c12b8b44a428e1330d3de": {
-      "signature": "a6a58d971da858f4af219672cef73ffd0aacc47f1e2c12b8b44a428e1330d3de",
-      "alternativeSignatures": [
-        "4e40f2f1683f0bf2245f35d0ebbcf2f446274d84b1db09d8e76ddfdcad5d4479"
-      ],
-      "target": ".build/win32-arm64/system-setup/VSCodeSetup-arm64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-02-04 06:16:33Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "90e0f060e01e4a55620f609ac3241b62e8f54a059e9f4d292e93a4305fd3c39e": {
-      "signature": "90e0f060e01e4a55620f609ac3241b62e8f54a059e9f4d292e93a4305fd3c39e",
-      "alternativeSignatures": [
-        "377fe43ff8404d07f4a6ca763175004f360397ded6cf5d55b655646ada90e39c"
-      ],
-      "target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-02-04 06:17:54Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "f36c3dc19566098a923877d16d6ebfcbd971f8fcd8210afb8f5558fb5ba1f203": {
-      "signature": "f36c3dc19566098a923877d16d6ebfcbd971f8fcd8210afb8f5558fb5ba1f203",
-      "alternativeSignatures": [
-        "1af1f475c1617701e3d7a8fd465916bcc60c3125b8807af5d47d49137d9d468c"
-      ],
-      "target": ".build/win32-arm64/user-setup/VSCodeUserSetup-arm64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-02-04 06:17:54Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "71193d108c53bb802f5c491276365bcff0645fb380be57288f3fbd6896166d3a": {
-      "signature": "71193d108c53bb802f5c491276365bcff0645fb380be57288f3fbd6896166d3a",
-      "alternativeSignatures": [
-        "420cae2e6e34b93d7b74fc1ffddfdf23b57650ae989d838bb2d67f28e4e1db0e"
-      ],
-      "target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-02-04 07:11:19Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "444c302f49bdedcafe772322a09727b2279e3265d99deb2e307defeae3ef200b": {
-      "signature": "444c302f49bdedcafe772322a09727b2279e3265d99deb2e307defeae3ef200b",
-      "alternativeSignatures": [
-        "4ff6ccbdb0745d43d3b61f82fb2f4d8a64fe9787525df81a6d7b825e79282085"
-      ],
-      "target": ".build/win32-x64/system-setup/VSCodeSetup-x64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-02-04 07:11:19Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "4670c7c096a69ca428429ffa1f5250aac9f2e07beac0ffe587ffb37bdb1da4d4": {
-      "signature": "4670c7c096a69ca428429ffa1f5250aac9f2e07beac0ffe587ffb37bdb1da4d4",
-      "alternativeSignatures": [
-        "7cead96cb508ab6e37e27bcc0f8b7ed8d0761b77f4793958c46c5ff3892ab1b6"
-      ],
-      "target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2009",
-      "createdDate": "2025-02-04 07:13:22Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    },
-    "a359b4a5ed2378a73f3bba93e3fb1c595db7423c3082635d12d101bbeb0a51b8": {
-      "signature": "a359b4a5ed2378a73f3bba93e3fb1c595db7423c3082635d12d101bbeb0a51b8",
-      "alternativeSignatures": [
-        "125b52a21ef619a95e695085deb9492280bcf2c1decdd5e87e6416af5982d02d"
-      ],
-      "target": ".build/win32-x64/user-setup/VSCodeUserSetup-x64-1.98.0-insider.exe",
-      "memberOf": [
-        "default"
-      ],
-      "tool": "binskim",
-      "ruleId": "BA2018",
-      "createdDate": "2025-02-04 07:13:22Z",
-      "expirationDate": "2025-07-24 07:25:17Z",
-      "justification": "This error is baselined with an expiration date of 180 days from 2025-02-04 07:25:17Z"
-    }
-  }
-}

.config/guardian/.gdnsuppress

@@ -1,46 +0,0 @@
-{
-  "hydrated": false,
-  "properties": {
-    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions"
-  },
-  "version": "1.0.0",
-  "suppressionSets": {
-    "default": {
-      "name": "default",
-      "createdDate": "2025-03-17 11:52:32Z",
-      "lastUpdatedDate": "2025-03-17 11:52:32Z"
-    }
-  },
-  "results": {
-    "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
-      "signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
-      "alternativeSignatures": [
-        "07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2025-03-17 11:52:32Z"
-    },
-    "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
-      "signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
-      "alternativeSignatures": [
-        "4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2025-03-17 11:52:32Z"
-    },
-    "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
-      "signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
-      "alternativeSignatures": [
-        "b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2025-03-17 11:52:32Z"
-    }
-  }
-}

.devcontainer/README.md

@@ -1,6 +1,6 @@
 # Code - OSS Development Container
 
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
+[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
 
 This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
 

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-	"name": "Code - OSS",
+	"name": "Void",
 	"build": {
 		"dockerfile": "Dockerfile"
 	},

.eslint-plugin-local/code-limited-top-functions.ts

@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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';
-import { dirname, relative } from 'path';
-import minimatch from 'minimatch';
-
-export = new class implements eslint.Rule.RuleModule {
-
-	readonly meta: eslint.Rule.RuleMetaData = {
-		messages: {
-			layerbreaker: 'You are only allowed to define limited top level functions.'
-		},
-		schema: {
-			type: 'array',
-			items: {
-				type: 'object',
-				additionalProperties: {
-					type: 'array',
-					items: {
-						type: 'string'
-					}
-				}
-			}
-		}
-	};
-
-	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		let fileRelativePath = relative(dirname(__dirname), context.getFilename());
-		if (!fileRelativePath.endsWith('/')) {
-			fileRelativePath += '/';
-		}
-		const ruleArgs = <Record<string, string[]>>context.options[0];
-
-		const matchingKey = Object.keys(ruleArgs).find(key => fileRelativePath.startsWith(key) || minimatch(fileRelativePath, key));
-		if (!matchingKey) {
-			// nothing
-			return {};
-		}
-
-		const restrictedFunctions = ruleArgs[matchingKey];
-
-		return {
-			FunctionDeclaration: (node: any) => {
-				const isTopLevel = node.parent.type === 'Program';
-				const functionName = node.id.name;
-				if (isTopLevel && !restrictedFunctions.includes(node.id.name)) {
-					context.report({
-						node,
-						message: `Top-level function '${functionName}' is restricted in this file. Allowed functions are: ${restrictedFunctions.join(', ')}.`
-					});
-				}
-			},
-			ExportNamedDeclaration(node: any) {
-				if (node.declaration && node.declaration.type === 'FunctionDeclaration') {
-					const functionName = node.declaration.id.name;
-					const isTopLevel = node.parent.type === 'Program';
-					if (isTopLevel && !restrictedFunctions.includes(node.declaration.id.name)) {
-						context.report({
-							node,
-							message: `Top-level function '${functionName}' is restricted in this file. Allowed functions are: ${restrictedFunctions.join(', ')}.`
-						});
-					}
-				}
-			}
-		};
-	}
-};

.eslint-plugin-local/index.js

@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-const glob = require('glob');
-const path = require('path');
-
-require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
-
-// Re-export all .ts files as rules
-const rules = {};
-glob.sync(`${__dirname}/*.ts`).forEach((file) => {
-	rules[path.basename(file, '.ts')] = require(file);
-});
-
-exports.rules = rules;

.eslint-plugin-local/package.json

@@ -1,3 +0,0 @@
-{
-	"type": "commonjs"
-}

.eslint-plugin-local/vscode-dts-use-export.ts

@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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/utils';
-import * as eslint from 'eslint';
-
-export = new class VscodeDtsUseExport implements eslint.Rule.RuleModule {
-
-	readonly meta: eslint.Rule.RuleMetaData = {
-		messages: {
-			useExport: `Public api types must use 'export'`,
-		},
-		schema: false,
-	};
-
-	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		return {
-			['TSModuleDeclaration :matches(TSInterfaceDeclaration, ClassDeclaration, VariableDeclaration, TSEnumDeclaration, TSTypeAliasDeclaration)']: (node: any) => {
-				const parent = (<TSESTree.Node>node).parent;
-				if (parent && parent.type !== TSESTree.AST_NODE_TYPES.ExportNamedDeclaration) {
-					context.report({
-						node,
-						messageId: 'useExport'
-					});
-				}
-			}
-		};
-	}
-};
-

.eslintignore

@@ -12,10 +12,6 @@
 **/extensions/markdown-math/notebook-out/**
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
-**/extensions/terminal-suggest/src/completions/upstream/**
-**/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
-**/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts
-**/extensions/terminal-suggest/third_party/**
 **/extensions/typescript-language-features/test-workspace/**
 **/extensions/typescript-language-features/extension.webpack.config.js
 **/extensions/typescript-language-features/extension-browser.webpack.config.js
@@ -34,8 +30,15 @@
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
+**/src2/**/dompurify.js
+**/src2/**/marked.js
+**/src2/**/semver.js
+**/src2/typings/**/*.d.ts
+**/src2/vs/*/**/*.d.ts
+**/src2/vs/base/test/common/filters.perf.data.js
+**/src2/vs/loader.js
 **/test/unit/assert.js
+**/test/unit/assert-esm.js
 **/test/automation/out/**
 **/typings/**
-**/.build/**
 !.vscode

.eslintplugin/code-amd-node-module.ts

@@ -12,8 +12,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			amdX: 'Use `import type` for import declarations, use `amdX#importAMDNodeModule` for import expressions'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -51,7 +50,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 				node,
 				messageId: 'amdX'
 			});
-		};
+		}
 
 		return {
 			['ImportExpression Literal']: checkImport,

.eslintplugin/code-declare-service-brand.ts

@@ -8,8 +8,7 @@ import * as eslint from 'eslint';
 export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
-		fixable: 'code',
-		schema: false,
+		fixable: 'code'
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -19,7 +18,7 @@ export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
 					node,
 					message: `The '_serviceBrand'-property should not have a value`,
 					fix: (fixer) => {
-						return fixer.replaceText(node, 'declare _serviceBrand: undefined;');
+						return fixer.replaceText(node, 'declare _serviceBrand: undefined;')
 					}
 				});
 			}

.eslintplugin/code-ensure-no-disposables-leak-in-test.ts

@@ -13,8 +13,7 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 		messages: {
 			ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.'
 		},
-		fixable: 'code',
-		schema: false,
+		fixable: 'code'
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -27,7 +26,7 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 
 		return {
 			[`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: Node) => {
-				const src = context.getSourceCode().getText(node);
+				const src = context.getSourceCode().getText(node)
 				if (!src.includes('ensureNoDisposablesAreLeakedInTestSuite(')) {
 					context.report({
 						node,

.eslintplugin/code-import-patterns.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as path from 'path';
 import minimatch from 'minimatch';
 import { createImportRuleListener } from './utils';
@@ -44,14 +44,13 @@ export = new class implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization',
-			badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/eslint.config.js',
+			badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json',
 			badAbsolute: 'Imports have to be relative to support ESM',
 			badExtension: 'Imports have to end with `.js` or `.css` to support ESM',
 		},
 		docs: {
 			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -250,7 +249,7 @@ export = new class implements eslint.Rule.RuleModule {
 			const relativeFilename = getRelativeFilename(context);
 			importPath = path.posix.join(path.posix.dirname(relativeFilename), importPath);
 			if (/^src\/vs\//.test(importPath)) {
-				// resolve using base url
+				// resolve using AMD base url
 				importPath = importPath.substring('src/'.length);
 			}
 		}

.eslintplugin/code-layering.ts

@@ -20,18 +20,7 @@ export = new class implements eslint.Rule.RuleModule {
 		},
 		docs: {
 			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
-		},
-		schema: [
-			{
-				type: 'object',
-				additionalProperties: {
-					type: 'array',
-					items: {
-						type: 'string'
-					}
-				}
-			}
-		]
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/code-must-use-result.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 const VALID_USES = new Set<TSESTree.AST_NODE_TYPES | undefined>([
 	TSESTree.AST_NODE_TYPES.AwaitExpression,
@@ -12,24 +12,21 @@ const VALID_USES = new Set<TSESTree.AST_NODE_TYPES | undefined>([
 ]);
 
 export = new class MustUseResults implements eslint.Rule.RuleModule {
-	readonly meta: eslint.Rule.RuleMetaData = {
-		schema: false
-	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		const config = <{ message: string; functions: string[] }[]>context.options[0];
+		const config = <{ message: string, functions: string[] }[]>context.options[0];
 		const listener: eslint.Rule.RuleListener = {};
 
 		for (const { message, functions } of config) {
 			for (const fn of functions) {
-				const query = `CallExpression[callee.property.name='${fn}'], CallExpression[callee.name='${fn}']`;
+				const query = `CallExpression[callee.property.name='${fn}'], CallExpression[callee.name='${fn}']`
 				listener[query] = (node: any) => {
 					const cast: TSESTree.CallExpression = node;
 					if (!VALID_USES.has(cast.parent?.type)) {
 						context.report({ node, message });
 					}
-				};
+				}
 			}
 		}
 

.eslintplugin/code-must-use-super-dispose.ts

@@ -14,7 +14,7 @@ export = new class NoAsyncSuite implements eslint.Rule.RuleModule {
 				return;
 			}
 
-			const body = context.getSourceCode().getText(node);
+			const body = context.getSourceCode().getText(node)
 
 			if (body.includes('super.dispose')) {
 				return;

.eslintplugin/code-no-dangerous-type-assertions.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class NoDangerousTypeAssertions implements eslint.Rule.RuleModule {
 
@@ -32,7 +32,7 @@ export = new class NoDangerousTypeAssertions implements eslint.Rule.RuleModule {
 
 				context.report({
 					node,
-					message: `Don't use type assertions for creating objects as this can hide type errors.`
+					message: "Don't use type assertions for creating objects as this can hide type errors."
 				});
 			},
 		};

.eslintplugin/code-no-global-document-listener.ts

@@ -25,6 +25,6 @@ export = new class NoGlobalDocumentListener implements eslint.Rule.RuleModule {
 					});
 				}
 			},
-		};
+		}
 	}
 };

.eslintplugin/code-no-native-private.ts

@@ -10,8 +10,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			slow: 'Native private fields are much slower and should only be used when needed. Ignore this warning if you know what you are doing, use compile-time private otherwise. See https://github.com/microsoft/vscode/issues/185991#issuecomment-1614468158 for details',
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/code-no-nls-in-standalone-editor.ts

@@ -12,8 +12,7 @@ export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -24,7 +23,7 @@ export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule
 			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
 			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
 			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
-			|| /vs(\/|\\)editor(\/|\\)editor.worker.start/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)
 		) {
 			return createImportRuleListener((node, path) => {
 				// resolve relative paths

.eslintplugin/code-no-runtime-import.ts

@@ -16,13 +16,13 @@ export = new class implements eslint.Rule.RuleModule {
 			layerbreaker: 'You are only allowed to import {{import}} from here using `import type ...`.'
 		},
 		schema: {
-			type: 'array',
+			type: "array",
 			items: {
-				type: 'object',
+				type: "object",
 				additionalProperties: {
-					type: 'array',
+					type: "array",
 					items: {
-						type: 'string'
+						type: "string"
 					}
 				}
 			}

.eslintplugin/code-no-standalone-editor.ts

@@ -15,8 +15,7 @@ export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule
 		},
 		docs: {
 			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -38,7 +37,7 @@ export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule
 				|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
 				|| /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
 				|| /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
-				|| /vs(\/|\\)editor(\/|\\)editor.worker.start/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)
 			) {
 				context.report({
 					loc: node.loc,

.eslintplugin/code-no-static-self-ref.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 /**
  * WORKAROUND for https://github.com/evanw/esbuild/issues/3823
@@ -15,7 +15,7 @@ export = new class implements eslint.Rule.RuleModule {
 
 		function checkProperty(inNode: any) {
 
-			const classDeclaration = context.sourceCode.getAncestors(inNode).find(node => node.type === 'ClassDeclaration');
+			const classDeclaration = context.getAncestors().find(node => node.type === 'ClassDeclaration');
 			const propertyDefinition = <TSESTree.PropertyDefinition>inNode;
 
 			if (!classDeclaration || !classDeclaration.id?.name) {
@@ -26,19 +26,19 @@ export = new class implements eslint.Rule.RuleModule {
 				return;
 			}
 
-			const classCtor = classDeclaration.body.body.find(node => node.type === 'MethodDefinition' && node.kind === 'constructor');
+			const classCtor = classDeclaration.body.body.find(node => node.type === 'MethodDefinition' && node.kind === 'constructor')
 
 			if (!classCtor) {
 				return;
 			}
 
 			const name = classDeclaration.id.name;
-			const valueText = context.sourceCode.getText(<any>propertyDefinition.value);
+			const valueText = context.getSourceCode().getText(<any>propertyDefinition.value)
 
 			if (valueText.includes(name + '.')) {
 
 				if (classCtor.value?.type === 'FunctionExpression' && !classCtor.value.params.find((param: any) => param.type === 'TSParameterProperty' && param.decorators?.length > 0)) {
-					return;
+					return
 				}
 
 				context.report({

.eslintplugin/code-no-test-async-suite.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as eslint from 'eslint';
 
 function isCallExpression(node: TSESTree.Node): node is TSESTree.CallExpression {

.eslintplugin/code-no-unexternalized-strings.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/utils';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
 
 function isStringLiteral(node: TSESTree.Node | null | undefined): node is TSESTree.StringLiteral {
 	return !!node && node.type === AST_NODE_TYPES.Literal && typeof node.value === 'string';
@@ -24,8 +24,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 			badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.',
 			duplicateKey: 'Duplicate key \'{{key}}\' with different message value.',
 			badMessage: 'Message argument to \'{{message}}\' must be a string literal.'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/code-no-unused-expressions.ts

@@ -12,7 +12,7 @@
  */
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as ESTree from 'estree';
 
 //------------------------------------------------------------------------------
@@ -58,7 +58,7 @@ module.exports = {
 			allowTernary = config.allowTernary || false,
 			allowTaggedTemplates = config.allowTaggedTemplates || false;
 
-		 
+		// eslint-disable-next-line jsdoc/require-description
 		/**
 		 * @param node any node
 		 * @returns whether the given node structurally represents a directive
@@ -68,7 +68,7 @@ module.exports = {
 				node.expression.type === 'Literal' && typeof node.expression.value === 'string';
 		}
 
-		 
+		// eslint-disable-next-line jsdoc/require-description
 		/**
 		 * @param predicate ([a] -> Boolean) the function used to make the determination
 		 * @param list the input list
@@ -83,7 +83,7 @@ module.exports = {
 			return list.slice();
 		}
 
-		 
+		// eslint-disable-next-line jsdoc/require-description
 		/**
 		 * @param node a Program or BlockStatement node
 		 * @returns the leading sequence of directive nodes in the given node's body
@@ -92,7 +92,7 @@ module.exports = {
 			return takeWhile(looksLikeDirective, node.body);
 		}
 
-		 
+		// eslint-disable-next-line jsdoc/require-description
 		/**
 		 * @param node any node
 		 * @param ancestors the given node's ancestors
@@ -141,7 +141,7 @@ module.exports = {
 
 		return {
 			ExpressionStatement(node: TSESTree.ExpressionStatement) {
-				if (!isValidExpression(node.expression) && !isDirective(node, <TSESTree.Node[]>context.sourceCode.getAncestors(node))) {
+				if (!isValidExpression(node.expression) && !isDirective(node, <TSESTree.Node[]>context.getAncestors())) {
 					context.report({ node: <ESTree.Node>node, message: `Expected an assignment or function call and instead saw an expression. ${node.expression}` });
 				}
 			}

.eslintplugin/code-parameter-properties-must-have-explicit-accessibility.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 /**
  * Enforces that all parameter properties have an explicit access modifier (public, protected, private).

.eslintplugin/code-translation-remind.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 import { readFileSync } from 'fs';
 import { createImportRuleListener } from './utils';
 
@@ -16,8 +16,7 @@ export = new class TranslationRemind implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			missing: 'Please add \'{{resource}}\' to ./build/lib/i18n.resources.json file to use translations here.'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/index.js

@@ -0,0 +1,12 @@
+const glob = require('glob');
+const path = require('path');
+
+require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
+
+// Re-export all .ts files as rules
+const rules = {};
+glob.sync(`${__dirname}/*.ts`).forEach((file) => {
+	rules[path.basename(file, '.ts')] = require(file);
+});
+
+exports.rules = rules;

.eslintplugin/utils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export function createImportRuleListener(validateImport: (node: TSESTree.Literal, value: string) => any): eslint.Rule.RuleListener {
 

.eslintplugin/vscode-dts-cancellation.ts

@@ -4,15 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';
+import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			noToken: 'Function lacks a cancellation token, preferable as last argument',
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/vscode-dts-create-func.ts

@@ -4,14 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/utils';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
-		messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', },
-		schema: false,
+		messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/vscode-dts-event-naming.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/utils';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiEventNaming implements eslint.Rule.RuleModule {
 
@@ -19,8 +19,7 @@ export = new class ApiEventNaming implements eslint.Rule.RuleModule {
 			verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
 			subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
 			unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/vscode-dts-interface-naming.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
 
@@ -13,8 +13,7 @@ export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			naming: 'Interfaces must not be prefixed with uppercase `I`',
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/vscode-dts-literal-or-types.ts

@@ -4,14 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
-		messages: { useEnum: 'Use enums, not literal-or-types', },
-		schema: false,
+		messages: { useEnum: 'Use enums, not literal-or-types', }
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/vscode-dts-provider-naming.ts

@@ -4,15 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			naming: 'A provider should only have functions like provideXYZ or resolveXYZ',
-		},
-		schema: false,
+		}
 	};
 
 	private static _providerFunctionNames = /^(provide|resolve|prepare).+/;

.eslintplugin/vscode-dts-region-comments.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			comment: 'region comments should start with a camel case identifier, `:`, then either a GH issue link or owner, e.g #region myProposalName: https://github.com/microsoft/vscode/issues/<number>',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const sourceCode = context.getSourceCode();
+
+		return {
+			['Program']: (_node: any) => {
+				for (const comment of sourceCode.getAllComments()) {
+					if (comment.type !== 'Line') {
+						continue;
+					}
+					if (!/^\s*#region /.test(comment.value)) {
+						continue;
+					}
+					if (!/^\s*#region ([a-z]+): (@[a-z]+|https:\/\/github.com\/microsoft\/vscode\/issues\/\d+)/i.test(comment.value)) {
+						context.report({
+							node: <any>comment,
+							messageId: 'comment',
+						});
+					}
+				}
+			}
+		};
+	}
+};

.eslintplugin/vscode-dts-string-type-literals.ts

@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/utils';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines' },
 		messages: {
-			noTypeDiscrimination: 'Do not use type discrimination properties'
-		},
-		schema: false,
+			noTypeDiscrimination: 'Do not use type descrimination properties'
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['TSPropertySignature[optional=false] TSTypeAnnotation TSLiteralType Literal']: (node: any) => {
-				const raw = String((<TSESTree.Literal>node).raw);
+			['TSPropertySignature[optional=undefined] TSTypeAnnotation TSLiteralType Literal']: (node: any) => {
+
+				const raw = String((<TSESTree.Literal>node).raw)
 
 				if (/^('|").*\1$/.test(raw)) {
 
@@ -29,6 +29,6 @@ export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
 					});
 				}
 			}
-		};
+		}
 	}
 };

.eslintplugin/vscode-dts-use-thenable.ts

@@ -10,8 +10,7 @@ export = new class ApiEventNaming implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			usage: 'Use the Thenable-type instead of the Promise type',
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.eslintplugin/vscode-dts-vscode-in-comments.ts

@@ -11,8 +11,7 @@ export = new class ApiVsCodeInComments implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			comment: `Don't use the term 'vs code' in comments`
-		},
-		schema: false,
+		}
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/issue_template.md

@@ -1,9 +0,0 @@
----
-name: Issue
-about: Submit an Issue to Void
-title: For VSCode-related issues (eg builds), please start the title with `[App]`. Otherwise, start it with `[Bug]` or `[Feature]`.
----
-
-1. Press `Cmd+Shift+P` in Void, and type `Help: About`. Please paste the information here. Also let us know any other relevant details, like the model and provider you're using if applicable.
-
-2. Describe the issue/feature here!

.github/scripts/issue_triage.py

@@ -1,164 +0,0 @@
-#!/usr/bin/env python
-from __future__ import annotations
-import os, sys, json, datetime, pathlib, textwrap, requests
-from openai import OpenAI
-
-REPO = "voideditor/void"
-CACHE_FILE = pathlib.Path(".github/triage_cache.json")
-STAMP_FILE = pathlib.Path(".github/last_triage.txt")
-
-THEMES_MD = textwrap.dedent("""\
-1. 🔗 LLM Integration & Provider Support
-2. 🖥 App Build & Platform Compatibility
-3. 🎯 Prompt, Token, and Cost Management
-4. 🧩 Editor UX & Interaction Design
-5. 🤖 Agent & Automation Features
-6. ⚙️ System Config & Environment Setup
-7. 🗃 Meta: Feature Comparison, Structure, and Naming
-""").strip()
-
-client  = OpenAI(api_key=os.environ["OPENAI_API_KEY"])
-headers = {"Authorization": f"Bearer {os.environ['GITHUB_TOKEN']}"}
-
-
-# ───────── helpers ────────────────────────────────────────────────────────
-def utc_iso_now() -> str:
-    return datetime.datetime.utcnow().replace(microsecond=0, tzinfo=datetime.timezone.utc).isoformat()
-
-def read_stamp() -> str:
-    return STAMP_FILE.read_text().strip() if STAMP_FILE.exists() else "1970-01-01T00:00:00Z"
-
-def save_stamp():
-    STAMP_FILE.parent.mkdir(parents=True, exist_ok=True)
-    STAMP_FILE.write_text(utc_iso_now())
-
-def load_cache() -> dict[int, str]:
-    return json.loads(CACHE_FILE.read_text()) if CACHE_FILE.exists() else {}
-
-def save_cache(d: dict[int, str]):
-    CACHE_FILE.parent.mkdir(parents=True, exist_ok=True)
-    CACHE_FILE.write_text(json.dumps(d, indent=2))
-
-def fetch_open_issues(since_iso: str | None = None) -> list[dict]:
-    issues, page = [], 1
-    while True:
-        url = (
-            f"https://api.github.com/repos/{REPO}/issues"
-            f"?state=open&per_page=100&page={page}"
-            + (f"&since={since_iso}" if since_iso else "")
-        )
-        chunk = requests.get(url, headers=headers).json()
-        if not chunk or (isinstance(chunk, dict) and chunk.get("message")):
-            break
-        issues.extend(i for i in chunk if "pull_request" not in i)
-        page += 1
-    return issues
-
-
-# ───────── main ───────────────────────────────────────────────────────────
-last_stamp = read_stamp()
-changed    = fetch_open_issues(since_iso=last_stamp)
-
-# Fallback if **nothing** changed AND we have *no* existing output
-if not changed:
-    cache_exists = CACHE_FILE.exists()
-    wiki_exists  = pathlib.Path("wiki/Issue-Categories.md").exists()
-    if not cache_exists or not wiki_exists:
-        # first run or someone wiped the wiki → build from scratch
-        print("⏩ First run or empty wiki — fetching ALL open issues.", file=sys.stderr)
-        changed = fetch_open_issues()         # full list
-    else:
-        print(f"✅ No issues updated since {last_stamp}. Nothing to classify.", file=sys.stderr)
-        save_stamp()
-        sys.exit(0)
-
-# ---------------------------------------------------------------- prompt
-issue_lines = "\n".join(f"- {i['title']} ({i['html_url']})" for i in changed)
-prompt = textwrap.dedent(f"""\
-You are an AI assistant helping triage GitHub issues into exactly 7 predefined themes.
-
-Each issue must go into exactly one of the themes below:
-
-{THEMES_MD}
-
-Format your output in Markdown like:
-## 🎯 Prompt, Token, and Cost Management
-- [#123](https://github.com/org/repo/issues/123) – Title here
-
-Classify these issues:
-{issue_lines}
-""")
-
-resp = client.chat.completions.create(
-    model="gpt-4.1",
-    messages=[{"role": "user", "content": prompt}],
-    temperature=0.2,
-)
-
-md = resp.choices[0].message.content
-
-# ---------------------------------------------------------------- parse GPT
-new_map: dict[int, str] = {}
-current = None
-for ln in md.splitlines():
-    if ln.startswith("##"):
-        current = ln.lstrip("# ").strip()
-    elif ln.lstrip().startswith("- [#"):
-        try:
-            num = int(ln.split("[#")[1].split("]")[0])
-            new_map[num] = current
-        except Exception:
-            pass  # ignore malformed lines
-
-cache = load_cache()
-cache.update(new_map)
-save_cache(cache)
-save_stamp()
-
-# ---------------------------------------------------------------- rebuild wiki
-order = [
-    "🔗 LLM Integration & Provider Support",
-    "🖥 App Build & Platform Compatibility",
-    "🎯 Prompt, Token, and Cost Management",
-    "🧩 Editor UX & Interaction Design",
-    "🤖 Agent & Automation Features",
-    "⚙️ System Config & Environment Setup",
-    "🗃 Meta: Feature Comparison, Structure, and Naming",
-]
-
-sections: dict[str, list[int]] = {t: [] for t in order}
-
-# ── fetch ALL current open issues once  (PRs filtered out) ────────────────
-title_map: dict[int, tuple[str, str]] = {}
-open_now: set[int] = set()
-
-page = 1
-while True:
-    batch = fetch_open_issues(since_iso=None) if page == 1 else []
-    if not batch:
-        break
-    for it in batch:
-        num = it["number"]
-        title_map[num] = (it["title"], it["html_url"])
-        open_now.add(num)
-    page += 1
-
-# 🧹 drop any cached IDs that are no longer open issues (e.g., became a PR or were closed)
-for stale in set(cache) - open_now:
-    del cache[stale]
-save_cache(cache)            # persist cleaned cache
-
-# build sections from cleaned cache
-for num, theme in cache.items():
-    if theme in sections:          # extra safety
-        sections[theme].append(num)
-
-# ---------------------------------------------------------------- print roadmap
-for theme in order:
-    issues = sections[theme]
-    if issues:
-        print(f"## {theme}")
-        for n in sorted(issues):
-            title, url = title_map.get(n, ("(missing)", f"https://github.com/{REPO}/issues/{n}"))
-            print(f"- [#{n}]({url}) – {title}")
-        print()

.github/workflows/triage.yml

@@ -1,60 +0,0 @@
-name: Issue Triage to Wiki
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 */6 * * *'    # every 6 hrs (UTC)
-
-jobs:
-  roadmap:
-    runs-on: ubuntu-latest
-
-    steps:
-      # 1️⃣ Check out code (so the script and cache files are present)
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 1    # shallow clone
-
-      # 2️⃣ Set up Python
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-
-      # 3️⃣ Install dependencies
-      - name: Install Python dependencies
-        run: |
-          pip install openai requests
-
-      # 4️⃣ Clone your fork’s Wiki
-      - name: Clone your fork's Wiki
-        run: |
-          git clone https://x-access-token:${{ secrets.WIKI_TOKEN }}@github.com/${{ github.repository }}.wiki.git wiki
-
-      # 5️⃣ (Optional) Show repo tree for debugging
-      - name: Show repo tree (debug)
-        run: |
-          echo "PWD: $(pwd)"
-          ls -al
-          ls -al .github/scripts || true
-          ls -al void/.github/scripts || true
-
-      # 6️⃣ Generate roadmap and push only if it changed
-      - name: Generate roadmap directly into wiki
-        run: |
-          python .github/scripts/issue_triage.py > wiki/_new.md
-          if ! cmp -s wiki/_new.md wiki/Issue-Categories.md ; then
-            mv wiki/_new.md wiki/Issue-Categories.md
-            cd wiki
-            git config user.name "github-actions[bot]"
-            git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git add Issue-Categories.md
-            git commit -m "Auto-update Issue-Categories.md from GPT triage"
-            git push
-          else
-            echo "No content change – skipping wiki update"
-          fi
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          GITHUB_TOKEN:   ${{ secrets.WIKI_TOKEN }}

.gitignore

@@ -21,10 +21,4 @@ vscode.db
 product.overrides.json
 *.snap.actual
 .vscode-test
-
-# Void added these:
 .tmp/
-.tmp2/
-.tool-versions
-src/vs/workbench/contrib/void/browser/react/out/**
-src/vs/workbench/contrib/void/browser/react/src2/**

.idx/dev.nix

@@ -1,48 +1,48 @@
-# Created for Void
-# To learn more about how to use Nix to configure your environment
-# see: https://developers.google.com/idx/guides/customize-idx-env
-{pkgs}: {
-  # Which nixpkgs channel to use.
-  channel = "stable-23.11"; # or "unstable"
-  # Use https://search.nixos.org/packages to find packages
-  packages = [
-    pkgs.nodejs_20
-    pkgs.yarn
-    pkgs.nodePackages.pnpm
-    pkgs.bun
-    pkgs.gh
-  ];
-  # Sets environment variables in the workspace
-  env = {};
-  idx = {
-    # Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
-    extensions = [
-      # "vscodevim.vim"
-    ];
-    workspace = {
-      # Runs when a workspace is first created with this `dev.nix` file
-      onCreate = {
-        npm-install = "npm ci --no-audit --prefer-offline --no-progress --timing";
-        # Open editors for the following files by default, if they exist:
-        default.openFiles = [
-          # Cover all the variations of language, src-dir, router (app/pages)
-          "pages/index.tsx" "pages/index.jsx"
-          "src/pages/index.tsx" "src/pages/index.jsx"
-          "app/page.tsx" "app/page.jsx"
-          "src/app/page.tsx" "src/app/page.jsx"
-        ];
-      };
-      # To run something each time the workspace is (re)started, use the `onStart` hook
-    };
-    # Enable previews and customize configuration
-    previews = {
-      enable = true;
-      previews = {
-        web = {
-          command = ["npm" "run" "dev" "--" "--port" "$PORT" "--hostname" "0.0.0.0"];
-          manager = "web";
-        };
-      };
-    };
-  };
-}
+# Created for Void
+# To learn more about how to use Nix to configure your environment
+# see: https://developers.google.com/idx/guides/customize-idx-env
+{pkgs}: {
+  # Which nixpkgs channel to use.
+  channel = "stable-23.11"; # or "unstable"
+  # Use https://search.nixos.org/packages to find packages
+  packages = [
+    pkgs.nodejs_20
+    pkgs.yarn
+    pkgs.nodePackages.pnpm
+    pkgs.bun
+    pkgs.gh
+  ];
+  # Sets environment variables in the workspace
+  env = {};
+  idx = {
+    # Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
+    extensions = [
+      # "vscodevim.vim"
+    ];
+    workspace = {
+      # Runs when a workspace is first created with this `dev.nix` file
+      onCreate = {
+        npm-install = "npm ci --no-audit --prefer-offline --no-progress --timing";
+        # Open editors for the following files by default, if they exist:
+        default.openFiles = [
+          # Cover all the variations of language, src-dir, router (app/pages)
+          "pages/index.tsx" "pages/index.jsx"
+          "src/pages/index.tsx" "src/pages/index.jsx"
+          "app/page.tsx" "app/page.jsx"
+          "src/app/page.tsx" "src/app/page.jsx"
+        ];
+      };
+      # To run something each time the workspace is (re)started, use the `onStart` hook
+    };
+    # Enable previews and customize configuration
+    previews = {
+      enable = true;
+      previews = {
+        web = {
+          command = ["npm" "run" "dev" "--" "--port" "$PORT" "--hostname" "0.0.0.0"];
+          manager = "web";
+        };
+      };
+    };
+  };
+}

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="34.3.2"
-ms_build_id="11161073"
+target="30.5.1"
+ms_build_id="10262041"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

.nvmrc

@@ -1 +1 @@
-20.18.2
+20.16.0

.voidrules

@@ -1,16 +0,0 @@
-This is a fork of the VSCode repo called Void.
-
-Most code we care about lives in src/vs/workbench/contrib/void.
-
-You may often need to explore the full repo to find relevant parts of code.
-Look for services and built-in functions that you might need to use to solve the problem.
-
-In typescript, do NOT cast to types if not neccessary. NEVER lazily cast to 'any'. Find the correct type to apply and use it.
-
-Do not add or remove semicolons to any of my files. Just go with convention and make the least number of changes.
-
-Never modify files outside src/vs/workbench/contrib/void without consulting with the user first.
-
-All types that map from a value A to B should be called bOfA. For example, if you create a hashmap that goes from toolId to toolName, it should be called toolNameOfToolId, etc.
-
-Do not run anything to validate your changes; tell the user what to do instead.

.vscode-test.js

@@ -5,21 +5,15 @@
 
 //@ts-check
 
-import { createRequire } from 'node:module';
-import { fileURLToPath } from 'url';
-import * as path from 'path';
-import * as os from 'os';
-
-const require = createRequire(import.meta.url);
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
+const path = require('path');
 const { defineConfig } = require('@vscode/test-cli');
+const os = require('os');
 
 /**
  * A list of extension folders who have opted into tests, or configuration objects.
  * Edit me to add more!
  *
- * @type {Array<Partial<import("@vscode/test-cli").TestConfiguration> & { label: string }>}
+ * @type {Array<string | (Partial<import("@vscode/test-cli").TestConfiguration> & { label: string })>}
  */
 const extensions = [
 	{
@@ -42,16 +36,6 @@ const extensions = [
 		workspaceFolder: `extensions/vscode-colorize-tests/test`,
 		mocha: { timeout: 60_000 }
 	},
-	{
-		label: 'terminal-suggest',
-		workspaceFolder: path.join(os.tmpdir(), `terminal-suggest-${Math.floor(Math.random() * 100000)}`),
-		mocha: { timeout: 60_000 }
-	},
-	{
-		label: 'vscode-colorize-perf-tests',
-		workspaceFolder: `extensions/vscode-colorize-perf-tests/test`,
-		mocha: { timeout: 6000_000 }
-	},
 	{
 		label: 'configuration-editing',
 		workspaceFolder: path.join(os.tmpdir(), `confeditout-${Math.floor(Math.random() * 100000)}`),
@@ -65,20 +49,6 @@ const extensions = [
 	{
 		label: 'microsoft-authentication',
 		mocha: { timeout: 60_000 }
-	},
-	{
-		label: 'vscode-api-tests-folder',
-		extensionDevelopmentPath: `extensions/vscode-api-tests`,
-		workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
-		mocha: { timeout: 60_000 },
-		files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
-	},
-	{
-		label: 'vscode-api-tests-workspace',
-		extensionDevelopmentPath: `extensions/vscode-api-tests`,
-		workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
-		mocha: { timeout: 60_000 },
-		files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
 	}
 ];
 
@@ -87,14 +57,11 @@ const defaultLaunchArgs = process.env.API_TESTS_EXTRA_ARGS?.split(' ') || [
 	'--disable-telemetry', '--skip-welcome', '--skip-release-notes', `--crash-reporter-directory=${__dirname}/.build/crashes`, `--logsPath=${__dirname}/.build/logs/integration-tests`, '--no-cached-data', '--disable-updates', '--use-inmemory-secretstorage', '--disable-extensions', '--disable-workspace-trust'
 ];
 
-const config = defineConfig(extensions.map(extension => {
+module.exports = defineConfig(extensions.map(extension => {
 	/** @type {import('@vscode/test-cli').TestConfiguration} */
-	const config = {
-		platform: 'desktop',
-		files: `extensions/${extension.label}/out/**/*.test.js`,
-		extensionDevelopmentPath: `extensions/${extension.label}`,
-		...extension,
-	};
+	const config = typeof extension === 'object'
+		? { files: `extensions/${extension.label}/out/**/*.test.js`, ...extension }
+		: { files: `extensions/${extension}/out/**/*.test.js`, label: extension };
 
 	config.mocha ??= {};
 	if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
@@ -132,5 +99,3 @@ const config = defineConfig(extensions.map(extension => {
 
 	return config;
 }));
-
-export default config;

.vscode/extensions/vscode-selfhost-test-provider/package.json

@@ -4,7 +4,8 @@
   "description": "Test provider for the VS Code project",
   "enabledApiProposals": [
     "testObserver",
-    "testRelatedCode"
+    "testRelatedCode",
+    "attributableCoverage"
   ],
   "engines": {
     "vscode": "^1.88.0"

.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts

@@ -142,7 +142,7 @@ class ScriptCoverageTracker {
 	}
 }
 
-export class V8CoverageFile extends vscode.FileCoverage {
+export class V8CoverageFile extends vscode.FileCoverage2 {
 	public details: vscode.StatementCoverage[] = [];
 
 	constructor(

.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts

@@ -86,11 +86,10 @@ export async function activate(context: vscode.ExtensionContext) {
 			}, uri => ctrl.items.get(uri.toString().toLowerCase()));
 		ctrl.relatedCodeProvider = graph;
 
-		if (context.storageUri) {
-			context.subscriptions.push(new FailureTracker(context.storageUri.fsPath, folder.uri.fsPath));
-		}
-
-		context.subscriptions.push(fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)));
+		context.subscriptions.push(
+			new FailureTracker(context, folder.uri.fsPath),
+			fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)),
+		);
 	});
 
 	const createRunHandler = (

.vscode/extensions/vscode-selfhost-test-provider/src/failureTracker.ts

@@ -33,8 +33,8 @@ export class FailureTracker {
 	private readonly logFile: string;
 	private logs?: ITrackedRemediation[];
 
-	constructor(storageLocation: string, private readonly rootDir: string) {
-		this.logFile = join(storageLocation, '.build/vscode-test-failures.json');
+	constructor(context: vscode.ExtensionContext, private readonly rootDir: string) {
+		this.logFile = join(context.globalStorageUri.fsPath, '.build/vscode-test-failures.json');
 		mkdirSync(dirname(this.logFile), { recursive: true });
 
 		const oldLogFile = join(rootDir, '.build/vscode-test-failures.json');

.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json

@@ -11,6 +11,7 @@
 		"src/**/*",
 		"../../../src/vscode-dts/vscode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts"
+		"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts",
+		"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts"
 	]
 }

.vscode/launch.json

@@ -202,24 +202,6 @@
 				"order": 5
 			}
 		},
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "VS Code Tokenizer Performance Tests",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"${workspaceFolder}/extensions/vscode-colorize-perf-tests/test",
-				"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-colorize-perf-tests",
-				"--extensionTestsPath=${workspaceFolder}/extensions/vscode-colorize-perf-tests/out"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "5_tests",
-				"order": 6
-			}
-		},
 		{
 			"type": "chrome",
 			"request": "attach",
@@ -251,51 +233,7 @@
 			"timeout": 0,
 			"env": {
 				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
-				"VSCODE_SKIP_PRELAUNCH": "1",
-			},
-			"cleanUp": "wholeBrowser",
-			"runtimeArgs": [
-				"--inspect-brk=5875",
-				"--no-cached-data",
-				"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
-				// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
-				"--disable-features=CalculateNativeWinOcclusion",
-				"--disable-extension=vscode.vscode-api-tests"
-			],
-			"userDataDir": "${userHome}/.vscode-oss-dev",
-			"webRoot": "${workspaceFolder}",
-			"cascadeTerminateToConfigurations": [
-				"Attach to Extension Host"
-			],
-			"pauseForSourceMap": false,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"browserLaunchLocation": "workspace",
-			"presentation": {
-				"hidden": true,
-			},
-		},
-		{
-			// To debug observables you also need the extension "ms-vscode.debug-value-editor"
-			"type": "chrome",
-			"request": "launch",
-			"name": "Launch VS Code Internal (Dev Debug)",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
-			},
-			"osx": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
-			},
-			"port": 9222,
-			"timeout": 0,
-			"env": {
-				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
-				"VSCODE_SKIP_PRELAUNCH": "1",
-				"VSCODE_DEV_DEBUG": "1",
+				"VSCODE_SKIP_PRELAUNCH": "1"
 			},
 			"cleanUp": "wholeBrowser",
 			"runtimeArgs": [
@@ -319,6 +257,10 @@
 			"presentation": {
 				"hidden": true,
 			},
+			// This is read by the vscode-diagnostic-tools extension
+			"vscode-diagnostic-tools.debuggerScripts": [
+				"${workspaceFolder}/scripts/hot-reload-injected-script.js"
+			]
 		},
 		{
 			"type": "node",
@@ -612,21 +554,6 @@
 				"order": 1
 			}
 		},
-		{
-			"name": "VS Code (Debug Observables)",
-			"stopAll": true,
-			"configurations": [
-				"Launch VS Code Internal (Dev Debug)",
-				"Attach to Main Process",
-				"Attach to Extension Host",
-				"Attach to Shared Process",
-			],
-			"preLaunchTask": "Ensure Prelaunch Dependencies",
-			"presentation": {
-				"group": "0_vscode",
-				"order": 1
-			}
-		},
 		{
 			"name": "Search, Renderer, and Main processes",
 			"configurations": [

.vscode/notebooks/api.github-issues

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

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n$MILESTONE=milestone:\"March 2025\""
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"September 2024\""
   },
   {
     "kind": 1,
@@ -97,7 +97,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified -label:on-testplan"
+    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified"
   },
   {
     "kind": 1,
@@ -112,7 +112,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:z-author-verified -label:unreleased -label:*not-reproducible -label:*out-of-scope"
+    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:z-author-verified -label:unreleased -label:*not-reproducible"
   },
   {
     "kind": 1,

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

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"March 2025\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"September 2024\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
@@ -62,7 +62,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified -label:on-testplan"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified"
   },
   {
     "kind": 1,
@@ -87,7 +87,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased -label:on-testplan"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased"
   },
   {
     "kind": 1,
@@ -157,7 +157,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -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:joyceerhl -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:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:daviddossett -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:legomushroom"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -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:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:daviddossett -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer"
   },
   {
     "kind": 1,
@@ -187,6 +187,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\r\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\r\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
   }
 ]

.vscode/settings.json

@@ -8,7 +8,6 @@
 		"**/.DS_Store": true,
 		".vscode-test": true,
 		"cli/target": true,
-		"build/**/*.js.map": true,
 		"build/**/*.js": {
 			"when": "$(basename).ts"
 		}
@@ -42,6 +41,8 @@
 		"**/yarn.lock": true,
 		"**/package-lock.json": true,
 		"**/Cargo.lock": true,
+		"src/vs/workbench/workbench.web.main.css": true,
+		"src/vs/workbench/workbench.desktop.main.css": true,
 		"build/**/*.js": true,
 		"out/**": true,
 		"out-build/**": true,
@@ -49,10 +50,10 @@
 		"out-vscode-reh/**": true,
 		"extensions/**/dist/**": true,
 		"extensions/**/out/**": true,
-		"extensions/terminal-suggest/src/completions/upstream/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
-		"test/integration/browser/out/**": true
+		"test/integration/browser/out/**": true,
+		"src2/**": true,
 	},
 	"files.readonlyExclude": {
 		"build/builtin/*.js": true,
@@ -93,12 +94,13 @@
 		}
 	],
 	"git.ignoreLimitWarning": true,
-	"git.branchProtection": [
-		"main",
-		"distro",
-		"release/*"
-	],
-	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
+	// Removing this for Void:
+	// "git.branchProtection": [
+	// 	"main",
+	// 	"distro",
+	// 	"release/*"
+	// ],
+	// "git.branchProtectionPrompt": "alwaysCommitToNewBranch",
 	"git.branchRandomName.enable": true,
 	"git.pullBeforeCheckout": true,
 	"git.mergeEditor": true,
@@ -157,7 +159,6 @@
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
 	"editor.experimental.asyncTokenizationVerification": true,
-	"terminal.integrated.suggest.enabled": true,
 	"typescript.preferences.autoImportFileExcludePatterns": [
 		"@xterm/xterm",
 		"@xterm/headless",
@@ -170,13 +171,5 @@
 	},
 	"css.format.spaceAroundSelectorSeparator": true,
 	"typescript.enablePromptUseWorkspaceTsdk": true,
-	"eslint.useFlatConfig": true,
-	"editor.occurrencesHighlightDelay": 0,
-	"typescript.experimental.expandableHover": true,
-	"git.diagnosticsCommitHook.Enabled": true,
-	"git.diagnosticsCommitHook.Sources": {
-		"*": "error",
-		"ts": "warning",
-		"eslint": "warning"
-	}
+	"inlineChat.experimental.onlyZoneWidget": true
 }

.vscode/shared.code-snippets

@@ -36,5 +36,23 @@
 			"private readonly _onDid$1 = new Emitter<$2>();",
 			"readonly onDid$1: Event<$2> = this._onDid$1.event;"
 		],
+	},
+	"esm-comment": {
+		"scope": "typescript,javascript",
+		"prefix": "esm-comment",
+		"body": [
+			"// ESM-comment-begin",
+			"$SELECTION$0",
+			"// ESM-comment-end",
+		]
+	},
+	"esm-uncomment": {
+		"scope": "typescript,javascript",
+		"prefix": "esm-uncomment",
+		"body": [
+			"// ESM-uncomment-begin",
+			"// $SELECTION$0",
+			"// ESM-uncomment-end",
+		]
 	}
 }

.vscode/tasks.json

@@ -29,34 +29,6 @@
 				}
 			}
 		},
-		{   // Void added this
-			"type": "npm",
-			"script": "watchreactd",
-			"label": "React - Build",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never",
-				"group": "buildWatchers",
-				"close": false
-			},
-			"problemMatcher": {
-				"owner": "typescript",
-				"applyTo": "closedDocuments",
-				"fileLocation": [
-					"absolute"
-				],
-				"pattern": {
-					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
-					"file": 1,
-					"location": 2,
-					"message": 3
-				},
-				"background": {
-					"beginsPattern": "Starting compilation",
-					"endsPattern": "Finished compilation"
-				}
-			}
-		},
 		{
 			"type": "npm",
 			"script": "watch-extensionsd",
@@ -89,7 +61,6 @@
 			"label": "VS Code - Build",
 			"dependsOn": [
 				"Core - Build",
-				"React - Build",
 				"Ext - Build"
 			],
 			"group": {

.yarnrc

@@ -587,31 +587,5 @@
 			"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR",
 			"IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."
 		]
-	},
-	{
-		"name": "@azure/msal-node-runtime",
-		"fullLicenseText": [
-			"MIT License",
-			"",
-			"Copyright (c) Microsoft Corporation. All rights reserved.",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining a copy",
-			"of this software and associated documentation files (the \"Software\"), to deal",
-			"in the Software without restriction, including without limitation the rights",
-			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-			"copies of the Software, and to permit persons to whom the Software is",
-			"furnished to do so, subject to the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be included in all",
-			"copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
-			"SOFTWARE"
-		]
 	}
 ]

CONTRIBUTING.md

@@ -1,33 +1,25 @@
 # Contributing to Void
-### Welcome! 👋
-This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
+
+Welcome! 👋 This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
+
+
 
 There are a few ways to contribute:
 
-- 💫 Complete items on the [Roadmap](https://github.com/orgs/voideditor/projects/2).
+- 👨‍💻 Build new features - see [Issues](https://github.com/voideditor/void/issues).
 - 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs).
-- 🪴 Start new Issues - see [Issues](https://github.com/voideditor/void/issues).
-
-
-
-### Codebase Guide
-
-We [highly recommend reading this](https://github.com/voideditor/void/blob/main/VOID_CODEBASE_GUIDE.md) guide that we put together on Void's sourcecode if you'd like to add new features.
-
-The repo is not as intimidating as it first seems if you read the guide!
-
-Most of Void's code lives in the folder `src/vs/workbench/contrib/void/`.
-
+- ⭐️ If you want to build your AI tool into Void, feel free to get in touch! It's very easy to extend Void, and the UX you create will be much more natural than a VSCode Extension.
 
+Void's code mostly lives in `src/vs/workbench/contrib/void/` and `src/vs/platform/void/`.
 
 
 ## Building Void
 
-### a. Mac - Build Prerequisites
+### a. Build Prerequisites - Mac
 
 If you're using a Mac, you need Python and XCode. You probably have these by default.
 
-### b. Windows - Build Prerequisites
+### b. Build Prerequisites - Windows
 
 If you're using a Windows computer, first get [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) (recommended) or [VS Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) (not recommended). If you already have both, you might need to run the next few steps on both of them.
 
@@ -42,38 +34,34 @@ Go to the "Individual Components" tab and select:
 
 Finally, click Install.
 
-### c. Linux - Build Prerequisites
+### c. Build Prerequisites - Linux
 
 First, run `npm install -g node-gyp`. Then:
 
 - Debian (Ubuntu, etc): `sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3`.
 - Red Hat (Fedora, etc): `sudo dnf install @development-tools gcc gcc-c++ make libsecret-devel krb5-devel libX11-devel libxkbfile-devel`.
-- SUSE (openSUSE, etc): `sudo zypper install patterns-devel-C-C++-devel_C_C++  krb5-devel libsecret-devel libxkbfile-devel libX11-devel`.
 - Others: see [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
 
-### d. Building Void from inside VSCode
+### d. Building Void
 
-1. `git clone https://github.com/voideditor/void` to clone the repo.
-2. `npm install` to install all dependencies.
-3. To build Void, open VSCode. Then:
-   - Windows: Press <kbd>Ctrl+Shift+B</kbd>.
-   - Mac: Press <kbd>Cmd+Shift+B</kbd>.
-   - Linux: Press <kbd>Ctrl+Shift+B</kbd>.
-   - This step can take ~5 min. The build is done when you see two check marks (one of the items will continue spinning indefinitely - it compiles our React code).
-4. To run Void:
-   - Windows: `./scripts/code.bat`.
-   - Mac: `./scripts/code.sh`.
-   - Linux: `./scripts/code.sh`.
-5. Nice-to-knows.
+To build Void, open `void/` inside VSCode. Then open your terminal and run:
+
+1. `npm install` to install all dependencies.
+2. `npm run watchreact` to build Void's browser dependencies like React. (If this doesn't work, try `npm run buildreact`).
+3. Build Void.
+	 - Press <kbd>Cmd+Shift+B</kbd> (Mac).
+   - Press <kbd>Ctrl+Shift+B</kbd> (Windows/Linux).
+   - This step can take ~5 min. The build is done when you see two check marks.
+4. Run Void.
+   - Run `./scripts/code.sh` (Mac/Linux).
+   - Run `./scripts/code.bat` (Windows).
+6. Nice-to-knows.
    - You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>) inside the new window to reload and see your new changes. It's faster than <kbd>Ctrl+Shift+P</kbd> and `Reload Window`.
    - You might want to add the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command, which lets you delete the `.tmp` folder to reset any IDE changes you made when testing.
-	- You can kill any of the build scripts by pressing `Ctrl+D` in VSCode terminal. If you press `Ctrl+C` the script will close but will keep running in the background (to open all background scripts, just re-build).
-
-If you get any errors, scroll down for common fixes.
 
 #### Building Void from Terminal
 
-To build Void from the terminal instead of from inside VSCode, follow the steps above, but instead of pressing <kbd>Cmd+Shift+B</kbd>, run `npm run watch`. The build is done when you see something like this:
+Alternatively, if you want to build Void from the terminal, instead of pressing <kbd>Cmd+Shift+B</kbd> you can run `npm run watch`. The build is done when you see something like this:
 
 ```
 [watch-extensions] [00:37:39] Finished compilation extensions with 0 errors after 19303 ms
@@ -83,19 +71,15 @@ To build Void from the terminal instead of from inside VSCode, follow the steps
 ```
 
 
+
 #### Common Fixes
 
-- Make sure you followed the prerequisite steps above.
-- Make sure you have Node version `20.18.2` (the version in `.nvmrc`)!
-    - You can do this easily without touching your base installation with [nvm](https://github.com/nvm-sh/nvm). Simply run `nvm install`, followed by `nvm use` and it will automatically install and use the version specified in `nvmrc`.
-- Make sure that the path to your Void folder does not have any spaces in it.
+- Make sure you followed the prerequisite steps.
+- Make sure you have the same NodeJS version as `.nvmrc`.
 - If you get `"TypeError: Failed to fetch dynamically imported module"`, make sure all imports end with `.js`.
-- If you get an error with React, try running `NODE_OPTIONS="--max-old-space-size=8192" npm run buildreact`.
 - If you see missing styles, wait a few seconds and then reload.
-- If you get errors like `npm error libtool:   error: unrecognised option: '-static'`,  when running ./scripts/code.sh, make sure you have GNU libtool instead of BSD libtool (BSD is the default in macos)
-- If you get erorrs like `The SUID sandbox helper binary was found, but is not configured correctly` when running ./scripts/code.sh, run
-`sudo chown root:root .build/electron/chrome-sandbox && sudo chmod 4755 .build/electron/chrome-sandbox` and then run `./scripts/code.sh` again.
-- If you have any other questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
+- If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
+
 
 
 ## Packaging
@@ -109,11 +93,12 @@ We don't usually recommend packaging. Instead, you should probably just build. I
 
 ### Windows
 - `npm run gulp vscode-win32-x64` - most common
-- `npm run gulp vscode-win32-arm64`
+- `npm run gulp vscode-win32-ia32`
 
 ### Linux
 - `npm run gulp vscode-linux-x64` - most common
-- `npm run gulp vscode-linux-arm64`
+- `npm run gulp vscode-linux-arm`
+- `npm run gulp vscode-linux-ia32`
 
 
 ### Output
@@ -126,19 +111,16 @@ workspace/
 ```
 
 ### Distributing
-Void's maintainers distribute Void on our website and in releases. Our build pipeline is a fork of VSCodium, and it works by running GitHub Actions which create the downloadables. The build repo with more instructions lives [here](https://github.com/voideditor/void-builder).
+We have a few scripts to convert `Mac .app -> .dmg`, `Windows folder -> .exe`, and `Linux folder -> appimage` for distribution. Let us know if you'd like access to them. 
 
 ## Pull Request Guidelines
 
 
 - Please submit a pull request once you've made a change.
-- No need to submit an Issue unless you're creating a new feature that might involve multiple PRs.
+- No need to submit an Issue unless you're creating a new feature.
 - Please don't use AI to write your PR 🙂
 
 
-
-
-
 <!--
 # Relevant files
 
@@ -167,3 +149,7 @@ Edit: far too many changes to track... this is old
 - vscode.proposed.editorInsets.d.ts - not modified, but code copied
 
 -->
+
+## References
+
+For some useful links we've compiled on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).

README.md

@@ -9,29 +9,31 @@
 	/>
 </div>
 
-Void is the open-source Cursor alternative.
-
-Use AI agents on your codebase, checkpoint and visualize changes, and bring any model or host locally. Void sends messages directly to providers without retaining your data.
-
-This repo contains the full sourcecode for Void. If you're new, welcome!
-
-- 🧭 [Website](https://voideditor.com)
+Void is the open-source Cursor alternative. This repo contains the full sourcecode for Void. We are currently in [open beta](https://voideditor.com/) for downloading the official release. If you're new, welcome!
 
 - 👋 [Discord](https://discord.gg/RSNjgaugJs)
 
-- 🚙 [Project Board](https://github.com/orgs/voideditor/projects/2)
+- 🚙 [Roadmap](https://github.com/orgs/voideditor/projects/2)
 
+- 📝 [Changelog](https://voideditor.com/changelog)
+
+- 🔨 [Contribute](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md)
+
+
+<!-- ❤️ Setup: -->
 
 ## Contributing
 
-1. To get started working on Void, check out our Project Board! You can also see [HOW_TO_CONTRIBUTE](https://github.com/voideditor/void/blob/main/HOW_TO_CONTRIBUTE.md).
 
-2. Feel free to attend a casual weekly meeting in our Discord channel!
+1. To contribute to the Void repository, follow the steps in [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
+  
+2. To suggest a new feature, please create a new [GitHub Issue](https://github.com/voideditor/void/issues). Suggestions will be added to our Roadmap within one day.
 
+3. We're open to collaborations of all types. Feel free to contact us via email or discord.
 
 ## Reference
 
-Void is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For a guide to the codebase, see [VOID_CODEBASE_GUIDE](https://github.com/voideditor/void/blob/main/VOID_CODEBASE_GUIDE.md).
+Void is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For some useful links on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).
 
 ## Support
-You can always reach us in our Discord server or contact us via email: hello@voideditor.com.
+Feel free to reach out in our discord or contact us via email.

ThirdPartyNotices.txt

@@ -4,34 +4,6 @@ This repository incorporates material as listed below or described in the code.
 
 
 
----------------------------------------------------------
-
-@fig/autocomplete-shared 1.1.2
-https://github.com/withfig/autocomplete-tools
-
-MIT License
-
-Copyright (c) 2021 Hercules Labs Inc. (Fig)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
----------------------------------------------------------
-
 ---------------------------------------------------------
 
 @iktakahiro/markdown-it-katex 4.0.2 - MIT
@@ -86,34 +58,6 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-amazon-q-developer-cli f66e0b0e917ab185eef528dc36eca56b78ca8b5d
-https://github.com/aws/amazon-q-developer-cli
-
-MIT License
-
-Copyright (c) 2024 Amazon.com, Inc. or its affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
----------------------------------------------------------
-
----------------------------------------------------------
-
 atom/language-clojure 0.22.8 - MIT
 https://github.com/atom/language-clojure
 
@@ -225,7 +169,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-atom/language-sass 0.61.4 - MIT
+atom/language-sass 0.62.1 - MIT
 https://github.com/atom/language-sass
 
 The MIT License (MIT)
@@ -319,34 +263,6 @@ suitability for any purpose.
 
 ---------------------------------------------------------
 
-autocomplete 2.684.0 - MIT
-https://github.com/withfig/autocomplete
-
-MIT License
-
-Copyright (c) 2021 Hercules Labs Inc. (Fig)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
----------------------------------------------------------
-
----------------------------------------------------------
-
 cacheable-request 7.0.4 - MIT
 
 
@@ -524,11 +440,11 @@ Title to copyright in this work will at all times remain with copyright holders.
 
 ---------------------------------------------------------
 
-dompurify 3.1.7 - Apache 2.0
+dompurify 3.0.5 - Apache 2.0
 https://github.com/cure53/DOMPurify
 
 DOMPurify
-Copyright 2025 Dr.-Ing. Mario Heiderich, Cure53
+Copyright 2024 Dr.-Ing. Mario Heiderich, Cure53
 
 DOMPurify is free software; you can redistribute it and/or modify it under the
 terms of either:
@@ -1203,34 +1119,7 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-fish-shell 3.7.1
-https://github.com/fish-shell/fish-shell
-
-Fish is a smart and user-friendly command line shell.
-
-Copyright (C) 2005-2009 Axel Liljencrantz
-Copyright (C) 2009- fish-shell contributors
-
-fish is free software.
-
-Most of fish is licensed under the GNU General Public License version 2, and
-you can redistribute it and/or modify it under the terms of the GNU GPL as
-published by the Free Software Foundation.
-
-fish also includes software licensed under the Python Software Foundation License version 2, the MIT
-license, and the GNU Library General Public License version 2.
-
-Full licensing information is contained in doc_src/license.rst.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
----------------------------------------------------------
-
----------------------------------------------------------
-
-go-syntax 0.7.9 - MIT
+go-syntax 0.7.6 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -1278,7 +1167,7 @@ without specific, written prior permission. Title to copyright in this document
 
 ---------------------------------------------------------
 
-Ionic documentation 1.2.4 - Apache-2.0
+Ionic documentation 1.2.4 - Apache2
 https://github.com/ionic-team/ionic-site
 
 Copyright Drifty Co. http://drifty.com/.
@@ -1662,7 +1551,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SO
 
 ---------------------------------------------------------
 
-language-docker 0.0.0 - Apache-2.0
+language-docker 0.0.0 - Apache2
 https://github.com/moby/moby
 
 Apache License
@@ -2128,7 +2017,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-microsoft/vscode-mssql 1.29.0 - MIT
+microsoft/vscode-mssql 1.23.0 - MIT
 https://github.com/microsoft/vscode-mssql
 
 ------------------------------------------ START OF LICENSE -----------------------------------------
@@ -2219,7 +2108,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-RedCMD/YAML-Syntax-Highlighter 1.3.2 - MIT
+RedCMD/YAML-Syntax-Highlighter 1.1.2 - MIT
 https://github.com/RedCMD/YAML-Syntax-Highlighter
 
 MIT License
@@ -2275,7 +2164,7 @@ suitability for any purpose.
 
 ---------------------------------------------------------
 
-REditorSupport/vscode-R 2.8.4 - MIT
+REditorSupport/vscode-R 2.8.1 - MIT
 https://github.com/REditorSupport/vscode-R
 
 MIT License
@@ -2408,55 +2297,6 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Shopify/ruby-lsp 0.0.0 - MIT License
-https://github.com/Shopify/ruby-lsp
-
-The MIT License (MIT)
-
-Copyright (c) 2022-present, Shopify Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-================================================================================
-The following files and related configuration in package.json are based on a
-sequence of adaptions: grammars/ruby.cson.json, grammars/erb.cson.json,
-languages/erb.json.
-
-Copyright (c) 2016 Peng Lv
-Copyright (c) 2017-2019 Stafford Brunk
-https://github.com/rubyide/vscode-ruby
-
-    Released under the MIT license
-    https://github.com/rubyide/vscode-ruby/blob/main/LICENSE.txt
-
-Copyright (c) 2014 GitHub Inc.
-https://github.com/atom/language-ruby
-
-    Released under the MIT license
-    https://github.com/atom/language-ruby/blob/master/LICENSE.md
-
-https://github.com/textmate/ruby.tmbundle
-    https://github.com/textmate/ruby.tmbundle#license
----------------------------------------------------------
-
----------------------------------------------------------
-
 sumneko/lua.tmbundle 1.0.0 - TextMate Bundle License
 https://github.com/sumneko/lua.tmbundle
 
@@ -2686,6 +2526,26 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
+textmate/ruby.tmbundle 0.0.0 - TextMate Bundle License
+https://github.com/textmate/ruby.tmbundle
+
+Copyright (c) textmate-ruby.tmbundle project authors
+
+If not otherwise specified (see below), files in this folder fall under the following license:
+
+Permission to copy, use, modify, sell and distribute this
+software is granted. This software is provided "as is" without
+express or implied warranty, and with no claim as to its
+suitability for any purpose.
+
+An exception is made for files in readable text which contain their own license information,
+or files where an accompanying file exists (in the same directory) with a "-license" suffix added
+to the base-name name of the original file, and an extension of txt, html, or similar. For example
+"tidy" is accompanied by "tidy-license.txt".
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 trond-snekvik/vscode-rst 1.5.3 - MIT
 https://github.com/trond-snekvik/vscode-rst
 
@@ -3196,7 +3056,7 @@ Creative Commons may be contacted at creativecommons.org.
 
 ---------------------------------------------------------
 
-vscode-logfile-highlighter 3.3.4 - MIT
+vscode-logfile-highlighter 2.17.0 - MIT
 https://github.com/emilast/vscode-logfile-highlighter
 
 The MIT License (MIT)
@@ -3308,7 +3168,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-Web Background Synchronization  - Apache-2.0
+Web Background Synchronization  - Apache2
 https://github.com/WICG/background-sync
 
 Apache License
@@ -3512,24 +3372,4 @@ Apache License
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
----------------------------------------------------------
-
----------------------------------------------------------
-
-zsh 5.9
-https://github.com/zsh-users/zsh
-
-Unless otherwise noted in the header of specific files, files in this distribution have the licence shown below.
-
-However, note that certain shell functions are licensed under versions of the GNU General Public Licence.  Anyone distributing the shell as a binary including those files needs to take account of this.  Search shell functions for "Copyright" for specific copyright information. None of the core functions are affected by this, so those files may simply be omitted.
-
---
-
-The Z Shell is copyright (c) 1992-2017 Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and others.  All rights reserved.  Individual authors, whether or not specifically named, retain copyright in all changes; in what follows, they are referred to as `the Zsh Development Group'.  This is for convenience only and this body has no legal status.  The Z shell is distributed under the following licence; any provisions made in individual files take precedence.
-
-Permission is hereby granted, without written agreement and without licence or royalty fees, to use, copy, modify, and distribute this software and to distribute modified versions of this software for any purpose, provided that the above copyright notice and the following two paragraphs appear in all copies of this software.
-
-In no event shall the Zsh Development Group be liable to any party for direct, indirect, special, incidental, or consequential damages arising out of the use of this software and its documentation, even if the Zsh Development Group have been advised of the possibility of such damage.
-
-The Zsh Development Group specifically disclaim any warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.  The software provided hereunder is on an "as is" basis, and the Zsh Development Group have no obligation to provide maintenance, support, updates, enhancements, or modifications.
 ---------------------------------------------------------

VOID_CODEBASE_GUIDE.md

@@ -1,167 +0,0 @@
-# Void Codebase Guide
-
-The Void codebase is not as intimidating as it seems!
-
-Most of Void's code lives in the folder `src/vs/workbench/contrib/void/`.
-
-The purpose of this document is to explain how Void's codebase works. If you want build instructions instead, see [Contributing](https://github.com/voideditor/void/blob/main/HOW_TO_CONTRIBUTE.md).
-
-
-
-
-
-
-
-
-
-## Void Codebase Guide
-
-### VSCode Rundown
-Here's a VSCode rundown if you're just getting started with Void. You can also see Microsoft's [wiki](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) for some pictures. VSCode is an Electron app. Electron runs two processes: a **main** process (for internals) and a **browser** process (browser means HTML in general, not just "web browser").
-<p align="center" >
-<img src="https://github.com/user-attachments/assets/eef80306-2bfe-4cac-ba15-6156f65ab3bb" alt="Credit - https://github.com/microsoft/vscode/wiki/Source-Code-Organization" width="700px">
-</p>
-
-- Code in a  `browser/` folder always lives on the browser process, and it can use `window` and other browser items.
-- Code in an `electron-main/` folder always lives on the main process, and it can import `node_modules`.
-- Code in `common/` can be used by either process, but doesn't get any special imports.
-- The browser environment is not allowed to import `node_modules`. We came up with two workarounds:
-  1. Bundle the raw node_module code to the browser - we're doing this for React.
-  2. Implement the code on `electron-main/` and set up a channel between main/browser - we're doing this for sendLLMMessage.
-
-
-
-
-### Terminology
-
-Here's some terminology you might want to know about when working inside VSCode:
-- An **Editor** is the thing that you type your code in. If you have 10 tabs open, that's just one editor! Editors contain tabs (or "models").
-- A **Model** is an internal representation of a file's contents. It's shared between editors (for example, if you press `Cmd+\` to make a new editor, then the model of a file like `A.ts` is shared between them. Two editors, one model. That's how changes sync.).
-- Each model has a **URI** it represents, like `/Users/.../my_file.txt`. (A URI or "resource" is generally just a path).
-- The **Workbench** is the wrapper that contains all the editors, the terminal, the file system tree, etc.
-- Usually you use the `ITextModel` type for models and the `ICodeEditor` type for editors. There aren't that many other types.
-<p align="center" >
-<img src="https://github.com/user-attachments/assets/6521c228-dc96-4cf5-a673-6b9ca78b9b06" alt="Credit - https://code.visualstudio.com/docs/getstarted/userinterface" width="400px">
-</p>
-
-
-
-- VSCode is organized into "**Services**". A service is just a class that mounts a single time (in computer science theory this is called a "singleton"). You can register services with `registerSingleton` so that you can easily use them in any constructor with `@<Service>`. See _dummyContrib for an example we put together on how to register them. The registration is the same every time.
-
-- "**Actions**" are functions you register on VSCode so that either you or the user can call them later. They're also called "**Commands**".
-	- You can run actions as a user by pressing Cmd+Shift+P (opens the command pallete), or you can run them internally by using the commandService to call them by ID. We use actions to register keybinding listeners like Cmd+L, Cmd+K, etc. The nice thing about actions is the user can change the keybindings.
-
-
-### Internal LLM Message Pipeline
-
-Here's a picture of all the dependencies that are relevent between the time you first send a message through Void's sidebar, and the time a request is sent to your provider.
-Sending LLM messages from the main process avoids CSP issues with local providers and lets us use node_modules more easily.
-
-
-<div align="center">
-	<img width="100%" src="https://github.com/user-attachments/assets/9cf54dbb-82c4-4488-97a2-bd8dea890b50">
-</div>
-
-
-
-**Notes:** `modelCapabilities` is an important file that must be updated when new models come out!
-
-
-### Apply
-
-Void has two types of Apply: **Fast Apply** (uses Search/Replace, see below), and **Slow Apply** (rewrites whole file).
-
-When you click Apply and Fast Apply is enabled, we prompt the LLM to output Search/Replace block(s) like this:
-```
-<<<<<<< ORIGINAL
-// original code goes here
-=======
-// replaced code goes here
->>>>>>> UPDATED
-```
-This is what allows Void to quickly apply code even on 1000-line files. It's the same as asking the LLM to press Ctrl+F and enter in a search/replace query.
-
-### Apply Inner Workings
-
-The `editCodeService` file runs Apply. The same exact code is also used when the LLM calls the Edit tool, and when you submit Cmd+K. Just different versions of Fast/Slow Apply mode.
-
-Here is some important terminology:
-- A **DiffZone** is a {startLine, endLine} region of text where we compute and show red/green areas, or **Diffs**. When any changes are made to a file, we loop through all the DiffAreas on that file and refresh its Diffs.
-- A **DiffArea** is a generalization that just tracks line numbers like a DiffZone.
-- The only type of DiffArea that can "stream" is a DiffZone. Each DiffZone has an llmCancelToken if it's streaming.
-
-How Apply works:
-- When you click Apply, we create a **DiffZone** over that the full file so that any changes that the LLM makes will show up in red/green. We then stream the change.
-- When an LLM calls Edit, it's really calling Apply.
-- When you submit Cmd+K, it's the same as Apply except we create a smaller DiffZone (not on the whole file).
-
-
-### Writing Files Inner Workings
-When Void wants to change your code, it just writes to a text model. This means all you need to know to write to a file is its URI - you don't have to load it, save it, etc. There are some annoying background URI/model things to think about to get this to work, but we handled them all in `voidModelService`.
-
-### Void Settings Inner Workings
-We have a service `voidSettingsService` that stores all your Void settings (providers, models, global Void settings, etc). Imagine this as an implicit dependency for any of the core Void services:
-
-<div align="center">
-	<img width="800" src="https://github.com/user-attachments/assets/9f3cb68c-a61b-4810-8429-bb90b992b3fa">
-</div>
-
-Here's a guide to some of the terminology we're using:
-- **FeatureName**: Autocomplete | Chat | CtrlK | Apply
-- **ModelSelection**: a {providerName, modelName} pair.
-- **ProviderName**: The name of a provider: `'ollama'`, `'openAI'`, etc.
-- **ModelName**: The name of a model (string type, eg `'gpt-4o'`).
-- **RefreshProvider**: a provider that we ping repeatedly to update the models list.
-- **ChatMode** = normal | gather | agent
-
-
-
-### Approval State
-`editCodeService`'s data structures contain all the information about changes that the user needs to review. However, they don't store that information in a useful format. We wrote the following service to get a more useful derived state:
-
-<div align="center">
-	<img width="600" src="https://github.com/user-attachments/assets/f3645355-dff6-467c-bc38-ffe52077c08b">
-</div>
-
-
-
-### Build process
-If you want to know how our build pipeline works, see our build repo [here](https://github.com/voideditor/void-builder).
-
-
-
-## VSCode Codebase Guide
-
-For additional references, the Void team put together this list of links to get up and running with VSCode.
-<details>
-	
-
-#### Links for Beginners
-
-- [VSCode UI guide](https://code.visualstudio.com/docs/getstarted/userinterface)  - covers auxbar, panels, etc.
-- [UX guide](https://code.visualstudio.com/api/ux-guidelines/overview) - covers Containers, Views, Items, etc.
-
-#### Links for Contributors
-
-- [How VSCode's sourcecode is organized](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) - this explains where the entry point files are, what `browser/` and `common/` mean, etc. This is the most important read on this whole list! We recommend reading the whole thing.
-- [Built-in VSCode styles](https://code.visualstudio.com/api/references/theme-color) - CSS variables that are built into VSCode. Use `var(--vscode-{theme but replacing . with -})`. You can also see their [Webview theming guide](https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content).
-
-
-#### Misc
-
-- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - not used often, but here for reference.
-- Note: VSCode's repo is the source code for the Monaco editor! An "editor" is a Monaco editor, and it shares the code for ITextModel, etc.
-
-
-#### VSCode's Extension API
-
-Void is no longer an extension, so these links are no longer required, but they might be useful if we ever build an extension again.
-
-- [Files you need in an extension](https://code.visualstudio.com/api/get-started/extension-anatomy).
-- [An extension's `package.json` schema](https://code.visualstudio.com/api/references/extension-manifest).
-- ["Contributes" Guide](https://code.visualstudio.com/api/references/contribution-points) - the `"contributes"` part of `package.json` is how an extension mounts.
-- [The Full VSCode Extension API](https://code.visualstudio.com/api/references/vscode-api) - look on the right side for organization. The [bottom](https://code.visualstudio.com/api/references/vscode-api#api-patterns) of the page is easy to miss but is useful - cancellation tokens, events, disposables.
-- [Activation events](https://code.visualstudio.com/api/references/activation-events) you can define in `package.json` (not the most useful).
-
-
-</details>

VOID_USEFUL_LINKS.md

@@ -0,0 +1,37 @@
+# Useful links
+
+The Void team put together this list of links to get up and running with VSCode's sourcecode. We hope it's helpful!
+
+## Contributing
+
+- [How VSCode's sourcecode is organized](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) - this explains where the entry point files are, what `browser/` and `common/` mean, etc. This is the most important read on this whole list! We recommend reading the whole thing.
+
+- [Built-in VSCode styles](https://code.visualstudio.com/api/references/theme-color) - CSS variables that are built into VSCode. Use `var(--vscode-{theme but replacing . with -})`. You can also see their [Webview theming guide](https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content).
+
+## Beginners / Getting started
+
+- [VSCode UI guide](https://code.visualstudio.com/docs/getstarted/userinterface)  - covers auxbar, panels, etc.
+
+- [UX guide](https://code.visualstudio.com/api/ux-guidelines/overview) - covers Containers, Views, Items, etc.
+
+
+## Misc
+
+- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - not used often, but here for reference.
+
+
+## VSCode's Extension API
+
+Void is no longer an extension, so these links are no longer required, but they might be useful if we ever build an extension again.
+
+- [Files you need in an extension](https://code.visualstudio.com/api/get-started/extension-anatomy).
+
+- [An extension's `package.json` schema](https://code.visualstudio.com/api/references/extension-manifest).
+
+- ["Contributes" Guide](https://code.visualstudio.com/api/references/contribution-points) - the `"contributes"` part of `package.json` is how an extension mounts.
+
+- [The Full VSCode Extension API](https://code.visualstudio.com/api/references/vscode-api) - look on the right side for organization. The [bottom](https://code.visualstudio.com/api/references/vscode-api#api-patterns) of the page is easy to miss but is useful - cancellation tokens, events, disposables.
+
+- [Activation events](https://code.visualstudio.com/api/references/activation-events) you can define in `package.json` (not the most useful).
+
+

build/.cachesalt

@@ -1 +1 @@
-2024-12-11T00:28:56.838Z
+2024-09-04T10:21:29.952Z

build/.moduleignore

@@ -55,12 +55,6 @@ fsevents/test/**
 @vscode/windows-registry/build/**
 !@vscode/windows-registry/build/Release/*.node
 
-@vscode/tree-sitter-wasm/wasm/tree-sitter-*.wasm
-!@vscode/tree-sitter-wasm/wasm/tree-sitter-typescript.wasm
-!@vscode/tree-sitter-wasm/wasm/tree-sitter-regex.wasm
-!@vscode/tree-sitter-wasm/wasm/tree-sitter-ini.wasm
-!@vscode/tree-sitter-wasm/wasm/tree-sitter-css.wasm
-
 native-keymap/binding.gyp
 native-keymap/build/**
 native-keymap/src/**
@@ -116,13 +110,15 @@ node-pty/third_party/**
 @parcel/watcher/src/**
 !@parcel/watcher/build/Release/*.node
 
-vsda/**
-!vsda/index.js
-!vsda/index.d.ts
-!vsda/package.json
+vsda/build/**
+vsda/ci/**
+vsda/src/**
+vsda/.gitignore
+vsda/binding.gyp
+vsda/README.md
+vsda/SECURITY.md
+vsda/targets
 !vsda/build/Release/vsda.node
-!vsda/rust/web/**
-!vsda/rust/bundler/**
 
 @vscode/policy-watcher/build/**
 @vscode/policy-watcher/.husky/**
@@ -136,7 +132,6 @@ vsda/**
 !@vscode/windows-ca-certs/package.json
 !@vscode/windows-ca-certs/**/*.node
 
-@vscode/node-addon-api/**/*
 node-addon-api/**/*
 prebuild-install/**/*
 
@@ -168,7 +163,7 @@ typescript/lib/tsserverlibrary.js
 
 jschardet/index.js
 jschardet/src/**
-jschardet/dist/jschardet.js
+# TODO@esm uncomment when we can use jschardet.min.js again jschardet/dist/jschardet.js
 
 es6-promise/lib/**
 

build/.npmrc

@@ -2,5 +2,4 @@ disturl="https://nodejs.org/dist"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
-force_process_config="true"
 timeout=180000

build/.webignore

@@ -14,7 +14,7 @@
 
 jschardet/index.js
 jschardet/src/**
-jschardet/dist/jschardet.js
+# TODO@esm uncomment when we can use jschardet.min.js again jschardet/dist/jschardet.js
 
 vscode-textmate/webpack.config.js
 
@@ -26,9 +26,6 @@ vscode-textmate/webpack.config.js
 @xterm/addon-image/src/**
 @xterm/addon-image/out/**
 
-@xterm/addon-ligatures/src/**
-@xterm/addon-ligatures/out/**
-
 @xterm/addon-search/src/**
 @xterm/addon-search/out/**
 @xterm/addon-search/fixtures/**

build/azure-pipelines/alpine/cli-build-alpine.yml

@@ -19,15 +19,13 @@ steps:
       nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - template: ../cli/cli-apply-patches.yml@self
-
     - script: |
         set -e
         npm ci
       workingDirectory: build
-      env:
-        GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      displayName: Install build dependencies
+      displayName: Install pipeline build
+
+    - template: ../cli/cli-apply-patches.yml@self
 
   - task: Npm@1
     displayName: Download openssl prebuilt

build/azure-pipelines/alpine/product-build-alpine.yml

@@ -10,7 +10,7 @@ steps:
   - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
-      azureSubscription: vscode
+      azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password"
 
@@ -59,7 +59,7 @@ steps:
 
   - task: Docker@1
     inputs:
-      azureSubscriptionEndpoint: vscode
+      azureSubscriptionEndpoint: "vscode-builds-subscription"
       azureContainerRegistry: vscodehub.azurecr.io
       command: "Run an image"
       imageName: "vscode-linux-build-agent:alpine-$(VSCODE_ARCH)"
@@ -73,7 +73,6 @@ steps:
 
   - script: |
       set -e
-
       for i in {1..5}; do # try 5 times
         npm ci && break
         if [ $i -eq 5 ]; then

build/azure-pipelines/cli/cli-compile.yml

@@ -42,6 +42,7 @@ steps:
       - script: |
           set -e
           if [ -n "$SYSROOT_ARCH" ]; then
+            export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
             export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
             node -e '(async () => { const { getVSCodeSysroot } = require("../build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
             if [ "$SYSROOT_ARCH" == "arm64" ]; then
@@ -72,7 +73,7 @@ steps:
 
           # verify glibc requirement
           if [ -n "$SYSROOT_ARCH" ]; then
-            glibc_version="2.28"
+            glibc_version="2.17"
             while IFS= read -r line; do
               if [[ $line == *"GLIBC_"* ]]; then
                 version=$(echo "$line" | awk '{print $5}' | tr -d '()')
@@ -82,8 +83,8 @@ steps:
                 fi
               fi
             done < <("$OBJDUMP" -T "$PWD/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code")
-            if [[ "$glibc_version" != "2.28" ]]; then
-              echo "Error: binary has dependency on GLIBC > 2.28, found $glibc_version"
+            if [[ "$glibc_version" != "2.17" ]]; then
+              echo "Error: binary has dependency on GLIBC > 2.17, found $glibc_version"
               exit 1
             fi
           fi
@@ -107,18 +108,6 @@ steps:
             ${{ pair.key }}: ${{ pair.value }}
 
     - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}:
-      - task: PublishSymbols@2
-        inputs:
-          IndexSources: false
-          SymbolsFolder: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release
-          SearchPattern: 'code.pdb'
-          SymbolServerType: TeamServices
-          SymbolsProduct: 'code'
-          ArtifactServices.Symbol.AccountName: microsoft
-          ArtifactServices.Symbol.PAT: $(System.AccessToken)
-          ArtifactServices.Symbol.UseAAD: false
-        displayName: Publish Symbols
-
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"

build/azure-pipelines/cli/cli-darwin-sign.yml

@@ -4,21 +4,20 @@ parameters:
     default: []
 
 steps:
+  - task: AzureKeyVault@2
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode-build-secrets
+      SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
+
   - task: UseDotNet@2
     inputs:
       version: 6.x
 
-  - task: EsrpCodeSigning@5
-    inputs:
-      UseMSIAuthentication: true
-      ConnectedServiceName: vscode-esrp
-      AppRegistrationClientId: $(ESRP_CLIENT_ID)
-      AppRegistrationTenantId: $(ESRP_TENANT_ID)
-      AuthAKVName: vscode-esrp
-      AuthSignCertName: esrp-sign
-      FolderPath: .
-      Pattern: noop
-    displayName: 'Install ESRP Tooling'
+  - task: EsrpClientTool@1
+    continueOnError: true
+    displayName: Download ESRPClient
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
     - task: DownloadPipelineArtifact@2
@@ -33,14 +32,10 @@ steps:
         archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
         destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
 
-  - script: node build/azure-pipelines/common/sign $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll sign-darwin $(Build.ArtifactStagingDirectory)/pkg "*.zip"
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll sign-darwin $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip"
     displayName: Codesign
 
-  - script: node build/azure-pipelines/common/sign $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll notarize-darwin $(Build.ArtifactStagingDirectory)/pkg "*.zip"
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll notarize-darwin $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip"
     displayName: Notarize
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:

build/azure-pipelines/cli/cli-win32-sign.yml

@@ -4,29 +4,19 @@ parameters:
     default: []
 
 steps:
+  - task: AzureKeyVault@2
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode-build-secrets
+      SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
+
   - task: UseDotNet@2
     inputs:
       version: 6.x
 
-  - task: EsrpCodeSigning@5
-    inputs:
-      UseMSIAuthentication: true
-      ConnectedServiceName: vscode-esrp
-      AppRegistrationClientId: $(ESRP_CLIENT_ID)
-      AppRegistrationTenantId: $(ESRP_TENANT_ID)
-      AuthAKVName: vscode-esrp
-      AuthSignCertName: esrp-sign
-      FolderPath: .
-      Pattern: noop
-    displayName: 'Install ESRP Tooling'
-
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      $EsrpCodeSigningTool = (gci -directory -filter EsrpCodeSigning_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName
-      $Version = (gci -directory $EsrpCodeSigningTool | Select-Object -last 1).FullName
-      echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version\net6.0\esrpcli.dll"
-    displayName: Find ESRP CLI
+  - task: EsrpClientTool@1
+    displayName: "Use ESRP client"
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
       - task: DownloadPipelineArtifact@2
@@ -41,9 +31,18 @@ steps:
           archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
           destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
 
-  - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath sign-windows $(Build.ArtifactStagingDirectory)/sign "*.exe"
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName
+      $EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName
+      mkdir -p $(Agent.TempDirectory)\esrpcli
+      Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli
+      $EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName
+      echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath"
+    displayName: Find ESRP CLI
+
+  - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath sign-windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/sign "*.exe"
     displayName: Codesign
 
   - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:

build/azure-pipelines/cli/install-rust-posix.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.85
+    default: 1.81
   - name: targets
     default: []
     type: object

build/azure-pipelines/cli/install-rust-win32.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.85
+    default: 1.81
   - name: targets
     default: []
     type: object

build/azure-pipelines/common/computeBuiltInDepsCacheKey.js

@@ -3,15 +3,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
-const productjson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../../product.json'), 'utf8'));
-const shasum = crypto_1.default.createHash('sha256');
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8'));
+const shasum = crypto.createHash('sha256');
 for (const ext of productjson.builtInExtensions) {
     shasum.update(`${ext.name}@${ext.version}`);
 }

build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts

@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import fs from 'fs';
-import path from 'path';
-import crypto from 'crypto';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
 
 const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8'));
 const shasum = crypto.createHash('sha256');

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -3,24 +3,21 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
 const { dirs } = require('../../npm/dirs');
-const ROOT = path_1.default.join(__dirname, '../../../');
-const shasum = crypto_1.default.createHash('sha256');
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, 'build/.cachesalt')));
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, '.npmrc')));
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, 'build', '.npmrc')));
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, 'remote', '.npmrc')));
+const ROOT = path.join(__dirname, '../../../');
+const shasum = crypto.createHash('sha256');
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.npmrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'build', '.npmrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote', '.npmrc')));
 // Add `package.json` and `package-lock.json` files
 for (const dir of dirs) {
-    const packageJsonPath = path_1.default.join(ROOT, dir, 'package.json');
-    const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath).toString());
+    const packageJsonPath = path.join(ROOT, dir, 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
     const relevantPackageJsonSections = {
         dependencies: packageJson.dependencies,
         devDependencies: packageJson.devDependencies,
@@ -29,8 +26,8 @@ for (const dir of dirs) {
         distro: packageJson.distro
     };
     shasum.update(JSON.stringify(relevantPackageJsonSections));
-    const packageLockPath = path_1.default.join(ROOT, dir, 'package-lock.json');
-    shasum.update(fs_1.default.readFileSync(packageLockPath));
+    const packageLockPath = path.join(ROOT, dir, 'package-lock.json');
+    shasum.update(fs.readFileSync(packageLockPath));
 }
 // Add any other command line arguments
 for (let i = 2; i < process.argv.length; i++) {

build/azure-pipelines/common/computeNodeModulesCacheKey.ts

@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import fs from 'fs';
-import path from 'path';
-import crypto from 'crypto';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
 const { dirs } = require('../../npm/dirs');
 
 const ROOT = path.join(__dirname, '../../../');

build/azure-pipelines/common/createBuild.js

@@ -40,7 +40,7 @@ async function main() {
         assets: [],
         updates: {}
     };
-    const aadCredentials = new identity_1.ClientAssertionCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], () => Promise.resolve(process.env['AZURE_ID_TOKEN']));
+    const aadCredentials = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']);
     const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], aadCredentials });
     const scripts = client.database('builds').container(quality).scripts;
     await (0, retry_1.retry)(() => scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]));

build/azure-pipelines/common/createBuild.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ClientAssertionCredential } from '@azure/identity';
+import { ClientSecretCredential } from '@azure/identity';
 import { CosmosClient } from '@azure/cosmos';
 import { retry } from './retry';
 
@@ -47,7 +47,7 @@ async function main(): Promise<void> {
 		updates: {}
 	};
 
-	const aadCredentials = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
+	const aadCredentials = new ClientSecretCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_CLIENT_SECRET']!);
 	const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, aadCredentials });
 	const scripts = client.database('builds').container(quality).scripts;
 	await retry(() => scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]));

build/azure-pipelines/common/getPublishAuthTokens.js

@@ -1,47 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccessToken = getAccessToken;
-const msal_node_1 = require("@azure/msal-node");
-function e(name) {
-    const result = process.env[name];
-    if (typeof result !== 'string') {
-        throw new Error(`Missing env: ${name}`);
-    }
-    return result;
-}
-async function getAccessToken(endpoint, tenantId, clientId, idToken) {
-    const app = new msal_node_1.ConfidentialClientApplication({
-        auth: {
-            clientId,
-            authority: `https://login.microsoftonline.com/${tenantId}`,
-            clientAssertion: idToken
-        }
-    });
-    const result = await app.acquireTokenByClientCredential({ scopes: [`${endpoint}.default`] });
-    if (!result) {
-        throw new Error('Failed to get access token');
-    }
-    return {
-        token: result.accessToken,
-        expiresOnTimestamp: result.expiresOn.getTime(),
-        refreshAfterTimestamp: result.refreshOn?.getTime()
-    };
-}
-async function main() {
-    const cosmosDBAccessToken = await getAccessToken(e('AZURE_DOCUMENTDB_ENDPOINT'), e('AZURE_TENANT_ID'), e('AZURE_CLIENT_ID'), e('AZURE_ID_TOKEN'));
-    const blobServiceAccessToken = await getAccessToken(`https://${e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')}.blob.core.windows.net/`, process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_ID_TOKEN']);
-    console.log(JSON.stringify({ cosmosDBAccessToken, blobServiceAccessToken }));
-}
-if (require.main === module) {
-    main().then(() => {
-        process.exit(0);
-    }, err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=getPublishAuthTokens.js.map

build/azure-pipelines/common/getPublishAuthTokens.ts

@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { AccessToken } from '@azure/core-auth';
-import { ConfidentialClientApplication } from '@azure/msal-node';
-
-function e(name: string): string {
-	const result = process.env[name];
-
-	if (typeof result !== 'string') {
-		throw new Error(`Missing env: ${name}`);
-	}
-
-	return result;
-}
-
-export async function getAccessToken(endpoint: string, tenantId: string, clientId: string, idToken: string): Promise<AccessToken> {
-	const app = new ConfidentialClientApplication({
-		auth: {
-			clientId,
-			authority: `https://login.microsoftonline.com/${tenantId}`,
-			clientAssertion: idToken
-		}
-	});
-
-	const result = await app.acquireTokenByClientCredential({ scopes: [`${endpoint}.default`] });
-
-	if (!result) {
-		throw new Error('Failed to get access token');
-	}
-
-	return {
-		token: result.accessToken,
-		expiresOnTimestamp: result.expiresOn!.getTime(),
-		refreshAfterTimestamp: result.refreshOn?.getTime()
-	};
-}
-
-async function main() {
-	const cosmosDBAccessToken = await getAccessToken(e('AZURE_DOCUMENTDB_ENDPOINT')!, e('AZURE_TENANT_ID')!, e('AZURE_CLIENT_ID')!, e('AZURE_ID_TOKEN')!);
-	const blobServiceAccessToken = await getAccessToken(`https://${e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')}.blob.core.windows.net/`, process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_ID_TOKEN']!);
-	console.log(JSON.stringify({ cosmosDBAccessToken, blobServiceAccessToken }));
-}
-
-if (require.main === module) {
-	main().then(() => {
-		process.exit(0);
-	}, err => {
-		console.error(err);
-		process.exit(1);
-	});
-}

build/azure-pipelines/common/listNodeModules.js

@@ -3,19 +3,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const fs = require("fs");
+const path = require("path");
 if (process.argv.length !== 3) {
     console.error('Usage: node listNodeModules.js OUTPUT_FILE');
     process.exit(-1);
 }
-const ROOT = path_1.default.join(__dirname, '../../../');
+const ROOT = path.join(__dirname, '../../../');
 function findNodeModulesFiles(location, inNodeModules, result) {
-    const entries = fs_1.default.readdirSync(path_1.default.join(ROOT, location));
+    const entries = fs.readdirSync(path.join(ROOT, location));
     for (const entry of entries) {
         const entryPath = `${location}/${entry}`;
         if (/(^\/out)|(^\/src$)|(^\/.git$)|(^\/.build$)/.test(entryPath)) {
@@ -23,7 +20,7 @@ function findNodeModulesFiles(location, inNodeModules, result) {
         }
         let stat;
         try {
-            stat = fs_1.default.statSync(path_1.default.join(ROOT, entryPath));
+            stat = fs.statSync(path.join(ROOT, entryPath));
         }
         catch (err) {
             continue;
@@ -40,5 +37,5 @@ function findNodeModulesFiles(location, inNodeModules, result) {
 }
 const result = [];
 findNodeModulesFiles('', false, result);
-fs_1.default.writeFileSync(process.argv[2], result.join('\n') + '\n');
+fs.writeFileSync(process.argv[2], result.join('\n') + '\n');
 //# sourceMappingURL=listNodeModules.js.map

build/azure-pipelines/common/listNodeModules.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
 
 if (process.argv.length !== 3) {
 	console.error('Usage: node listNodeModules.js OUTPUT_FILE');

build/azure-pipelines/common/publish.js

@@ -3,25 +3,19 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const fs = require("fs");
+const path = require("path");
 const stream_1 = require("stream");
 const promises_1 = require("node:stream/promises");
-const yauzl_1 = __importDefault(require("yauzl"));
-const crypto_1 = __importDefault(require("crypto"));
+const yauzl = require("yauzl");
+const crypto = require("crypto");
 const retry_1 = require("./retry");
 const cosmos_1 = require("@azure/cosmos");
-const child_process_1 = __importDefault(require("child_process"));
-const os_1 = __importDefault(require("os"));
+const identity_1 = require("@azure/identity");
+const cp = require("child_process");
+const os = require("os");
 const node_worker_threads_1 = require("node:worker_threads");
-const msal_node_1 = require("@azure/msal-node");
-const storage_blob_1 = require("@azure/storage-blob");
-const jws_1 = __importDefault(require("jws"));
-const node_timers_1 = require("node:timers");
 function e(name) {
     const result = process.env[name];
     if (typeof result !== 'string') {
@@ -29,264 +23,260 @@ function e(name) {
     }
     return result;
 }
+class Temp {
+    _files = [];
+    tmpNameSync() {
+        const file = path.join(os.tmpdir(), crypto.randomBytes(20).toString('hex'));
+        this._files.push(file);
+        return file;
+    }
+    dispose() {
+        for (const file of this._files) {
+            try {
+                fs.unlinkSync(file);
+            }
+            catch (err) {
+                // noop
+            }
+        }
+    }
+}
+function isCreateProvisionedFilesErrorResponse(response) {
+    return response?.ErrorDetails?.Code !== undefined;
+}
+class ProvisionService {
+    log;
+    accessToken;
+    constructor(log, accessToken) {
+        this.log = log;
+        this.accessToken = accessToken;
+    }
+    async provision(releaseId, fileId, fileName) {
+        const body = JSON.stringify({
+            ReleaseId: releaseId,
+            PortalName: 'VSCode',
+            PublisherCode: 'VSCode',
+            ProvisionedFilesCollection: [{
+                    PublisherKey: fileId,
+                    IsStaticFriendlyFileName: true,
+                    FriendlyFileName: fileName,
+                    MaxTTL: '1440',
+                    CdnMappings: ['ECN']
+                }]
+        });
+        this.log(`Provisioning ${fileName} (releaseId: ${releaseId}, fileId: ${fileId})...`);
+        const res = await (0, retry_1.retry)(() => this.request('POST', '/api/v2/ProvisionedFiles/CreateProvisionedFiles', { body }));
+        if (isCreateProvisionedFilesErrorResponse(res) && res.ErrorDetails.Code === 'FriendlyFileNameAlreadyProvisioned') {
+            this.log(`File already provisioned (most likley due to a re-run), skipping: ${fileName}`);
+            return;
+        }
+        if (!res.IsSuccess) {
+            throw new Error(`Failed to submit provisioning request: ${JSON.stringify(res.ErrorDetails)}`);
+        }
+        this.log(`Successfully provisioned ${fileName}`);
+    }
+    async request(method, url, options) {
+        const opts = {
+            method,
+            body: options?.body,
+            headers: {
+                Authorization: `Bearer ${this.accessToken}`,
+                'Content-Type': 'application/json'
+            }
+        };
+        const res = await fetch(`https://dsprovisionapi.microsoft.com${url}`, opts);
+        // 400 normally means the request is bad or something is already provisioned, so we will return as retries are useless
+        // Otherwise log the text body and headers. We do text because some responses are not JSON.
+        if ((!res.ok || res.status < 200 || res.status >= 500) && res.status !== 400) {
+            throw new Error(`Unexpected status code: ${res.status}\nResponse Headers: ${JSON.stringify(res.headers)}\nBody Text: ${await res.text()}`);
+        }
+        return await res.json();
+    }
+}
 function hashStream(hashName, stream) {
     return new Promise((c, e) => {
-        const shasum = crypto_1.default.createHash(hashName);
+        const shasum = crypto.createHash(hashName);
         stream
             .on('data', shasum.update.bind(shasum))
             .on('error', e)
-            .on('close', () => c(shasum.digest()));
+            .on('close', () => c(shasum.digest('hex')));
     });
 }
-var StatusCode;
-(function (StatusCode) {
-    StatusCode["Pass"] = "pass";
-    StatusCode["Aborted"] = "aborted";
-    StatusCode["Inprogress"] = "inprogress";
-    StatusCode["FailCanRetry"] = "failCanRetry";
-    StatusCode["FailDoNotRetry"] = "failDoNotRetry";
-    StatusCode["PendingAnalysis"] = "pendingAnalysis";
-    StatusCode["Cancelled"] = "cancelled";
-})(StatusCode || (StatusCode = {}));
-function getCertificateBuffer(input) {
-    return Buffer.from(input.replace(/-----BEGIN CERTIFICATE-----|-----END CERTIFICATE-----|\n/g, ''), 'base64');
+class ESRPClient {
+    log;
+    tmp;
+    authPath;
+    constructor(log, tmp, tenantId, clientId, authCertSubjectName, requestSigningCertSubjectName) {
+        this.log = log;
+        this.tmp = tmp;
+        this.authPath = this.tmp.tmpNameSync();
+        fs.writeFileSync(this.authPath, JSON.stringify({
+            Version: '1.0.0',
+            AuthenticationType: 'AAD_CERT',
+            TenantId: tenantId,
+            ClientId: clientId,
+            AuthCert: {
+                SubjectName: authCertSubjectName,
+                StoreLocation: 'LocalMachine',
+                StoreName: 'My',
+                SendX5c: 'true'
+            },
+            RequestSigningCert: {
+                SubjectName: requestSigningCertSubjectName,
+                StoreLocation: 'LocalMachine',
+                StoreName: 'My'
+            }
+        }));
+    }
+    async release(version, filePath) {
+        this.log(`Submitting release for ${version}: ${filePath}`);
+        const submitReleaseResult = await this.SubmitRelease(version, filePath);
+        if (submitReleaseResult.submissionResponse.statusCode !== 'pass') {
+            throw new Error(`Unexpected status code: ${submitReleaseResult.submissionResponse.statusCode}`);
+        }
+        const releaseId = submitReleaseResult.submissionResponse.operationId;
+        this.log(`Successfully submitted release ${releaseId}. Polling for completion...`);
+        let details;
+        // Poll every 5 seconds, wait 60 minutes max -> poll 60/5*60=720 times
+        for (let i = 0; i < 720; i++) {
+            details = await this.ReleaseDetails(releaseId);
+            if (details.releaseDetails[0].statusCode === 'pass') {
+                break;
+            }
+            else if (details.releaseDetails[0].statusCode !== 'inprogress') {
+                throw new Error(`Failed to submit release: ${JSON.stringify(details)}`);
+            }
+            await new Promise(c => setTimeout(c, 5000));
+        }
+        if (details.releaseDetails[0].statusCode !== 'pass') {
+            throw new Error(`Timed out waiting for release ${releaseId}: ${JSON.stringify(details)}`);
+        }
+        const fileId = details.releaseDetails[0].fileDetails[0].publisherKey;
+        this.log('Release completed successfully with fileId: ', fileId);
+        return { releaseId, fileId };
+    }
+    async SubmitRelease(version, filePath) {
+        const policyPath = this.tmp.tmpNameSync();
+        fs.writeFileSync(policyPath, JSON.stringify({
+            Version: '1.0.0',
+            Audience: 'InternalLimited',
+            Intent: 'distribution',
+            ContentType: 'InstallPackage'
+        }));
+        const inputPath = this.tmp.tmpNameSync();
+        const size = fs.statSync(filePath).size;
+        const istream = fs.createReadStream(filePath);
+        const sha256 = await hashStream('sha256', istream);
+        fs.writeFileSync(inputPath, JSON.stringify({
+            Version: '1.0.0',
+            ReleaseInfo: {
+                ReleaseMetadata: {
+                    Title: 'VS Code',
+                    Properties: {
+                        ReleaseContentType: 'InstallPackage'
+                    },
+                    MinimumNumberOfApprovers: 1
+                },
+                ProductInfo: {
+                    Name: 'VS Code',
+                    Version: version,
+                    Description: path.basename(filePath, path.extname(filePath)),
+                },
+                Owners: [
+                    {
+                        Owner: {
+                            UserPrincipalName: 'jomo@microsoft.com'
+                        }
+                    }
+                ],
+                Approvers: [
+                    {
+                        Approver: {
+                            UserPrincipalName: 'jomo@microsoft.com'
+                        },
+                        IsAutoApproved: true,
+                        IsMandatory: false
+                    }
+                ],
+                AccessPermissions: {
+                    MainPublisher: 'VSCode',
+                    ChannelDownloadEntityDetails: {
+                        Consumer: ['VSCode']
+                    }
+                },
+                CreatedBy: {
+                    UserPrincipalName: 'jomo@microsoft.com'
+                }
+            },
+            ReleaseBatches: [
+                {
+                    ReleaseRequestFiles: [
+                        {
+                            SizeInBytes: size,
+                            SourceHash: sha256,
+                            HashType: 'SHA256',
+                            SourceLocation: path.basename(filePath)
+                        }
+                    ],
+                    SourceLocationType: 'UNC',
+                    SourceRootDirectory: path.dirname(filePath),
+                    DestinationLocationType: 'AzureBlob'
+                }
+            ]
+        }));
+        const outputPath = this.tmp.tmpNameSync();
+        cp.execSync(`ESRPClient SubmitRelease -a ${this.authPath} -p ${policyPath} -i ${inputPath} -o ${outputPath}`, { stdio: 'inherit' });
+        const output = fs.readFileSync(outputPath, 'utf8');
+        return JSON.parse(output);
+    }
+    async ReleaseDetails(releaseId) {
+        const inputPath = this.tmp.tmpNameSync();
+        fs.writeFileSync(inputPath, JSON.stringify({
+            Version: '1.0.0',
+            OperationIds: [releaseId]
+        }));
+        const outputPath = this.tmp.tmpNameSync();
+        cp.execSync(`ESRPClient ReleaseDetails -a ${this.authPath} -i ${inputPath} -o ${outputPath}`, { stdio: 'inherit' });
+        const output = fs.readFileSync(outputPath, 'utf8');
+        return JSON.parse(output);
+    }
 }
-function getThumbprint(input, algorithm) {
-    const buffer = getCertificateBuffer(input);
-    return crypto_1.default.createHash(algorithm).update(buffer).digest();
-}
-function getKeyFromPFX(pfx) {
-    const pfxCertificatePath = path_1.default.join(os_1.default.tmpdir(), 'cert.pfx');
-    const pemKeyPath = path_1.default.join(os_1.default.tmpdir(), 'key.pem');
-    try {
-        const pfxCertificate = Buffer.from(pfx, 'base64');
-        fs_1.default.writeFileSync(pfxCertificatePath, pfxCertificate);
-        child_process_1.default.execSync(`openssl pkcs12 -in "${pfxCertificatePath}" -nocerts -nodes -out "${pemKeyPath}" -passin pass:`);
-        const raw = fs_1.default.readFileSync(pemKeyPath, 'utf-8');
-        const result = raw.match(/-----BEGIN PRIVATE KEY-----[\s\S]+?-----END PRIVATE KEY-----/g)[0];
+async function releaseAndProvision(log, releaseTenantId, releaseClientId, releaseAuthCertSubjectName, releaseRequestSigningCertSubjectName, provisionTenantId, provisionAADUsername, provisionAADPassword, version, quality, filePath) {
+    const fileName = `${quality}/${version}/${path.basename(filePath)}`;
+    const result = `${e('PRSS_CDN_URL')}/${fileName}`;
+    const res = await (0, retry_1.retry)(() => fetch(result));
+    if (res.status === 200) {
+        log(`Already released and provisioned: ${result}`);
         return result;
     }
-    finally {
-        fs_1.default.rmSync(pfxCertificatePath, { force: true });
-        fs_1.default.rmSync(pemKeyPath, { force: true });
-    }
-}
-function getCertificatesFromPFX(pfx) {
-    const pfxCertificatePath = path_1.default.join(os_1.default.tmpdir(), 'cert.pfx');
-    const pemCertificatePath = path_1.default.join(os_1.default.tmpdir(), 'cert.pem');
-    try {
-        const pfxCertificate = Buffer.from(pfx, 'base64');
-        fs_1.default.writeFileSync(pfxCertificatePath, pfxCertificate);
-        child_process_1.default.execSync(`openssl pkcs12 -in "${pfxCertificatePath}" -nokeys -out "${pemCertificatePath}" -passin pass:`);
-        const raw = fs_1.default.readFileSync(pemCertificatePath, 'utf-8');
-        const matches = raw.match(/-----BEGIN CERTIFICATE-----[\s\S]+?-----END CERTIFICATE-----/g);
-        return matches ? matches.reverse() : [];
-    }
-    finally {
-        fs_1.default.rmSync(pfxCertificatePath, { force: true });
-        fs_1.default.rmSync(pemCertificatePath, { force: true });
-    }
-}
-class ESRPReleaseService {
-    log;
-    clientId;
-    accessToken;
-    requestSigningCertificates;
-    requestSigningKey;
-    containerClient;
-    stagingSasToken;
-    static async create(log, tenantId, clientId, authCertificatePfx, requestSigningCertificatePfx, containerClient, stagingSasToken) {
-        const authKey = getKeyFromPFX(authCertificatePfx);
-        const authCertificate = getCertificatesFromPFX(authCertificatePfx)[0];
-        const requestSigningKey = getKeyFromPFX(requestSigningCertificatePfx);
-        const requestSigningCertificates = getCertificatesFromPFX(requestSigningCertificatePfx);
-        const app = new msal_node_1.ConfidentialClientApplication({
-            auth: {
-                clientId,
-                authority: `https://login.microsoftonline.com/${tenantId}`,
-                clientCertificate: {
-                    thumbprintSha256: getThumbprint(authCertificate, 'sha256').toString('hex'),
-                    privateKey: authKey,
-                    x5c: authCertificate
-                }
-            }
-        });
-        const response = await app.acquireTokenByClientCredential({
-            scopes: ['https://api.esrp.microsoft.com/.default']
-        });
-        return new ESRPReleaseService(log, clientId, response.accessToken, requestSigningCertificates, requestSigningKey, containerClient, stagingSasToken);
-    }
-    static API_URL = 'https://api.esrp.microsoft.com/api/v3/releaseservices/clients/';
-    constructor(log, clientId, accessToken, requestSigningCertificates, requestSigningKey, containerClient, stagingSasToken) {
-        this.log = log;
-        this.clientId = clientId;
-        this.accessToken = accessToken;
-        this.requestSigningCertificates = requestSigningCertificates;
-        this.requestSigningKey = requestSigningKey;
-        this.containerClient = containerClient;
-        this.stagingSasToken = stagingSasToken;
-    }
-    async createRelease(version, filePath, friendlyFileName) {
-        const correlationId = crypto_1.default.randomUUID();
-        const blobClient = this.containerClient.getBlockBlobClient(correlationId);
-        this.log(`Uploading ${filePath} to ${blobClient.url}`);
-        await blobClient.uploadFile(filePath);
-        this.log('Uploaded blob successfully');
-        try {
-            this.log(`Submitting release for ${version}: ${filePath}`);
-            const submitReleaseResult = await this.submitRelease(version, filePath, friendlyFileName, correlationId, blobClient);
-            this.log(`Successfully submitted release ${submitReleaseResult.operationId}. Polling for completion...`);
-            // Poll every 5 seconds, wait 60 minutes max -> poll 60/5*60=720 times
-            for (let i = 0; i < 720; i++) {
-                await new Promise(c => setTimeout(c, 5000));
-                const releaseStatus = await this.getReleaseStatus(submitReleaseResult.operationId);
-                if (releaseStatus.status === 'pass') {
-                    break;
-                }
-                else if (releaseStatus.status === 'aborted') {
-                    this.log(JSON.stringify(releaseStatus));
-                    throw new Error(`Release was aborted`);
-                }
-                else if (releaseStatus.status !== 'inprogress') {
-                    this.log(JSON.stringify(releaseStatus));
-                    throw new Error(`Unknown error when polling for release`);
-                }
-            }
-            const releaseDetails = await this.getReleaseDetails(submitReleaseResult.operationId);
-            if (releaseDetails.status !== 'pass') {
-                throw new Error(`Timed out waiting for release: ${JSON.stringify(releaseDetails)}`);
-            }
-            this.log('Successfully created release:', releaseDetails.files[0].fileDownloadDetails[0].downloadUrl);
-            return releaseDetails.files[0].fileDownloadDetails[0].downloadUrl;
-        }
-        finally {
-            this.log(`Deleting blob ${blobClient.url}`);
-            await blobClient.delete();
-            this.log('Deleted blob successfully');
-        }
-    }
-    async submitRelease(version, filePath, friendlyFileName, correlationId, blobClient) {
-        const size = fs_1.default.statSync(filePath).size;
-        const hash = await hashStream('sha256', fs_1.default.createReadStream(filePath));
-        const blobUrl = `${blobClient.url}?${this.stagingSasToken}`;
-        const message = {
-            customerCorrelationId: correlationId,
-            esrpCorrelationId: correlationId,
-            driEmail: ['joao.moreno@microsoft.com'],
-            createdBy: { userPrincipalName: 'jomo@microsoft.com' },
-            owners: [{ owner: { userPrincipalName: 'jomo@microsoft.com' } }],
-            approvers: [{ approver: { userPrincipalName: 'jomo@microsoft.com' }, isAutoApproved: true, isMandatory: false }],
-            releaseInfo: {
-                title: 'VS Code',
-                properties: {
-                    'ReleaseContentType': 'InstallPackage'
-                },
-                minimumNumberOfApprovers: 1
-            },
-            productInfo: {
-                name: 'VS Code',
-                version,
-                description: 'VS Code'
-            },
-            accessPermissionsInfo: {
-                mainPublisher: 'VSCode',
-                channelDownloadEntityDetails: {
-                    AllDownloadEntities: ['VSCode']
-                }
-            },
-            routingInfo: {
-                intent: 'filedownloadlinkgeneration'
-            },
-            files: [{
-                    name: path_1.default.basename(filePath),
-                    friendlyFileName,
-                    tenantFileLocation: blobUrl,
-                    tenantFileLocationType: 'AzureBlob',
-                    sourceLocation: {
-                        type: 'azureBlob',
-                        blobUrl
-                    },
-                    hashType: 'sha256',
-                    hash: Array.from(hash),
-                    sizeInBytes: size
-                }]
-        };
-        message.jwsToken = await this.generateJwsToken(message);
-        const res = await fetch(`${ESRPReleaseService.API_URL}${this.clientId}/workflows/release/operations`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bearer ${this.accessToken}`
-            },
-            body: JSON.stringify(message)
-        });
-        if (!res.ok) {
-            const text = await res.text();
-            throw new Error(`Failed to submit release: ${res.statusText}\n${text}`);
-        }
-        return await res.json();
-    }
-    async getReleaseStatus(releaseId) {
-        const url = `${ESRPReleaseService.API_URL}${this.clientId}/workflows/release/operations/grs/${releaseId}`;
-        const res = await fetch(url, {
-            headers: {
-                'Authorization': `Bearer ${this.accessToken}`
-            }
-        });
-        if (!res.ok) {
-            const text = await res.text();
-            throw new Error(`Failed to get release status: ${res.statusText}\n${text}`);
-        }
-        return await res.json();
-    }
-    async getReleaseDetails(releaseId) {
-        const url = `${ESRPReleaseService.API_URL}${this.clientId}/workflows/release/operations/grd/${releaseId}`;
-        const res = await fetch(url, {
-            headers: {
-                'Authorization': `Bearer ${this.accessToken}`
-            }
-        });
-        if (!res.ok) {
-            const text = await res.text();
-            throw new Error(`Failed to get release status: ${res.statusText}\n${text}`);
-        }
-        return await res.json();
-    }
-    async generateJwsToken(message) {
-        return jws_1.default.sign({
-            header: {
-                alg: 'RS256',
-                crit: ['exp', 'x5t'],
-                // Release service uses ticks, not seconds :roll_eyes: (https://stackoverflow.com/a/7968483)
-                exp: ((Date.now() + (6 * 60 * 1000)) * 10000) + 621355968000000000,
-                // Release service uses hex format, not base64url :roll_eyes:
-                x5t: getThumbprint(this.requestSigningCertificates[0], 'sha1').toString('hex'),
-                // Release service uses a '.' separated string, not an array of strings :roll_eyes:
-                x5c: this.requestSigningCertificates.map(c => getCertificateBuffer(c).toString('base64url')).join('.'),
-            },
-            payload: message,
-            privateKey: this.requestSigningKey,
-        });
-    }
+    const tmp = new Temp();
+    process.on('exit', () => tmp.dispose());
+    const esrpclient = new ESRPClient(log, tmp, releaseTenantId, releaseClientId, releaseAuthCertSubjectName, releaseRequestSigningCertSubjectName);
+    const release = await esrpclient.release(version, filePath);
+    const credential = new identity_1.ClientSecretCredential(provisionTenantId, provisionAADUsername, provisionAADPassword);
+    const accessToken = await credential.getToken(['https://microsoft.onmicrosoft.com/DS.Provisioning.WebApi/.default']);
+    const service = new ProvisionService(log, accessToken.token);
+    await service.provision(release.releaseId, release.fileId, fileName);
+    return result;
 }
 class State {
     statePath;
     set = new Set();
     constructor() {
         const pipelineWorkspacePath = e('PIPELINE_WORKSPACE');
-        const previousState = fs_1.default.readdirSync(pipelineWorkspacePath)
+        const previousState = fs.readdirSync(pipelineWorkspacePath)
             .map(name => /^artifacts_processed_(\d+)$/.exec(name))
             .filter((match) => !!match)
             .map(match => ({ name: match[0], attempt: Number(match[1]) }))
             .sort((a, b) => b.attempt - a.attempt)[0];
         if (previousState) {
-            const previousStatePath = path_1.default.join(pipelineWorkspacePath, previousState.name, previousState.name + '.txt');
-            fs_1.default.readFileSync(previousStatePath, 'utf8').split(/\n/).filter(name => !!name).forEach(name => this.set.add(name));
+            const previousStatePath = path.join(pipelineWorkspacePath, previousState.name, previousState.name + '.txt');
+            fs.readFileSync(previousStatePath, 'utf8').split(/\n/).filter(name => !!name).forEach(name => this.set.add(name));
         }
         const stageAttempt = e('SYSTEM_STAGEATTEMPT');
-        this.statePath = path_1.default.join(pipelineWorkspacePath, `artifacts_processed_${stageAttempt}`, `artifacts_processed_${stageAttempt}.txt`);
-        fs_1.default.mkdirSync(path_1.default.dirname(this.statePath), { recursive: true });
-        fs_1.default.writeFileSync(this.statePath, [...this.set.values()].map(name => `${name}\n`).join(''));
+        this.statePath = path.join(pipelineWorkspacePath, `artifacts_processed_${stageAttempt}`, `artifacts_processed_${stageAttempt}.txt`);
+        fs.mkdirSync(path.dirname(this.statePath), { recursive: true });
+        fs.writeFileSync(this.statePath, [...this.set.values()].map(name => `${name}\n`).join(''));
     }
     get size() {
         return this.set.size;
@@ -296,7 +286,7 @@ class State {
     }
     add(name) {
         this.set.add(name);
-        fs_1.default.appendFileSync(this.statePath, `${name}\n`);
+        fs.appendFileSync(this.statePath, `${name}\n`);
     }
     [Symbol.iterator]() {
         return this.set[Symbol.iterator]();
@@ -342,7 +332,7 @@ async function downloadArtifact(artifact, downloadPath) {
         if (!res.ok) {
             throw new Error(`Unexpected status code: ${res.status}`);
         }
-        await (0, promises_1.pipeline)(stream_1.Readable.fromWeb(res.body), fs_1.default.createWriteStream(downloadPath));
+        await (0, promises_1.pipeline)(stream_1.Readable.fromWeb(res.body), fs.createWriteStream(downloadPath));
     }
     finally {
         clearTimeout(timeout);
@@ -350,7 +340,7 @@ async function downloadArtifact(artifact, downloadPath) {
 }
 async function unzip(packagePath, outputPath) {
     return new Promise((resolve, reject) => {
-        yauzl_1.default.open(packagePath, { lazyEntries: true, autoClose: true }, (err, zipfile) => {
+        yauzl.open(packagePath, { lazyEntries: true, autoClose: true }, (err, zipfile) => {
             if (err) {
                 return reject(err);
             }
@@ -364,9 +354,9 @@ async function unzip(packagePath, outputPath) {
                         if (err) {
                             return reject(err);
                         }
-                        const filePath = path_1.default.join(outputPath, entry.fileName);
-                        fs_1.default.mkdirSync(path_1.default.dirname(filePath), { recursive: true });
-                        const ostream = fs_1.default.createWriteStream(filePath);
+                        const filePath = path.join(outputPath, entry.fileName);
+                        fs.mkdirSync(path.dirname(filePath), { recursive: true });
+                        const ostream = fs.createWriteStream(filePath);
                         ostream.on('finish', () => {
                             result.push(filePath);
                             zipfile.readEntry();
@@ -382,7 +372,7 @@ async function unzip(packagePath, outputPath) {
     });
 }
 // Contains all of the logic for mapping details to our actual product names in CosmosDB
-function getPlatform(product, os, arch, type) {
+function getPlatform(product, os, arch, type, isLegacy) {
     switch (os) {
         case 'win32':
             switch (product) {
@@ -427,12 +417,12 @@ function getPlatform(product, os, arch, type) {
                         case 'client':
                             return `linux-${arch}`;
                         case 'server':
-                            return `server-linux-${arch}`;
+                            return isLegacy ? `server-linux-legacy-${arch}` : `server-linux-${arch}`;
                         case 'web':
                             if (arch === 'standalone') {
                                 return 'web-standalone';
                             }
-                            return `server-linux-${arch}-web`;
+                            return isLegacy ? `server-linux-legacy-${arch}-web` : `server-linux-${arch}-web`;
                         default:
                             throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                     }
@@ -483,101 +473,33 @@ function getRealType(type) {
             return type;
     }
 }
-async function withLease(client, fn) {
-    const lease = client.getBlobLeaseClient();
-    for (let i = 0; i < 360; i++) { // Try to get lease for 30 minutes
-        try {
-            await client.uploadData(new ArrayBuffer()); // blob needs to exist for lease to be acquired
-            await lease.acquireLease(60);
-            try {
-                const abortController = new AbortController();
-                const refresher = new Promise((c, e) => {
-                    abortController.signal.onabort = () => {
-                        (0, node_timers_1.clearInterval)(interval);
-                        c();
-                    };
-                    const interval = (0, node_timers_1.setInterval)(() => {
-                        lease.renewLease().catch(err => {
-                            (0, node_timers_1.clearInterval)(interval);
-                            e(new Error('Failed to renew lease ' + err));
-                        });
-                    }, 30_000);
-                });
-                const result = await Promise.race([fn(), refresher]);
-                abortController.abort();
-                return result;
-            }
-            finally {
-                await lease.releaseLease();
-            }
-        }
-        catch (err) {
-            if (err.statusCode !== 409 && err.statusCode !== 412) {
-                throw err;
-            }
-            await new Promise(c => setTimeout(c, 5000));
-        }
-    }
-    throw new Error('Failed to acquire lease on blob after 30 minutes');
-}
-async function processArtifact(artifact, filePath) {
+async function processArtifact(artifact, artifactFilePath) {
     const log = (...args) => console.log(`[${artifact.name}]`, ...args);
     const match = /^vscode_(?<product>[^_]+)_(?<os>[^_]+)(?:_legacy)?_(?<arch>[^_]+)_(?<unprocessedType>[^_]+)$/.exec(artifact.name);
     if (!match) {
         throw new Error(`Invalid artifact name: ${artifact.name}`);
     }
-    const { cosmosDBAccessToken, blobServiceAccessToken } = JSON.parse(e('PUBLISH_AUTH_TOKENS'));
+    // getPlatform needs the unprocessedType
     const quality = e('VSCODE_QUALITY');
-    const version = e('BUILD_SOURCEVERSION');
-    const friendlyFileName = `${quality}/${version}/${path_1.default.basename(filePath)}`;
-    const blobServiceClient = new storage_blob_1.BlobServiceClient(`https://${e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')}.blob.core.windows.net/`, { getToken: async () => blobServiceAccessToken });
-    const leasesContainerClient = blobServiceClient.getContainerClient('leases');
-    await leasesContainerClient.createIfNotExists();
-    const leaseBlobClient = leasesContainerClient.getBlockBlobClient(friendlyFileName);
-    log(`Acquiring lease for: ${friendlyFileName}`);
-    await withLease(leaseBlobClient, async () => {
-        log(`Successfully acquired lease for: ${friendlyFileName}`);
-        const url = `${e('PRSS_CDN_URL')}/${friendlyFileName}`;
-        const res = await (0, retry_1.retry)(() => fetch(url));
-        if (res.status === 200) {
-            log(`Already released and provisioned: ${url}`);
-        }
-        else {
-            const stagingContainerClient = blobServiceClient.getContainerClient('staging');
-            await stagingContainerClient.createIfNotExists();
-            const now = new Date().valueOf();
-            const oneHour = 60 * 60 * 1000;
-            const oneHourAgo = new Date(now - oneHour);
-            const oneHourFromNow = new Date(now + oneHour);
-            const userDelegationKey = await blobServiceClient.getUserDelegationKey(oneHourAgo, oneHourFromNow);
-            const sasOptions = { containerName: 'staging', permissions: storage_blob_1.ContainerSASPermissions.from({ read: true }), startsOn: oneHourAgo, expiresOn: oneHourFromNow };
-            const stagingSasToken = (0, storage_blob_1.generateBlobSASQueryParameters)(sasOptions, userDelegationKey, e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')).toString();
-            const releaseService = await ESRPReleaseService.create(log, e('RELEASE_TENANT_ID'), e('RELEASE_CLIENT_ID'), e('RELEASE_AUTH_CERT'), e('RELEASE_REQUEST_SIGNING_CERT'), stagingContainerClient, stagingSasToken);
-            await releaseService.createRelease(version, filePath, friendlyFileName);
-        }
-        const { product, os, arch, unprocessedType } = match.groups;
-        const platform = getPlatform(product, os, arch, unprocessedType);
-        const type = getRealType(unprocessedType);
-        const size = fs_1.default.statSync(filePath).size;
-        const stream = fs_1.default.createReadStream(filePath);
-        const [hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); // CodeQL [SM04514] Using SHA1 only for legacy reasons, we are actually only respecting SHA256
-        const asset = { platform, type, url, hash: hash.toString('hex'), sha256hash: sha256hash.toString('hex'), size, supportsFastUpdate: true };
-        log('Creating asset...');
-        const result = await (0, retry_1.retry)(async (attempt) => {
-            log(`Creating asset in Cosmos DB (attempt ${attempt})...`);
-            const client = new cosmos_1.CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), tokenProvider: () => Promise.resolve(`type=aad&ver=1.0&sig=${cosmosDBAccessToken.token}`) });
-            const scripts = client.database('builds').container(quality).scripts;
-            const { resource: result } = await scripts.storedProcedure('createAsset').execute('', [version, asset, true]);
-            return result;
-        });
-        if (result === 'already exists') {
-            log('Asset already exists!');
-        }
-        else {
-            log('Asset successfully created: ', JSON.stringify(asset, undefined, 2));
-        }
+    const commit = e('BUILD_SOURCEVERSION');
+    const { product, os, arch, unprocessedType } = match.groups;
+    const isLegacy = artifact.name.includes('_legacy');
+    const platform = getPlatform(product, os, arch, unprocessedType, isLegacy);
+    const type = getRealType(unprocessedType);
+    const size = fs.statSync(artifactFilePath).size;
+    const stream = fs.createReadStream(artifactFilePath);
+    const [hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); // CodeQL [SM04514] Using SHA1 only for legacy reasons, we are actually only respecting SHA256
+    const url = await releaseAndProvision(log, e('RELEASE_TENANT_ID'), e('RELEASE_CLIENT_ID'), e('RELEASE_AUTH_CERT_SUBJECT_NAME'), e('RELEASE_REQUEST_SIGNING_CERT_SUBJECT_NAME'), e('PROVISION_TENANT_ID'), e('PROVISION_AAD_USERNAME'), e('PROVISION_AAD_PASSWORD'), commit, quality, artifactFilePath);
+    const asset = { platform, type, url, hash, sha256hash, size, supportsFastUpdate: true };
+    log('Creating asset...', JSON.stringify(asset, undefined, 2));
+    await (0, retry_1.retry)(async (attempt) => {
+        log(`Creating asset in Cosmos DB (attempt ${attempt})...`);
+        const aadCredentials = new identity_1.ClientSecretCredential(e('AZURE_TENANT_ID'), e('AZURE_CLIENT_ID'), e('AZURE_CLIENT_SECRET'));
+        const client = new cosmos_1.CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), aadCredentials });
+        const scripts = client.database('builds').container(quality).scripts;
+        await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]);
     });
-    log(`Successfully released lease for: ${friendlyFileName}`);
+    log('Asset successfully created');
 }
 // It is VERY important that we don't download artifacts too much too fast from AZDO.
 // AZDO throttles us SEVERELY if we do. Not just that, but they also close open
@@ -596,19 +518,16 @@ async function main() {
     for (const name of done) {
         console.log(`\u2705 ${name}`);
     }
-    const stages = new Set(['Compile']);
-    if (e('VSCODE_BUILD_STAGE_LINUX') === 'True' ||
-        e('VSCODE_BUILD_STAGE_ALPINE') === 'True' ||
-        e('VSCODE_BUILD_STAGE_MACOS') === 'True' ||
-        e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') {
-        stages.add('CompileCLI');
-    }
+    const stages = new Set(['Compile', 'CompileCLI']);
     if (e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') {
         stages.add('Windows');
     }
     if (e('VSCODE_BUILD_STAGE_LINUX') === 'True') {
         stages.add('Linux');
     }
+    if (e('VSCODE_BUILD_STAGE_LINUX_LEGACY_SERVER') === 'True') {
+        stages.add('LinuxLegacyServer');
+    }
     if (e('VSCODE_BUILD_STAGE_ALPINE') === 'True') {
         stages.add('Alpine');
     }
@@ -642,12 +561,12 @@ async function main() {
                 continue;
             }
             console.log(`[${artifact.name}] Found new artifact`);
-            const artifactZipPath = path_1.default.join(e('AGENT_TEMPDIRECTORY'), `${artifact.name}.zip`);
+            const artifactZipPath = path.join(e('AGENT_TEMPDIRECTORY'), `${artifact.name}.zip`);
             await (0, retry_1.retry)(async (attempt) => {
                 const start = Date.now();
                 console.log(`[${artifact.name}] Downloading (attempt ${attempt})...`);
                 await downloadArtifact(artifact, artifactZipPath);
-                const archiveSize = fs_1.default.statSync(artifactZipPath).size;
+                const archiveSize = fs.statSync(artifactZipPath).size;
                 const downloadDurationS = (Date.now() - start) / 1000;
                 const downloadSpeedKBS = Math.round((archiveSize / 1024) / downloadDurationS);
                 console.log(`[${artifact.name}] Successfully downloaded after ${Math.floor(downloadDurationS)} seconds(${downloadSpeedKBS} KB/s).`);